diff --git a/.ci/E2E-tests/cleanup.sh b/.ci/E2E-tests/cleanup.sh
index 49750033d2f1..59956fa455e5 100755
--- a/.ci/E2E-tests/cleanup.sh
+++ b/.ci/E2E-tests/cleanup.sh
@@ -12,12 +12,8 @@ docker container stop $(docker ps -a -q) || true
 docker container rm $(docker ps -a -q) || true
 docker volume rm $(docker volume ls -q) || true
 
-docker compose -f ./docker/cypress-E2E-tests-mysql.yml down -v
-docker compose -f ./docker/cypress-E2E-tests-postgres.yml down -v
 docker compose -f ./docker/playwright-E2E-tests-mysql.yml down -v
-docker compose -f ./docker/cypress-E2E-tests-local.yml down -v
 docker compose -f ./docker/playwright-E2E-tests-multi-node.yml down -v
-docker compose -f ./docker/cypress-E2E-tests-multi-node.yml down -v
 
 # show all running docker containers and volumes after the cleanup to detect issues
 echo "SHOW RUNNING Docker containers and volumes:"
diff --git a/.ci/E2E-tests/execute.sh b/.ci/E2E-tests/execute.sh
index 18fbd4ebfa7d..e98ca13b5c28 100755
--- a/.ci/E2E-tests/execute.sh
+++ b/.ci/E2E-tests/execute.sh
@@ -6,11 +6,8 @@ DB="mysql"
 
 echo "CONFIGURATION:"
 echo "$CONFIGURATION"
-echo "Test framework:"
-echo "$TEST_FRAMEWORK"
 
-if [ "$TEST_FRAMEWORK" = "playwright" ]; then
-  if [ "$CONFIGURATION" = "mysql" ]; then
+if [ "$CONFIGURATION" = "mysql" ]; then
     COMPOSE_FILE="playwright-E2E-tests-mysql.yml"
   elif [ "$CONFIGURATION" = "postgres" ]; then
     COMPOSE_FILE="playwright-E2E-tests-postgres.yml"
@@ -22,21 +19,6 @@ if [ "$TEST_FRAMEWORK" = "playwright" ]; then
   else
       echo "Invalid configuration. Please choose among mysql, postgres, mysql-localci or multi-node."
       exit 1
-  fi
-else
-  if [ "$CONFIGURATION" = "mysql" ]; then
-    COMPOSE_FILE="cypress-E2E-tests-mysql.yml"
-  elif [ "$CONFIGURATION" = "postgres" ]; then
-    COMPOSE_FILE="cypress-E2E-tests-postgres.yml"
-    DB="postgres"
-  elif [ "$CONFIGURATION" = "local" ]; then
-    COMPOSE_FILE="cypress-E2E-tests-local.yml"
-  elif [ "$CONFIGURATION" = "multi-node" ]; then
-    COMPOSE_FILE="cypress-E2E-tests-multi-node.yml"
-  else
-    echo "Invalid configuration. Please choose among mysql, postgres, local or multi-node."
-    exit 1
-  fi
 fi
 
 echo "Compose file:"
@@ -51,8 +33,7 @@ export HOST_HOSTNAME=$(hostname)
 
 cd docker
 #just pull everything else than artemis-app as we build it later either way
-if [ "$TEST_FRAMEWORK" = "playwright" ]; then
-  if [ "$CONFIGURATION" = "multi-node" ]; then
+if [ "$CONFIGURATION" = "multi-node" ]; then
     echo "Building for playwright (multi-node)"
     docker compose -f $COMPOSE_FILE pull artemis-playwright $DB nginx
     docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app-node-1 artemis-app-node-2 artemis-app-node-3
@@ -62,20 +43,8 @@ if [ "$TEST_FRAMEWORK" = "playwright" ]; then
     docker compose -f $COMPOSE_FILE pull artemis-playwright $DB nginx
     docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app
     docker compose -f $COMPOSE_FILE up --exit-code-from artemis-playwright
-  fi
-else
-  if [ "$CONFIGURATION" = "multi-node" ]; then
-    echo "Building for cypress (multi-node)"
-    docker compose -f $COMPOSE_FILE pull artemis-cypress $DB nginx
-    docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app-node-1 artemis-app-node-2 artemis-app-node-3
-    docker compose -f $COMPOSE_FILE up --exit-code-from artemis-cypress
-  else
-    echo "Building for cypress"
-    docker compose -f $COMPOSE_FILE pull artemis-cypress $DB nginx
-    docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app
-    docker compose -f $COMPOSE_FILE up --exit-code-from artemis-cypress
-  fi
 fi
+
 exitCode=$?
 cd ..
 echo "Container exit code: $exitCode"
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8cd968c38187..2296ed26a829 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,8 @@
 
 
 #### Server
-- [ ] **Important**: I implemented the changes with a very good performance and prevented too many (unnecessary) database calls.
+- [ ] **Important**: I implemented the changes with a [very good performance](https://docs.artemis.cit.tum.de/dev/guidelines/performance/) and prevented too many (unnecessary) and too complex database calls.
+- [ ] I **strictly** followed the principle of **data economy** for all database calls.
 - [ ] I **strictly** followed the [server coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/server/).
 - [ ] I added multiple integration tests (Spring) related to the features (with a high test coverage).
 - [ ] I added pre-authorization annotations according to the [guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/server/#rest-endpoint-best-practices-for-authorization) and checked the course groups for all new REST Calls (security).
@@ -21,7 +22,8 @@
 
 
 #### Client
-- [ ] **Important**: I implemented the changes with a very good performance, prevented too many (unnecessary) REST calls and made sure the UI is responsive, even with large data.
+- [ ] **Important**: I implemented the changes with a very good performance, prevented too many (unnecessary) REST calls and made sure the UI is responsive, even with large data (e.g. using paging).
+- [ ] I **strictly** followed the principle of **data economy** for all client-server REST calls.
 - [ ] I **strictly** followed the [client coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/client/).
 - [ ] Following the [theming guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/client-design/), I specified colors only in the theming variable files and checked that the changes look consistent in both the light and the dark theme.
 - [ ] I added multiple integration tests (Jest) related to the features (with a high test coverage), while following the [test guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/client-tests/).
@@ -92,8 +94,9 @@ Prerequisites:
 <!-- All PRs that might affect the exam mode (e.g. change a client component that is also used in the exam mode) need an additional verification that the exam mode still works. -->
 
 #### Performance Review
-- [ ] I (as a reviewer) confirm that the client changes (in particular related to REST calls and UI responsiveness) are implemented with a very good performance 
-- [ ] I (as a reviewer) confirm that the server changes (in particular related to database calls) are implemented with a very good performance
+<!-- See [Large Course Setup](https://github.com/ls1intum/Artemis/tree/develop/supporting_scripts/course-scripts/quick-course-setup) for the automation script that handles large course setup. -->
+- [ ] I (as a reviewer) confirm that the client changes (in particular related to REST calls and UI responsiveness) are implemented with a very good performance even for very large courses with more than 2000 students.
+- [ ] I (as a reviewer) confirm that the server changes (in particular related to database calls) are implemented with a very good performance even for very large courses with more than 2000 students.
 #### Code Review
 - [ ] Code Review 1
 - [ ] Code Review 2
@@ -103,6 +106,9 @@ Prerequisites:
 #### Exam Mode Test
 - [ ] Test 1
 - [ ] Test 2
+#### Performance Tests
+- [ ] Test 1
+- [ ] Test 2
 
 ### Test Coverage
 <!-- Please add the test coverages for all changed files here. You can see this when executing the tests locally (see build.gradle and package.json) or when looking into the corresponding Bamboo build plan. -->
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 5dd34c477214..d9295deb1372 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -10,9 +10,9 @@ tests:
   - changed-files:
       - any-glob-to-any-file: src/test/**/*
 
-cypress:
+playwright:
   - changed-files:
-      - any-glob-to-any-file: src/test/cypress/**/*
+      - any-glob-to-any-file: src/test/playwright/**/*
 
 database:
   - changed-files:
diff --git a/.github/workflows/analysis-of-endpoint-connections.yml b/.github/workflows/analysis-of-endpoint-connections.yml
index 25849bddd012..f5f2dd4edb71 100644
--- a/.github/workflows/analysis-of-endpoint-connections.yml
+++ b/.github/workflows/analysis-of-endpoint-connections.yml
@@ -1,3 +1,5 @@
+name: Analysis of Endpoint Connections
+
 on:
   workflow_dispatch:
   pull_request:
@@ -15,7 +17,7 @@ env:
   java: 21
 
 jobs:
-  analysis-of-endpoint-connections:
+  Parse-rest-calls-and-endpoints:
     timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
@@ -24,39 +26,70 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Get list of modified files
-        run: |
-          git diff --name-only origin/${{ github.event.pull_request.base.ref }} HEAD > modified_files.txt
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '${{ env.java }}'
+          distribution: 'temurin'
+          cache: 'gradle'
 
-      # Analyze the client sided REST-API calls
-      - name: Set up Node.js
+      - name: Set up node.js
         uses: actions/setup-node@v4
         with:
           node-version: '${{ env.node }}'
 
-      - name: Install and compile TypeScript
+      - name: Parse client sided REST-API calls
         run: |
-          cd supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/
           npm install
-          tsc -p tsconfig.analysisOfEndpointConnections.json
-
-      - name: Run analysis-of-endpoint-connections-client
-        run: |
+          tsc -p supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/tsconfig.analysisOfEndpointConnections.json
           node supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/AnalysisOfEndpointConnectionsClient.js
 
-      - name: Upload JSON file
+      - name: Parse server sided Endpoints
+        run: ./gradlew :supporting_scripts:analysis-of-endpoint-connections:runEndpointParser
+
+      - name: Upload parsing results
         uses: actions/upload-artifact@v4
         with:
-          name: rest-calls-json
-          path: supporting_scripts/analysis-of-endpoint-connections/restCalls.json
+          name: REST API Parsing Results
+          path: |
+            supporting_scripts/analysis-of-endpoint-connections/endpoints.json
+            supporting_scripts/analysis-of-endpoint-connections/restCalls.json
+
+  Analysis-of-endpoint-connections:
+    needs: Parse-rest-calls-and-endpoints
+    timeout-minutes: 10
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
-      # Analyze the server sided endpoints
-      - name: Set up JDK 21
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '${{ env.java }}'
+          cache: 'gradle'
 
-      - name: Run analysis-of-endpoint-connections
-        run: |
-          ./gradlew :supporting_scripts:analysis-of-endpoint-connections:run --args="$(cat modified_files.txt)"
+      - name: Download JSON files
+        uses: actions/download-artifact@v4
+        with:
+          name: REST API Parsing Results
+          path: supporting_scripts/analysis-of-endpoint-connections/
+
+      - name: Analyze endpoints
+        run:
+          ./gradlew :supporting_scripts:analysis-of-endpoint-connections:runEndpointAnalysis
+
+      - name: Analyze rest calls
+        run:
+          ./gradlew :supporting_scripts:analysis-of-endpoint-connections:runRestCallAnalysis
+
+      - name: Upload analysis results
+        uses: actions/upload-artifact@v4
+        with:
+          name: Endpoint and REST Call Analysis Results
+          path: |
+            supporting_scripts/analysis-of-endpoint-connections/endpointAnalysisResult.json
+            supporting_scripts/analysis-of-endpoint-connections/restCallAnalysisResult.json
diff --git a/.gitignore b/.gitignore
index 13cfd9a24518..8f71a8ae13d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,13 +188,6 @@ data-exports/
 /docker/.docker-data/artemis-postgres-data/*
 !/docker/.docker-data/artemis-postgres-data/.gitkeep
 
-######################
-# Cypress
-######################
-/src/test/cypress/screenshots/
-/src/test/cypress/videos/
-/src/test/cypress/build
-
 ######################
 # Playwright
 ######################
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 89ee014c27e2..d4887bcca43e 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,76 +1,133 @@
-# Contributor Covenant Code of Conduct
+
+# Artemis Code of Conduct
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official email address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project lead Stephan Krusche at krusche@tum.de. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+[INSERT CONTACT METHOD].
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: https://www.contributor-covenant.org
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ea3d5c107479..482bdb00df6c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,43 @@
-# Contributing Guide for Artemis
+# Contribution Guidelines for Artemis
 
 Read the [setup guide](https://docs.artemis.cit.tum.de/dev/setup.html) on how to set up your local development environment.
 
-Before creating a pull request, please read the [guidelines to the development process](https://docs.artemis.cit.tum.de/dev/development-process/development-process.html) as well as the [coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines.html).
+## Identity and Transparency
+
+To ensure a transparent and trustworthy environment, we have established different guidelines for members of our organization and external contributors.
+
+### For Members of Our Organization
+
+1. **Real Names Required**: As a member of our organization, you must use your full real name in your GitHub profile. This is a prerequisite for joining our organization. Using a real name is crucial for building trust within the team and the broader community. It fosters accountability and transparency, which are essential for collaborative work. When members use their real identities, it encourages open communication and strengthens professional relationships. Furthermore, it aligns with best practices in open-source communities, where transparency is key to ensuring the integrity and reliability of contributions.
+
+2. **Profile Picture**: Members are required to upload an authentic profile picture. Use a clear, professional image and avoid comic-like pictures, memojis, or other non-authentic picture styles. Using a professional and authentic profile picture is essential for establishing credibility and fostering trust within the community. It helps others easily identify and connect with you, which is crucial for effective collaboration. By using a real photo, you present yourself as a serious and committed contributor, which in turn encourages others to take your work and interactions seriously. Avoiding non-authentic images ensures that the focus remains on the substance of your contributions rather than on distractions or misunderstandings that might arise from informal or unprofessional visuals.
+
+3. **Direct Branching and PR Creation**: As a member, you are encourages to create branches and pull requests (PRs) directly within the repository. Please follow the internal branching and code review processes outlined in [guidelines to the development process](https://docs.artemis.cit.tum.de/dev/development-process/development-process.html) and [coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines.html).
+
+### For External Contributors
+
+1. **Identity Verification**: External contributions will only be considered if the contributor uses their real name and an authentic profile picture (see above). This ensures accountability and trustworthiness in all external contributions.
+
+2. **Forking the Repository**: External contributors fork the repository and work on changes in their own branches.
+
+3. **Submit a Pull Request**: Once your work is complete, submit a pull request for review. Ensure that your branch is up to date with the main branch before submitting.
+
+4. **Compliance**: Contributions from external contributors that do not adhere to these guidelines may not be accepted.
+
+### References and Best Practices
+
+- We align our guidelines with the [GitHub Acceptable Use Policies](https://docs.github.com/en/site-policy/acceptable-use-policies) which stress the importance of authenticity and transparency in user profiles.
+- For more insights on contributing to open-source projects, we recommend reviewing the [Open Source Guides by GitHub](https://opensource.guide/).
+
+By following these guidelines, we foster a collaborative environment built on mutual trust and respect, essential for the success of our project.
+
+## Contribution Process
+
+1. **External contributors only**: Fork the Repository and create a branch.
+2. **Create a feature branch**: Work on your changes in a separate branch.
+3. **Submit a pull request**: Once your work is complete, submit a pull request for review.
+
+Thank you for your contributions and for helping us maintain a high standard of quality and trust in this project.
+
+
 
diff --git a/README.md b/README.md
index 30ec2419c16d..bbfc8945e870 100644
--- a/README.md
+++ b/README.md
@@ -53,22 +53,68 @@ Artemis brings interactive learning to life with instant, individual feedback on
 
 ## Roadmap
 
-The Artemis development team prioritizes the following issues in the future. We welcome feature requests from students, tutors, instructors, and administrators. We are happy to discuss any suggestions for improvements.
+The Artemis development team prioritizes the following areas in the future. We welcome feature requests from students, tutors, instructors, and administrators. We are happy to discuss any suggestions for improvements.
 
 * **Short term**: Further improve the communication features with mobile apps for iOS and Android
-* **Short term**: Improve the REST API of the server application
+* **Short term**: Add the possibility to use Iris for questions on all exercise types and lectures (partly done)
+* **Short term**: Provide GenAI based automatic feedback to modeling, text and programming exercise with Athena
+* **Short term**: Improve the LTI integration with Moodle
+* **Medium term**: Improve the REST API of the server application
+* **Medium term**: Integrate an online IDE (e.g. Eclipse Theia) into Artemis for enhanced user experience
 * **Medium term**: Add more learning analytics features while preserving data privacy
 * **Medium term**: Improve the user experience, usability and navigation
 * **Medium term**: Add automatic generation of hints for programming exercises
 * **Medium term**: Add GenAI support for reviewing exercises for instructors
-* **Medium term**: Add GenAI support for learning analytics
-* **Medium term**: Add the possibility to use Iris for questions on all exercise types and lectures
+* **Medium term**: Add GenAI support for learning analytics (partly done)
 * **Long term**: Explore the possibilities of microservices, Kubernetes based deployment, and micro frontends
-* **Long term**: Integrated on online IDE (e.g. Eclipse Theia) into Artemis for enhanced user experience
 * **Long term**: Allow students to take notes on lecture slides and support the automatic updates of lecture slides
 * **Long term**: Develop an exchange platform for exercises
 
-## Setup, guides, and contributing
+## Contributing to This Project
+
+We welcome contributions from both members of our organization and external contributors. To maintain transparency and trust:
+
+- **Members**: Must use their full real names and upload a professional and authentic profile picture. Members can directly create branches and PRs in the repository.
+- **External Contributors**: Must adhere to our identity guidelines, using real names and authentic profile pictures. Contributions will only be considered if these guidelines are followed.
+
+We adhere to best practices as recommended by [GitHub's Open Source Guides](https://opensource.guide/) and their [Acceptable Use Policies](https://docs.github.com/en/site-policy/acceptable-use-policies). Thank you for helping us create a respectful and professional environment for everyone involved.
+
+We follow a pull request contribution model. For detailed guidelines, please refer to our [CONTRIBUTING.md](./CONTRIBUTING.md). Once your pull request is ready to merge, notify the responsible feature maintainer on Slack:
+
+#### Maintainers
+
+The following members of the project management team are responsible for specific feature areas in Artemis. Contact them if you have questions or if you want to develop new features in this area.
+
+| Feature / Aspect               | Responsible maintainer                                                             |
+|--------------------------------|------------------------------------------------------------------------------------|
+| Programming exercises          | Stephan Krusche ([@krusche](https://github.com/krusche))                           |
+| Integrated code lifecycle      | Stephan Krusche ([@krusche](https://github.com/krusche))                           |
+| Quiz exercises                 | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich))            |
+| Modeling exercises (+ Apollon) | Stephan Krusche ([@krusche](https://github.com/krusche))                           |
+| Text exercises                 | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch))        |
+| File upload exercises          | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch))        |
+| Exam mode                      | Stephan Krusche ([@krusche](https://github.com/krusche))                           |
+| Grading                        | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch))        |
+| Assessment                     | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch))        |
+| Communication                  | Ramona Beinstingel ([@rabeatwork](https://github.com/rabeatwork))                  |
+| Notifications                  | Ramona Beinstingel ([@rabeatwork](https://github.com/rabeatwork))                  |
+| Team Exercises                 | Stephan Krusche ([@krusche](https://github.com/krusche))                           |
+| Lectures                       | Maximilian Anzinger ([@maximiliananzinger](https://github.com/maximiliananzinger)) |
+| Integrated Markdown Editor     | Patrick Bassner ([@bassner](https://github.com/bassner))                           |
+| Plagiarism checks              | Markus Paulsen ([@MarkusPaulsen](https://github.com/MarkusPaulsen))                |
+| Learning analytics             | Maximilian Anzinger ([@maximiliananzinger](https://github.com/maximiliananzinger)) |
+| Adaptive learning              | Maximilian Anzinger ([@maximiliananzinger](https://github.com/maximiliananzinger)) |
+| Learning paths                 | Maximilian Anzinger ([@maximiliananzinger](https://github.com/maximiliananzinger)) |
+| Tutorial Groups                | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich))            |
+| Iris                           | Patrick Bassner ([@bassner](https://github.com/bassner))                           |
+| Scalability                    | Matthias Linhuber ([@mtze](https://github.com/mtze))                               |
+| Usability                      | Ramona Beinstingel ([@rabeatwork](https://github.com/rabeatwork))                  |
+| Performance                    | Ramona Beinstingel ([@rabeatwork](https://github.com/rabeatwork))                  |
+| Infrastructure                 | Matthias Linhuber ([@mtze](https://github.com/mtze))                               |
+| Development process            | Felix Dietrich ([@FelixTJDietrich](https://github.com/FelixTJDietrich))            |
+| Mobile apps (iOS + Android)    | Maximilian Sölch ([@maximiliansoelch](https://github.com/maximiliansoelch))        |
+
+## Setup and guidelines
 
 ### Development setup, coding, and design guidelines
 
@@ -76,6 +122,7 @@ The Artemis development team prioritizes the following issues in the future. We
 * [Server coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/server/)
 * [Client coding and design guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/client/)
 * [Code Review Guidelines](https://docs.artemis.cit.tum.de/dev/development-process/#review)
+* [Performance Guidelines](https://docs.artemis.cit.tum.de/dev/guidelines/performance/)
 
 ### Documentation
 
@@ -96,46 +143,6 @@ Artemis uses these external tools for user management and the configuration of p
 
 If needed, you can configure self service [user registration](https://docs.artemis.cit.tum.de/admin/registration).
 
-### Contributing
-
-Please read the guide on [how to contribute](CONTRIBUTING.md) to Artemis.
-
-Once your PR is ready to merge, notify the responsible feature maintainer on Slack:
-
-#### Maintainers
-
-The following members of the project management team are responsible for specific feature areas in Artemis. Contact them if you have questions or if you want to develop new features in this area.
-
-| Feature / Aspect               | Maintainer                                                                                          |
-|--------------------------------|-----------------------------------------------------------------------------------------------------|
-| Programming exercises          | [@krusche](https://github.com/krusche)                                                              |
-| Integrated code lifecycle      | [@krusche](https://github.com/krusche)                                                              |
-| Quiz exercises                 | [@FelixTJDietrich](https://github.com/FelixTJDietrich)                                                          |
-| Modeling exercises (+ Apollon) | [@krusche](https://github.com/krusche)                                                              |
-| Text exercises                 | [@maximiliansoelch](https://github.com/maximiliansoelch)                                            |
-| File upload exercises          | [@maximiliansoelch](https://github.com/maximiliansoelch)                                            |
-| Exam mode                      | [@krusche](https://github.com/krusche)                                                              |
-| Grading                        | [@maximiliansoelch](https://github.com/maximiliansoelch)                                            |
-| Assessment                     | [@maximiliansoelch](https://github.com/maximiliansoelch)                                            |
-| Communication                  | [@rabeatwork](https://github.com/rabeatwork)                                                        |
-| Notifications                  | [@rabeatwork](https://github.com/rabeatwork)                                                        |
-| Team Exercises                 | [@krusche](https://github.com/krusche)                                                              |
-| Lectures                       | [@maximiliananzinger](https://github.com/maximiliananzinger)     |
-| Integrated Markdown Editor     | [@maximiliansoelch](https://github.com/maximiliansoelch) [@bassner](https://github.com/bassner)     |
-| Plagiarism checks              | [@MarkusPaulsen](https://github.com/MarkusPaulsen)                                                  |
-| Learning analytics             | [@bassner](https://github.com/bassner)                                                              |
-| Adaptive learning              | [@bassner](https://github.com/bassner) [@maximiliananzinger](https://github.com/maximiliananzinger) |
-| Learning paths                 | [@maximiliananzinger](https://github.com/maximiliananzinger)                                        |
-| Tutorial Groups                | [@FelixTJDietrich](https://github.com/FelixTJDietrich)                                                          |
-| Iris                           | [@bassner](https://github.com/bassner)                                                              |
-| Scalability                    | [@mtze](https://github.com/mtze)                                                                    |
-| Usability                      | [@rabeatwork](https://github.com/rabeatwork)                                                        |
-| Performance                    | [@rabeatwork](https://github.com/rabeatwork)                                                        |
-| Infrastructure                 | [@mtze](https://github.com/mtze)                                                                    |
-| Development process            | [@FelixTJDietrich](https://github.com/FelixTJDietrich) |
-| Mobile apps (iOS + Android)    | [@krusche](https://github.com/krusche) [@maximiliansoelch](https://github.com/maximiliansoelch)     |
-
-
 ### Building for production
 
 To build and optimize the Artemis application for production, run:
@@ -159,7 +166,7 @@ Refer to [Using JHipster in production](http://www.jhipster.tech/production) for
 The following command can automate the deployment to a server. The example shows the deployment to the main Artemis test server (which runs a virtual machine):
 
 ```shell
-./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.5.1.war
+./artemis-server-cli deploy username@artemistest.ase.in.tum.de -w build/libs/Artemis-7.5.2.war
 ```
 
 ## Architecture
diff --git a/angular.json b/angular.json
index a2c893ff59f6..e5543ff2ce60 100644
--- a/angular.json
+++ b/angular.json
@@ -21,8 +21,6 @@
           "builder": "@angular-devkit/build-angular:application",
           "options": {
             "allowedCommonJsDependencies": [
-              "brace",
-              "brace/mode/java",
               "clone-deep",
               "crypto-js",
               "crypto",
diff --git a/build.gradle b/build.gradle
index ae88a8170eda..e53437485601 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,12 +27,12 @@ plugins {
     id "com.github.ben-manes.versions" version "0.51.0"
     id "com.github.andygoossens.modernizer" version "${modernizer_plugin_version}"
     id "com.gorylenko.gradle-git-properties" version "2.4.2"
-    id "org.owasp.dependencycheck" version "10.0.3"
+    id "org.owasp.dependencycheck" version "10.0.4"
     id "com.adarshr.test-logger" version "4.0.0"
 }
 
 group = "de.tum.in.www1.artemis"
-version = "7.5.1"
+version = "7.5.2"
 description = "Interactive Learning with Individual Feedback"
 
 java {
@@ -284,12 +284,12 @@ dependencies {
     implementation "org.apache.sshd:sshd-sftp:${sshd_version}"
 
     // https://mvnrepository.com/artifact/net.sourceforge.plantuml/plantuml
-    implementation "net.sourceforge.plantuml:plantuml:1.2024.6"
+    implementation "net.sourceforge.plantuml:plantuml:1.2024.5"
     implementation "org.jasypt:jasypt:1.9.3"
     implementation "me.xdrop:fuzzywuzzy:1.4.0"
     implementation("org.yaml:snakeyaml") {
         version {
-            strictly "2.2"
+            strictly "2.3"
             // needed to reduce the number of vulnerabilities, also see https://mvnrepository.com/artifact/org.yaml/snakeyaml
         }
     }
@@ -322,7 +322,7 @@ dependencies {
     implementation "com.github.docker-java:docker-java-transport-httpclient5:${docker_java_version}"
 
     // use newest version of commons-compress to avoid security issues through outdated dependencies
-    implementation "org.apache.commons:commons-compress:1.27.0"
+    implementation "org.apache.commons:commons-compress:1.27.1"
 
 
     // import JHipster dependencies BOM
@@ -330,7 +330,7 @@ dependencies {
 
     implementation "tech.jhipster:jhipster-framework:${jhipster_dependencies_version}"
     implementation "org.springframework.boot:spring-boot-starter-cache:${spring_boot_version}"
-    implementation "io.micrometer:micrometer-registry-prometheus:1.12.6"
+    implementation "io.micrometer:micrometer-registry-prometheus:1.13.3"
     implementation "net.logstash.logback:logstash-logback-encoder:8.0"
 
     // Defines low-level streaming API, and includes JSON-specific implementations
@@ -349,13 +349,19 @@ dependencies {
     implementation "com.hazelcast:hazelcast:${hazelcast_version}"
     implementation "com.hazelcast:hazelcast-spring:${hazelcast_version}"
     implementation "com.hazelcast:hazelcast-hibernate53:5.2.0"
+
     implementation "javax.cache:cache-api:1.1.1"
     implementation "org.hibernate.orm:hibernate-core:${hibernate_version}"
+
     implementation "com.zaxxer:HikariCP:5.1.0"
+
     implementation "org.apache.commons:commons-text:1.12.0"
     implementation "org.apache.commons:commons-math3:3.6.1"
+
     implementation "javax.transaction:javax.transaction-api:1.3"
+
     implementation "org.liquibase:liquibase-core:${liquibase_version}"
+
     implementation "org.springframework.boot:spring-boot-starter-validation:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-loader-tools:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-mail:${spring_boot_version}"
@@ -373,8 +379,8 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server:${spring_boot_version}"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client:${spring_boot_version}"
 
-    implementation "org.springframework.ldap:spring-ldap-core:3.2.4"
-    implementation "org.springframework.data:spring-data-ldap:3.3.2"
+    implementation "org.springframework.ldap:spring-ldap-core:3.2.6"
+    implementation "org.springframework.data:spring-data-ldap:3.3.3"
 
     implementation("org.springframework.cloud:spring-cloud-starter-netflix-eureka-client:4.1.3") {
         // NOTE: these modules contain security vulnerabilities and are not needed
@@ -385,9 +391,9 @@ dependencies {
     implementation "org.springframework.cloud:spring-cloud-commons:4.1.4"
 
     implementation "io.netty:netty-all:4.1.112.Final"
-    implementation "io.projectreactor.netty:reactor-netty:1.1.21"
-    implementation "org.springframework:spring-messaging:6.1.11"
-    implementation "org.springframework.retry:spring-retry:2.0.7"
+    implementation "io.projectreactor.netty:reactor-netty:1.1.22"
+    implementation "org.springframework:spring-messaging:6.1.12"
+    implementation "org.springframework.retry:spring-retry:2.0.8"
 
     implementation "org.springframework.security:spring-security-config:${spring_security_version}"
     implementation "org.springframework.security:spring-security-data:${spring_security_version}"
@@ -421,13 +427,13 @@ dependencies {
     }
     implementation "io.springfox:springfox-bean-validators:3.0.0"
     implementation "com.mysql:mysql-connector-j:9.0.0"
-    implementation "org.postgresql:postgresql:42.7.3"
+    implementation "org.postgresql:postgresql:42.7.4"
 
     implementation "org.zalando:problem-spring-web:0.29.1"
     implementation "org.zalando:jackson-datatype-problem:0.27.1"
     implementation "com.ibm.icu:icu4j-charset:75.1"
-    implementation "com.github.seancfoley:ipaddress:5.5.0"
-    implementation "org.apache.maven:maven-model:3.9.8"
+    implementation "com.github.seancfoley:ipaddress:5.5.1"
+    implementation "org.apache.maven:maven-model:3.9.9"
     // NOTE: 3.0.2 is broken for splitting lecture specific PDFs
     implementation "org.apache.pdfbox:pdfbox:3.0.1"
     implementation "org.apache.commons:commons-csv:1.11.0"
@@ -436,12 +442,15 @@ dependencies {
     implementation "net.lingala.zip4j:zip4j:2.11.5"
     implementation "org.jgrapht:jgrapht-core:1.5.2"
     // use newest version of guava to avoid security issues through outdated dependencies
-    implementation "com.google.guava:guava:33.2.1-jre"
+    implementation "com.google.guava:guava:33.3.0-jre"
     implementation "com.sun.activation:jakarta.activation:2.0.1"
 
     // use newest version of gson to avoid security issues through outdated dependencies
     implementation "com.google.code.gson:gson:2.11.0"
 
+
+    implementation "com.google.errorprone:error_prone_annotations:2.31.0"
+
     annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
     annotationProcessor("org.glassfish.jaxb:jaxb-runtime:${jaxb_runtime_version}") {
         exclude group: "jakarta.ws.rs", module: "jsr311-api"
@@ -470,11 +479,11 @@ dependencies {
     testImplementation "org.assertj:assertj-core:3.26.3"
     testImplementation "org.mockito:mockito-core:${mockito_version}"
     testImplementation "org.mockito:mockito-junit-jupiter:${mockito_version}"
-    testImplementation "io.github.classgraph:classgraph:4.8.174"
+    testImplementation "io.github.classgraph:classgraph:4.8.175"
     testImplementation "org.awaitility:awaitility:4.2.2"
     testImplementation "org.apache.maven.shared:maven-invoker:3.3.0"
-    testImplementation "org.gradle:gradle-tooling-api:8.9"
-    testImplementation "org.apache.maven.surefire:surefire-report-parser:3.3.1"
+    testImplementation "org.gradle:gradle-tooling-api:8.10"
+    testImplementation "org.apache.maven.surefire:surefire-report-parser:3.5.0"
     testImplementation "com.opencsv:opencsv:5.9"
     testImplementation("io.zonky.test:embedded-database-spring-test:2.5.1") {
         exclude group: "org.testcontainers", module: "mariadb"
@@ -486,7 +495,7 @@ dependencies {
     }
     testImplementation("net.bytebuddy:byte-buddy") {
         version {
-            strictly "1.14.18"
+            strictly "1.15.1"
         }
     }
     // cannot update due to "Syntax error in SQL statement "WITH ids_to_delete"
@@ -558,7 +567,7 @@ tasks.withType(Test).configureEach {
 }
 
 wrapper {
-    gradleVersion = "8.9"
+    gradleVersion = "8.10"
 }
 
 tasks.register("stage") {
diff --git a/docker/artemis-migration-check-postgres.yml b/docker/artemis-migration-check-postgres.yml
index 5f7cf661c39f..1ac60ab3ef45 100644
--- a/docker/artemis-migration-check-postgres.yml
+++ b/docker/artemis-migration-check-postgres.yml
@@ -9,8 +9,8 @@ services:
             service: artemis-app
         env_file:
             - ./artemis/config/postgres.env
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-postgres.env
+            - ./artemis/config/playwright.env
+            - ./artemis/config/playwright-postgres.env
             - ./artemis/config/migration-check.env
         depends_on:
             postgresql:
diff --git a/docker/artemis/config/cypress-local.env b/docker/artemis/config/playwright-local.env
similarity index 91%
rename from docker/artemis/config/cypress-local.env
rename to docker/artemis/config/playwright-local.env
index 5ca5931297ad..6b7805deacca 100644
--- a/docker/artemis/config/cypress-local.env
+++ b/docker/artemis/config/playwright-local.env
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-# Artemis configuration overrides for the Cypress E2E Postgres setups
+# Artemis configuration overrides for the Playwright E2E Postgres setups
 # ----------------------------------------------------------------------------------------------------------------------
 
 SPRING_PROFILES_ACTIVE="artemis,scheduling,localvc,localci,buildagent,core,prod,docker"
diff --git a/docker/artemis/config/cypress-postgres.env b/docker/artemis/config/playwright-postgres.env
similarity index 95%
rename from docker/artemis/config/cypress-postgres.env
rename to docker/artemis/config/playwright-postgres.env
index ae155aca2873..9cfcc9ade6a6 100644
--- a/docker/artemis/config/cypress-postgres.env
+++ b/docker/artemis/config/playwright-postgres.env
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-# Artemis configuration overrides for the Cypress E2E Postgres setups
+# Artemis configuration overrides for the Playwright E2E Postgres setups
 # ----------------------------------------------------------------------------------------------------------------------
 
 SPRING_PROFILES_ACTIVE="artemis,scheduling,jenkins,gitlab,core,prod,docker"
diff --git a/docker/artemis/config/cypress.env b/docker/artemis/config/playwright.env
similarity index 93%
rename from docker/artemis/config/cypress.env
rename to docker/artemis/config/playwright.env
index c056a8d9004c..a3ee64a57442 100644
--- a/docker/artemis/config/cypress.env
+++ b/docker/artemis/config/playwright.env
@@ -1,5 +1,5 @@
 # ----------------------------------------------------------------------------------------------------------------------
-# Common Artemis configurations for the Cypress E2E MySQL and Postgres setups
+# Common Artemis configurations for the Playwright E2E MySQL and Postgres setups
 # ----------------------------------------------------------------------------------------------------------------------
 
 SPRING_DATASOURCE_PASSWORD=""
@@ -27,6 +27,8 @@ ARTEMIS_CONTINUOUSINTEGRATION_EMPTYCOMMITNECESSARY="true"
 
 ARTEMIS_APOLLON_CONVERSIONSERVICEURL="https://apollon.ase.in.tum.de/api/converter"
 
+ARTEMIS_TELEMETRY_ENABLED="false"
+
 # Token is valid 3 days
 JHIPSTER_SECURITY_AUTHENTICATION_JWT_TOKENVALIDITYINSECONDS="259200"
 # Token is valid 30 days
@@ -38,6 +40,7 @@ INFO_IMPRINT="https://ase.in.tum.de/lehrstuhl_1/component/content/article/179-im
 INFO_TESTSERVER="true"
 INFO_TEXTASSESSMENTANALYTICSENABLED="true"
 INFO_STUDENTEXAMSTORESESSIONDATA="true"
+INFO_OPERATORNAME="TUM"
 
 LOGGING_FILE_NAME="/opt/artemis/data/artemis.log"
 
diff --git a/docker/cypress-E2E-tests-local.yml b/docker/cypress-E2E-tests-local.yml
deleted file mode 100644
index cf69e47df760..000000000000
--- a/docker/cypress-E2E-tests-local.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Cypress Setup MySQL
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-    mysql:
-        extends:
-            file: ./mysql.yml
-            service: mysql
-
-    artemis-app:
-        extends:
-            file: ./artemis.yml
-            service: artemis-app
-        user: 0:0
-        depends_on:
-            mysql:
-                condition: service_healthy
-        env_file:
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-local.env
-        volumes:
-            - /var/run/docker.sock:/var/run/docker.sock
-
-    nginx:
-        extends:
-            file: ./nginx.yml
-            service: nginx
-        # the artemis-app service needs to be started, otherwise there are problems with name resolution in docker
-        depends_on:
-            artemis-app:
-                condition: service_started
-        volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
-        ports:
-            - "80:80"
-            - "443:443"
-            # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
-
-    artemis-cypress:
-        extends:
-            file: ./cypress.yml
-            service: artemis-cypress
-        depends_on:
-            artemis-app:
-                condition: service_healthy
-        environment:
-            CYPRESS_DB_TYPE: "Local"
-            SORRY_CYPRESS_PROJECT_ID: "artemis-local"
-            CYPRESS_createUsers: "true"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:setup && (npm run cypress:record:local & sleep 60 && npm run cypress:record:local & wait)"
-
-networks:
-    artemis:
-        driver: "bridge"
-        name: artemis
-volumes:
-    artemis-mysql-data:
-        name: artemis-mysql-data
-    artemis-data:
-        name: artemis-data
diff --git a/docker/cypress-E2E-tests-multi-node.yml b/docker/cypress-E2E-tests-multi-node.yml
deleted file mode 100644
index 5fb326f75f60..000000000000
--- a/docker/cypress-E2E-tests-multi-node.yml
+++ /dev/null
@@ -1,134 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Cypress setup for multi-node
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-  artemis-app-node-1:
-    &artemis-app-base
-    container_name: artemis-app-node-1
-    extends:
-      file: ./artemis.yml
-      service: artemis-app
-    image: ghcr.io/ls1intum/artemis:${ARTEMIS_DOCKER_TAG:-latest}
-    depends_on:
-      &depends-on-base
-      mysql:
-        condition: service_healthy
-      jhipster-registry:
-        condition: service_healthy
-      activemq-broker:
-        condition: service_healthy
-    pull_policy: always
-    restart: always
-    group_add:
-      - ${DOCKER_GROUP_ID:-0}
-    env_file:
-      - ./artemis/config/prod-multinode.env
-      - ./artemis/config/node1.env
-      - ./artemis/config/cypress.env
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-
-  artemis-app-node-2:
-    <<: *artemis-app-base
-    container_name: artemis-app-node-2
-    depends_on:
-      <<: *depends-on-base
-      artemis-app-node-1:
-        condition: service_healthy
-    env_file:
-      - ./artemis/config/prod-multinode.env
-      - ./artemis/config/node2.env
-      - ./artemis/config/cypress.env
-
-  artemis-app-node-3:
-    <<: *artemis-app-base
-    container_name: artemis-app-node-3
-    depends_on:
-      <<: *depends-on-base
-      artemis-app-node-1:
-        condition: service_healthy
-    env_file:
-      - ./artemis/config/prod-multinode.env
-      - ./artemis/config/node3.env
-      - ./artemis/config/cypress.env
-
-  jhipster-registry:
-    extends:
-      file: ./broker-registry.yml
-      service: jhipster-registry
-    networks:
-      - artemis
-
-  activemq-broker:
-    extends:
-      file: ./broker-registry.yml
-      service: activemq-broker
-    networks:
-      - artemis
-
-  mysql:
-    extends:
-      file: ./mysql.yml
-      service: mysql
-    restart: always
-
-  nginx:
-    extends:
-      file: ./nginx.yml
-      service: nginx
-    depends_on:
-      artemis-app-node-1:
-        condition: service_started
-      artemis-app-node-2:
-        condition: service_started
-      artemis-app-node-3:
-        condition: service_started
-    restart: always
-    ports:
-      - '80:80'
-      - '443:443'
-      # see comments in artemis/config/cypress.env why this port is necessary
-      - '54321:54321'
-    volumes:
-      - ./nginx/artemis-upstream-multi-node.conf:/etc/nginx/includes/artemis-upstream.conf:ro
-      - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
-      - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
-        target: "/certs/fullchain.pem"
-      - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
-        target: "/certs/priv_key.pem"
-
-
-  artemis-cypress:
-    extends:
-      file: ./cypress.yml
-      service: artemis-cypress
-    depends_on:
-      nginx:
-        condition: service_healthy
-    environment:
-      CYPRESS_DB_TYPE: "Local"
-      SORRY_CYPRESS_PROJECT_ID: "artemis-local"
-      CYPRESS_createUsers: "true"
-    command: >
-      sh -c '
-      cd /app/artemis/src/test/cypress &&
-      chmod 777 /root &&
-      npm ci &&
-      npm run cypress:setup &&
-      (npm run cypress:record:local & sleep 60 && npm run cypress:record:local & wait)
-      '
-
-networks:
-  artemis:
-    driver: "bridge"
-    name: artemis
-
-volumes:
-  artemis-mysql-data:
-    name: artemis-mysql-data
-  artemis-data:
-    name: artemis-data
-
diff --git a/docker/cypress-E2E-tests-mysql.yml b/docker/cypress-E2E-tests-mysql.yml
deleted file mode 100644
index a14c4c163ce7..000000000000
--- a/docker/cypress-E2E-tests-mysql.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Cypress Setup MySQL
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-    mysql:
-        extends:
-            file: ./mysql.yml
-            service: mysql
-
-    artemis-app:
-        extends:
-            file: ./artemis.yml
-            service: artemis-app
-        depends_on:
-            mysql:
-                condition: service_healthy
-        env_file:
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-mysql.env
-
-    nginx:
-        extends:
-            file: ./nginx.yml
-            service: nginx
-        # the artemis-app service needs to be started, otherwise there are problems with name resolution in docker
-        depends_on:
-            artemis-app:
-                condition: service_started
-        volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
-        ports:
-            - "80:80"
-            - "443:443"
-            # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
-
-    artemis-cypress:
-        extends:
-            file: ./cypress.yml
-            service: artemis-cypress
-        depends_on:
-            artemis-app:
-                condition: service_healthy
-        environment:
-            CYPRESS_DB_TYPE: "MySQL"
-            SORRY_CYPRESS_PROJECT_ID: "artemis-mysql"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:setup && (npm run cypress:record:mysql & sleep 60 && npm run cypress:record:mysql & wait)"
-# Old run method using plain cypress kept here as backup
-#        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:run"
-
-networks:
-    artemis:
-        driver: "bridge"
-        name: artemis
-volumes:
-    artemis-mysql-data:
-        name: artemis-mysql-data
-    artemis-data:
-        name: artemis-data
diff --git a/docker/cypress-E2E-tests-postgres.yml b/docker/cypress-E2E-tests-postgres.yml
deleted file mode 100644
index 41fe8edf5faa..000000000000
--- a/docker/cypress-E2E-tests-postgres.yml
+++ /dev/null
@@ -1,61 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Cypress Setup Postgres
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-    postgres:
-        extends:
-            file: ./postgres.yml
-            service: postgres
-
-    artemis-app:
-        extends:
-            file: ./artemis.yml
-            service: artemis-app
-        depends_on:
-            postgres:
-                condition: service_healthy
-        env_file:
-            - ./artemis/config/postgres.env
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-postgres.env
-
-    nginx:
-        extends:
-            file: ./nginx.yml
-            service: nginx
-        # the artemis-app service needs to be started, otherwise there are problems with name resolution in docker
-        depends_on:
-            artemis-app:
-                condition: service_started
-        volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
-        ports:
-            - "80:80"
-            - "443:443"
-            # see comments in artemis/config/cypress.env why this port is necessary
-            - "54321:54321"
-
-    artemis-cypress:
-        extends:
-            file: ./cypress.yml
-            service: artemis-cypress
-        depends_on:
-            artemis-app:
-                condition: service_healthy
-        environment:
-            CYPRESS_DB_TYPE: "Postgres"
-            SORRY_CYPRESS_PROJECT_ID: "artemis-postgres"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:setup && (npm run cypress:record:postgres & sleep 60 && npm run cypress:record:postgres & wait)"
-# Old run method using plain cypress kept here as backup
-#        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:run"
-
-networks:
-    artemis:
-        driver: "bridge"
-        name: artemis
-volumes:
-    artemis-postgres-data:
-        name: artemis-postgres-data
-    artemis-data:
-        name: artemis-data
diff --git a/docker/cypress.yml b/docker/cypress.yml
deleted file mode 100644
index c4dd1aa58bbb..000000000000
--- a/docker/cypress.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Cypress base service
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-    artemis-cypress:
-        # Cypress image with node and chrome browser installed (Cypress installation needs to be done separately because we require additional dependencies)
-        image: docker.io/cypress/browsers:node-20.6.1-chrome-116.0.5845.187-1-ff-117.0-edge-116.0.1938.76-1
-        pull_policy: if_not_present
-        environment:
-            CYPRESS_baseUrl: "https://artemis-nginx"
-            CYPRESS_video: "${bamboo_cypress_video_enabled}"
-            CYPRESS_adminUsername: "${bamboo_artemis_admin_username}"
-            CYPRESS_adminPassword: "${bamboo_artemis_admin_password}"
-            CYPRESS_username: "${bamboo_cypress_username_template}"
-            CYPRESS_password: "${bamboo_cypress_password_template}"
-            CYPRESS_allowGroupCustomization: "true"
-            CYPRESS_studentGroupName: "artemis-e2etest-students"
-            CYPRESS_tutorGroupName: "artemis-e2etest-tutors"
-            CYPRESS_editorGroupName: "artemis-e2etest-editors"
-            CYPRESS_instructorGroupName: "artemis-e2etest-instructors"
-            CYPRESS_createUsers: "${bamboo_cypress_create_users}"
-            # use alternative cypress version to avoid blocking sorry cypress (see https://currents.dev/readme/integration-with-cypress/alternative-cypress-binaries)
-            CYPRESS_DOWNLOAD_MIRROR: "https://cy-cdn.currents.dev"
-            SORRY_CYPRESS_KEY: "${bamboo_sorry_cypress_record_secret}"
-            SORRY_CYPRESS_URL: "${bamboo_sorry_cypress_url}"
-            SORRY_CYPRESS_BUILD_ID: "${bamboo_buildNumber}"
-            SORRY_CYPRESS_BRANCH_NAME: "${bamboo_planRepository_branchName}"
-            SORRY_CYPRESS_RERUN_COUNT: "${bamboo_RerunBuildTriggerReason_noOfRetries}"
-            SORRY_CYPRESS_PROJECT_ID: "artemis-mysql"
-            NO_COLOR: "1"
-        command: sh -c "cd /app/artemis/src/test/cypress && chmod 777 /root && npm ci && npm run cypress:run"
-        volumes:
-            - ..:/app/artemis
-        networks:
-            - artemis
-
-networks:
-    artemis:
-        driver: "bridge"
-        name: artemis
diff --git a/docker/nginx.yml b/docker/nginx.yml
index 0baaf14a0629..6e111a256a91 100644
--- a/docker/nginx.yml
+++ b/docker/nginx.yml
@@ -18,8 +18,6 @@ services:
             - ./nginx/dhparam.pem:/etc/nginx/dhparam.pem:ro
             - ./nginx/nginx_503.html:/usr/share/nginx/html/503.html:ro
             - ./nginx/70-artemis-setup.sh:/docker-entrypoint.d/70-artemis-setup.sh
-            - ../src/test/cypress/certs/artemis-nginx+4.pem:/certs/fullchain.pem:ro
-            - ../src/test/cypress/certs/artemis-nginx+4-key.pem:/certs/priv_key.pem:ro
             - ../src/test/playwright/certs/artemis-nginx+4.pem:/certs/fullchain.pem:ro
             - ../src/test/playwright/certs/artemis-nginx+4-key.pem:/certs/priv_key.pem:ro
         # ulimits adopted from the nginx_security_limits.conf in the Artemis ansible collection
@@ -29,7 +27,8 @@ services:
                 hard: 1048576
         ports:
             - "80:80"
-            - "443:443"
+            - "443:443/tcp"
+            - "443:443/udp" # HTTP/3
             - "7921:7921" # Git SSH
         # expose the port to make it reachable docker internally even if the external port mapping changes
         expose:
diff --git a/docker/nginx/artemis-nginx-cypress.conf b/docker/nginx/artemis-nginx-playwright.conf
similarity index 100%
rename from docker/nginx/artemis-nginx-cypress.conf
rename to docker/nginx/artemis-nginx-playwright.conf
diff --git a/docker/nginx/artemis-nginx.conf b/docker/nginx/artemis-nginx.conf
index fa8f2d0376eb..cbc10836e993 100644
--- a/docker/nginx/artemis-nginx.conf
+++ b/docker/nginx/artemis-nginx.conf
@@ -18,8 +18,15 @@ server {
 }
 
 server {
-    listen 443 ssl http2;
-    listen [::]:443 ssl http2;
+    listen 443 ssl;
+    listen 443 quic reuseport;
+    listen [::]:443 ssl;
+    listen [::]:443 quic reuseport;
+    http2 on;
+    http3 on;
+    http3_hq on;
+    quic_retry on;
+
     server_name _;
 
     ssl_certificate     /certs/fullchain.pem;
@@ -36,6 +43,7 @@ server {
     ssl_stapling on;
     ssl_stapling_verify on;
 #   ssl_early_data on;
+    quic_gso on;
 
     include includes/artemis-server.conf;
 }
diff --git a/docker/nginx/artemis-server.conf b/docker/nginx/artemis-server.conf
index a9eb9d592d54..d00af9b9c3dd 100644
--- a/docker/nginx/artemis-server.conf
+++ b/docker/nginx/artemis-server.conf
@@ -23,6 +23,8 @@ location / {
     fastcgi_send_timeout 900s;
     fastcgi_read_timeout 900s;
     client_max_body_size 128M;
+    # used to advertise the availability of HTTP/3
+    add_header alt-svc 'h3=":443"; ma=2592000,h3-29=":443"; ma=2592000';
  }
 
 location /api/authenticate {
diff --git a/docker/playwright-E2E-tests-multi-node.yml b/docker/playwright-E2E-tests-multi-node.yml
index 576a695d37ca..bd8a0f52ff05 100644
--- a/docker/playwright-E2E-tests-multi-node.yml
+++ b/docker/playwright-E2E-tests-multi-node.yml
@@ -25,7 +25,7 @@ services:
     env_file:
       - ./artemis/config/prod-multinode.env
       - ./artemis/config/node1.env
-      - ./artemis/config/cypress.env
+      - ./artemis/config/playwright.env
 
   artemis-app-node-2:
     <<: *artemis-app-base
@@ -37,7 +37,7 @@ services:
     env_file:
       - ./artemis/config/prod-multinode.env
       - ./artemis/config/node2.env
-      - ./artemis/config/cypress.env
+      - ./artemis/config/playwright.env
 
   artemis-app-node-3:
     <<: *artemis-app-base
@@ -49,7 +49,7 @@ services:
     env_file:
       - ./artemis/config/prod-multinode.env
       - ./artemis/config/node3.env
-      - ./artemis/config/cypress.env
+      - ./artemis/config/playwright.env
 
   jhipster-registry:
     extends:
@@ -86,17 +86,17 @@ services:
     ports:
       - '80:80'
       - '443:443'
-      # see comments in artemis/config/cypress.env why this port is necessary
+      # see comments in artemis/config/playwright.env why this port is necessary
       - '54321:54321'
     volumes:
       - ./nginx/artemis-upstream-multi-node.conf:/etc/nginx/includes/artemis-upstream.conf:ro
       - ./nginx/artemis-ssh-upstream-multi-node.conf:/etc/nginx/includes/artemis-ssh-upstream.conf:ro
-      - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
+      - ./nginx/artemis-nginx-playwright.conf:/etc/nginx/conf.d/artemis-nginx-playwright.conf:ro
       - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+        source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
         target: "/certs/fullchain.pem"
       - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+        source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
         target: "/certs/priv_key.pem"
 
 
diff --git a/docker/playwright-E2E-tests-mysql-localci.yml b/docker/playwright-E2E-tests-mysql-localci.yml
index a5536baabbb9..aa501ae75192 100644
--- a/docker/playwright-E2E-tests-mysql-localci.yml
+++ b/docker/playwright-E2E-tests-mysql-localci.yml
@@ -17,8 +17,8 @@ services:
             mysql:
                 condition: service_healthy
         env_file:
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-local.env
+            - ./artemis/config/playwright.env
+            - ./artemis/config/playwright-local.env
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
 
@@ -31,11 +31,11 @@ services:
             artemis-app:
                 condition: service_started
         volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
+            - ./nginx/artemis-nginx-playwright.conf:/etc/nginx/conf.d/artemis-nginx-playwright.conf:ro
         ports:
             - '80:80'
             - '443:443'
-            # see comments in artemis/config/cypress.env why this port is necessary
+            # see comments in artemis/config/playwright.env why this port is necessary
             - '54321:54321'
 
     artemis-playwright:
diff --git a/docker/playwright-E2E-tests-mysql.yml b/docker/playwright-E2E-tests-mysql.yml
index 65f9a343b515..c269ce9b206e 100644
--- a/docker/playwright-E2E-tests-mysql.yml
+++ b/docker/playwright-E2E-tests-mysql.yml
@@ -16,8 +16,8 @@ services:
             mysql:
                 condition: service_healthy
         env_file:
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-mysql.env
+            - ./artemis/config/playwright.env
+            - ./artemis/config/playwright-mysql.env
 
     nginx:
         extends:
@@ -28,11 +28,11 @@ services:
             artemis-app:
                 condition: service_started
         volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
+            - ./nginx/artemis-nginx-playwright.conf:/etc/nginx/conf.d/artemis-nginx-playwright.conf:ro
         ports:
             - '80:80'
             - '443:443'
-            # see comments in artemis/config/cypress.env why this port is necessary
+            # see comments in artemis/config/playwright.env why this port is necessary
             - '54321:54321'
 
     artemis-playwright:
diff --git a/docker/playwright-E2E-tests-postgres.yml b/docker/playwright-E2E-tests-postgres.yml
index b2f1aa201bbf..92bde9b2cfe0 100644
--- a/docker/playwright-E2E-tests-postgres.yml
+++ b/docker/playwright-E2E-tests-postgres.yml
@@ -17,8 +17,8 @@ services:
                 condition: service_healthy
         env_file:
             - ./artemis/config/postgres.env
-            - ./artemis/config/cypress.env
-            - ./artemis/config/cypress-postgres.env
+            - ./artemis/config/playwright.env
+            - ./artemis/config/playwright-postgres.env
 
     nginx:
         extends:
@@ -29,11 +29,11 @@ services:
             artemis-app:
                 condition: service_started
         volumes:
-            - ./nginx/artemis-nginx-cypress.conf:/etc/nginx/conf.d/artemis-nginx-cypress.conf:ro
+            - ./nginx/artemis-nginx-playwright.conf:/etc/nginx/conf.d/artemis-nginx-playwright.conf:ro
         ports:
             - '80:80'
             - '443:443'
-            # see comments in artemis/config/cypress.env why this port is necessary
+            # see comments in artemis/config/playwright.env why this port is necessary
             - '54321:54321'
 
     artemis-playwright:
diff --git a/docker/sorry-cypress/.htpasswd b/docker/sorry-cypress/.htpasswd
deleted file mode 100644
index 5122db186396..000000000000
--- a/docker/sorry-cypress/.htpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-# Sample .htaccess file with credentials artemis_admin:artemis_admin
-# Change for production!
-
-artemis_admin: $apr1$95ecxdaf$I1MlWdUoSYOfjdlPqZRGq/
diff --git a/docker/sorry-cypress/README.md b/docker/sorry-cypress/README.md
deleted file mode 100644
index 4ed3fb156daf..000000000000
--- a/docker/sorry-cypress/README.md
+++ /dev/null
@@ -1,40 +0,0 @@
-# Sorry Cypress
-
-Sorry Cypress is an open-source, self-hosted alternative to the Cypress Dashboard, which allows you to manage, execute, and observe your Cypress test runs and results.
-
-## Usage
-
-The dashboard is available on https://sorry-cypress.ase.cit.tum.de, which is secured with a basic authentication. The credentials can be found on  [Confluence](https://confluence.ase.in.tum.de/display/ArTEMiS/Sorry+Cypress+Dashboard).
-
-After login, you can see the active projects for artemis. One for the MySQL and one for the Postgres runs. Clicking on either project will reveal the last runs. Each run is named with a combination of the branch name and the run number. E.g for the 4th run of the branch `feature/add-awesomeness` the name would be `feature/add-awesomeness #4`. On the run overview page, each run shows some basic information, like the run time, if the run is currently running (red dot in front of the run name), the passed and failed tests etc. 
-To debug one of the recent runs, click on the single run and sorry cypress now shows a table with all the different test files that were tested. Select a failed test and you can now see a video of this run. Since cypress is a graphical testing tool, analyzing a video is ofter much more helpful then analyzing the corresponding logs. 
-
-*Hint*: Sometimes it takes a while until the videos are available. So if no video is shown for the run, just visit the page again some minutes later.
-
-## Tech Stack
-
-Also visit the sorry cypress docs for more information: https://docs.sorry-cypress.dev/
-
-### Dashboard 
-
-As mentioned earlier the dashboard allows the developers to get an overview of the last test runs and helps them debug the runs.
-
-### API
-
-The API service is used to gather information from the CI and also provide them to the dashboard. 
-
-### MongoDB
-
-This service is used as a database to store all the run information.
-
-### Director
-
-A service that accepts data from the api and saves it into the database.
-
-### Minio
-
-A AWS S3 and Google Cloud compatible dropin replacement, that is used as a storage provider, storing the videos and screenshots of the run. 
-
-### Nginx
-
-Used as a reverse proxy, that allows to access the different endpoints via HTTPS.
diff --git a/docker/sorry-cypress/SETUP.md b/docker/sorry-cypress/SETUP.md
deleted file mode 100644
index 7d2027c5af6b..000000000000
--- a/docker/sorry-cypress/SETUP.md
+++ /dev/null
@@ -1,25 +0,0 @@
-# Setup Sorry Cypress
-
-1. Use the docker compose file (called `sorry-cypress.yml`) in this folder as base.
-2. Copy the `sorry-cypress.env` file to the folder, where the compose files is placed. Now change all the values in the env file accordingly. 
-  1. Replace the `<insert-minio-access-key>` and `<insert-minio-secret>` with applicable values (e.g random). These values are needed to manage the minio instance. 
-  2. Set a random key for the `ALLOWED_KEYS` (by replacing `<insert-cypress-key>`). This key is needed to authorize bamboo against the sorry-cypress dashboard. 
-3. Place all the necessary NGINX config files in their locations
-  1. Place the `nginx.conf` file from this folder into this path `files/nginx/nginx.conf`
-  2. Place a generated `.htpasswd` file into this path `files/nginx/.htpasswd` (e.g. use a online htpasswd generator). This file is used for the basic auth part of the main dashboard.
-  3. Place/link a public SSL certificate file in this path `files/nginx/fullchain.pem`
-  4. Place/link a private SSL certificate file in this path `files/nginx/privkey.pem`
-4. Ensure that all the URLs within the `nginx.conf` and the `sorry-cypress.yml` file are still valid
-5. Start the containers by using `docker compose up -f sorry-cypress.yml`
-6. Login into the minio dashboard (https://minio.sorry-cypress.ase.cit.tum.de)
-7. Create a new user called "sorry-cypress" (Minio Dashboard -> Identity -> Users)
-8. Assign this user only the `writeOnly` policy
-9. Generate a random access key and a random secret key (e.g by using `openssl rand -base64 24`)
-10. Create and set the just generated `ACCESSKEY` and `SECRETKEY` for this user in the `sorry-cypress.env` file (select the user -> Service Accounts --> Create Access Key)
-11. Insert the `ACCESSKEY` into the .env file by replacing the `<insert-minio-user-access-key>` value
-12. Insert the `SECRETKEY` into the .env file by replacing the `<insert-minio-user-secret>` value
-13. Within the bucket settings, set the lifecycle to delete files ("Expiry") after 14 days.
-14. Under `Policies` create a new policy called `sorry-cypress` with the content of the `minio-user-policy.json` file. Now assign this policy to the `sorry-cypress` user (under `Identity` -> `Users`). This will allow the `sorry-cypress` user to upload and delete files to/from the bucket. 
-15. Recreate the director container, since the new keys need to be applied (e.g with the following commands `docker compose pull -f sorry-cypress.yml` & `docker compose up -f sorry-cypress.yml`)
-16. Access the sorry-cypress dashboard (https://sorry-cypress.ase.cit.tum.de) and create two new projects `artemis-mysql` and `artemis-postgresql`. Set the timeout to a reasonable number (e.g 150 min)
-17. Now everything should be setup
diff --git a/docker/sorry-cypress/minio-user-policy.json b/docker/sorry-cypress/minio-user-policy.json
deleted file mode 100644
index ed036808944a..000000000000
--- a/docker/sorry-cypress/minio-user-policy.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Effect": "Allow",
-            "Action": [
-                "s3:DeleteObject",
-                "s3:GetBucketLocation",
-                "s3:GetObject",
-                "s3:ListBucket",
-                "s3:ListMultipartUploadParts",
-                "s3:PutObject",
-                "s3:AbortMultipartUpload"
-            ],
-            "Resource": [
-                "arn:aws:s3:::sorry-cypress",
-                "arn:aws:s3:::sorry-cypress/*"
-            ]
-        }
-    ]
-}
diff --git a/docker/sorry-cypress/nginx.conf b/docker/sorry-cypress/nginx.conf
deleted file mode 100644
index 4230e2b6961f..000000000000
--- a/docker/sorry-cypress/nginx.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-http {
-    server {
-        listen 80;
-        server_name ${NGINX_MAIN_URL};
-
-        location / {
-            return 301 https://$host$request_uri;
-        }
-    }
-
-    server {
-        listen 443 ssl;
-        server_name ${NGINX_MAIN_URL};
-
-        ssl_certificate /etc/certificates/fullchain.pem;
-        ssl_certificate_key /etc/certificates/privkey.pem;
-        ssl_protocols TLSv1.2 TLSv1.3;
-        ssl_ciphers 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384';
-        ssl_prefer_server_ciphers on;
-
-        location / {
-            proxy_pass http://sry-cypress-dashboard:8080;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_buffering off;
-            proxy_redirect off;
-
-            auth_basic "Restricted";
-            auth_basic_user_file /etc/nginx/.htpasswd;
-        }
-
-        location /api {
-            proxy_pass http://sry-cypress-api:4000;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_buffering off;
-            proxy_redirect off;
-
-            auth_basic "Restricted";
-            auth_basic_user_file /etc/nginx/.htpasswd;
-        }
-
-        location /director {
-            rewrite ^/director(/?.*)$ $1 break;
-            proxy_pass http://sry-cypress-director:1234;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_buffering off;
-            proxy_redirect off;
-        }
-    }
-
-    server {
-        listen 80;
-        server_name ${NGINX_STORAGE_URL};
-
-        location / {
-            return 301 https://$host$request_uri;
-        }
-    }
-
-    server {
-        listen 443 ssl;
-        server_name ${NGINX_STORAGE_URL};
-
-        ssl_certificate /etc/certificates/fullchain.pem;
-        ssl_certificate_key /etc/certificates/privkey.pem;
-        ssl_protocols TLSv1.2 TLSv1.3;
-        ssl_ciphers 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384';
-        ssl_prefer_server_ciphers on;
-
-        # This is needed to allow video file uploads, that are greater than 1MB
-        client_max_body_size 100M;
-
-        location / {
-            proxy_pass http://sry-cypress-minio:9000;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_buffering off;
-            proxy_redirect off;
-        }
-    }
-
-    server {
-        listen 80;
-        server_name ${NGINX_MINIO_URL};
-
-        location / {
-            return 301 https://$host$request_uri;
-        }
-    }
-
-    server {
-        listen 443 ssl;
-        server_name ${NGINX_MINIO_URL};
-
-        ssl_certificate /etc/certificates/fullchain.pem;
-        ssl_certificate_key /etc/certificates/privkey.pem;
-        ssl_protocols TLSv1.2 TLSv1.3;
-        ssl_ciphers 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384';
-        ssl_prefer_server_ciphers on;
-
-        # This is needed to allow video file uploads, that are greater than 1MB
-        client_max_body_size 100M;
-
-        location / {
-            proxy_pass http://sry-cypress-minio:9090;
-            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "upgrade";
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-            proxy_set_header X-Forwarded-Proto $scheme;
-            proxy_buffering off;
-            proxy_redirect off;
-        }
-    }
-}
-
-events { }
diff --git a/docker/sorry-cypress/sorry-cypress.env b/docker/sorry-cypress/sorry-cypress.env
deleted file mode 100644
index 13dda8bd8c07..000000000000
--- a/docker/sorry-cypress/sorry-cypress.env
+++ /dev/null
@@ -1,22 +0,0 @@
-SORRY_CYPRESS_TAG="2.5.4"
-
-MONGO_INITDB_ROOT_USERNAME="sorry-cypress"
-MONGO_INITDB_ROOT_PASSWORD="sorry-cypress"
-MONGODB_URI="mongodb://${MONGO_INITDB_ROOT_USERNAME}:${MONGO_INITDB_ROOT_PASSWORD}@mongo:27017"
-MONGODB_DATABASE="sorry-cypress"
-
-DASHBOARD_URL="https://sorry-cypress.ase.cit.tum.de"
-ALLOWED_KEYS="<insert-cypress-key>"
-MINIO_ACCESS_KEY="<insert-minio-user-access-key>"
-MINIO_SECRET_KEY="<insert-minio-user-secret>"
-MINIO_ENDPOINT="storage.sorry-cypress.ase.cit.tum.de"
-MINIO_URL="https://storage.sorry-cypress.ase.cit.tum.de"
-
-GRAPHQL_SCHEMA_URL="https://sorry-cypress.ase.cit.tum.de/api"
-
-MINIO_ROOT_USER="artemis"
-MINIO_ROOT_PASSWORD="<insert-minio-root-password>"
-
-NGINX_MAIN_URL="sorry-cypress.ase.cit.tum.de"
-NGINX_STORAGE_URL="storage.sorry-cypress.ase.cit.tum.de"
-NGINX_MINIO_URL="minio.sorry-cypress.ase.cit.tum.de"
diff --git a/docker/sorry-cypress/sorry-cypress.yml b/docker/sorry-cypress/sorry-cypress.yml
deleted file mode 100644
index baa7ef99bc32..000000000000
--- a/docker/sorry-cypress/sorry-cypress.yml
+++ /dev/null
@@ -1,107 +0,0 @@
-# ----------------------------------------------------------------------------------------------------------------------
-# Sorry Cypress Setup
-# ----------------------------------------------------------------------------------------------------------------------
-
-services:
-  mongo:
-    image: docker.io/library/mongo:4.4
-    container_name: sry-cypress-mongo
-    restart: always
-    volumes:
-      - ${MONGO_VOLUME_MOUNT:-./files/mongo}:/data/db
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-
-  director:
-    image: docker.io/agoldis/sorry-cypress-director:${SORRY_CYPRESS_TAG:-latest}
-    container_name: sry-cypress-director
-    restart: always
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    environment:
-      EXECUTION_DRIVER: '../execution/mongo/driver'
-      SCREENSHOTS_DRIVER: '../screenshots/minio.driver'
-      MINIO_PORT: '443'
-      MINIO_USESSL: 'true'
-      MINIO_BUCKET: 'sorry-cypress'
-      PROBE_LOGGER: 'false'
-    depends_on:
-      - mongo
-
-  api:
-    image: docker.io/agoldis/sorry-cypress-api:${SORRY_CYPRESS_TAG:-latest}
-    container_name: sry-cypress-api
-    restart: always
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    environment:
-      APOLLO_PLAYGROUND: 'false'
-    depends_on:
-      - mongo
-
-  dashboard:
-    image: docker.io/agoldis/sorry-cypress-dashboard:${SORRY_CYPRESS_TAG:-latest}
-    container_name: sry-cypress-dashboard
-    restart: always
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    environment:
-      GRAPHQL_CLIENT_CREDENTIALS: 'include'
-      PORT: 8080
-      CI_URL: ''
-    expose:
-      - '8080'
-    depends_on:
-      - mongo
-      - api
-
-  storage:
-    image: docker.io/minio/minio
-    container_name: sry-cypress-minio
-    restart: always
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    volumes:
-      - ${MINIO_VOLUME_MOUNT:-./files/minio}:/data
-    command: minio server --console-address ":9090" /data
-
-  createbuckets:
-    image: docker.io/minio/mc
-    container_name: sry-cypress-minio-bucket-creator
-    depends_on:
-      - storage
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    entrypoint: >
-      /bin/sh -c "
-      sleep 3;
-      /usr/bin/mc config host add myminio http://storage:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD;
-      /usr/bin/mc mb myminio/sorry-cypress;
-      /usr/bin/mc anonymous set download myminio/sorry-cypress;
-      exit 0;
-      "
-
-  nginx:
-    image: docker.io/library/nginx
-    container_name: sry-cypress-nginx
-    restart: always
-    ports:
-      - 80:80
-      - 443:443
-    env_file:
-      - ${SORRY_CYPRESS_ENV_FILE:-./sorry-cypress.env}
-    environment:
-      NGINX_ENVSUBST_OUTPUT_DIR: /etc/nginx
-    volumes:
-      - type: bind
-        source: ${NGINX_PROXY_CONFIG_PATH:-./nginx.conf}
-        target: '/etc/nginx/templates/nginx.conf.template'
-      - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../../src/test/cypress/certs/artemis-nginx+4.pem}
-        target: '/etc/certificates/fullchain.pem'
-      - type: bind
-        source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../../src/test/cypress/certs/artemis-nginx+4-key.pem}
-        target: '/etc/certificates/privkey.pem'
-      - type: bind
-        source: ${NGINX_PROXY_HTPASSWD:-./.htpasswd}
-        target: '/etc/nginx/.htpasswd'
diff --git a/docker/test-server-multi-node-mysql-localci.yml b/docker/test-server-multi-node-mysql-localci.yml
index 5bfc08a9c1fe..8de8a926068b 100644
--- a/docker/test-server-multi-node-mysql-localci.yml
+++ b/docker/test-server-multi-node-mysql-localci.yml
@@ -128,10 +128,10 @@ services:
             - ./nginx/artemis-upstream-multi-node.conf:/etc/nginx/includes/artemis-upstream.conf:ro
             - ./nginx/artemis-ssh-upstream-multi-node.conf:/etc/nginx/includes/artemis-ssh-upstream.conf:ro
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docker/test-server-multi-node-postgresql-localci.yml b/docker/test-server-multi-node-postgresql-localci.yml
index 8e0dc02bb592..124a1936aab2 100644
--- a/docker/test-server-multi-node-postgresql-localci.yml
+++ b/docker/test-server-multi-node-postgresql-localci.yml
@@ -100,10 +100,10 @@ services:
             - ./nginx/artemis-upstream-multi-node.conf:/etc/nginx/includes/artemis-upstream.conf:ro
             - ./nginx/artemis-ssh-upstream-multi-node.conf:/etc/nginx/includes/artemis-ssh-upstream.conf:ro
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docker/test-server-mysql-localci.yml b/docker/test-server-mysql-localci.yml
index 29b1881c6bb7..91c7c353bab0 100644
--- a/docker/test-server-mysql-localci.yml
+++ b/docker/test-server-mysql-localci.yml
@@ -47,10 +47,10 @@ services:
         restart: always
         volumes:
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docker/test-server-mysql.yml b/docker/test-server-mysql.yml
index bcd82539e146..5f8c10981cc5 100644
--- a/docker/test-server-mysql.yml
+++ b/docker/test-server-mysql.yml
@@ -44,10 +44,10 @@ services:
         restart: always
         volumes:
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docker/test-server-postgresql-localci.yml b/docker/test-server-postgresql-localci.yml
index 600cd29bf261..d93058788912 100644
--- a/docker/test-server-postgresql-localci.yml
+++ b/docker/test-server-postgresql-localci.yml
@@ -46,10 +46,10 @@ services:
         restart: always
         volumes:
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docker/test-server-postgresql.yml b/docker/test-server-postgresql.yml
index d09cb52dce53..0e3c37e95627 100644
--- a/docker/test-server-postgresql.yml
+++ b/docker/test-server-postgresql.yml
@@ -43,10 +43,10 @@ services:
         restart: always
         volumes:
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/cypress/certs/artemis-nginx+4.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_PATH:-../src/test/playwright/certs/artemis-nginx+4.pem}
               target: "/certs/fullchain.pem"
             - type: bind
-              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/cypress/certs/artemis-nginx+4-key.pem}
+              source: ${NGINX_PROXY_SSL_CERTIFICATE_KEY_PATH:-../src/test/playwright/certs/artemis-nginx+4-key.pem}
               target: "/certs/priv_key.pem"
 
 networks:
diff --git a/docs/.readthedocs.yaml b/docs/.readthedocs.yaml
index 9522486c382b..4e14204d7703 100644
--- a/docs/.readthedocs.yaml
+++ b/docs/.readthedocs.yaml
@@ -4,7 +4,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python: "3.12"
 sphinx:
   fail_on_warning: true
 python:
diff --git a/docs/README.md b/docs/README.md
index aaf6ac4ae190..a806a39d5ef5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -60,11 +60,11 @@ RtD will build and deploy changes automatically.
 You can install Sphinx using `pip` or choose a system-wide installation instead.
 When using pip, consider using [Python virtual environments].
 ```bash
-pip install -r requirements.txt
+pip install -r requirements.txt --break-system-packages
 ```
 or
 ```bash
-pip3 install -r requirements.txt
+pip3 install -r requirements.txt --break-system-packages
 ```
 The [Installing Sphinx] documentation explains more install options.
 For macOS, it is recommended to install it using homebrew:
diff --git a/docs/admin/setup/customization.rst b/docs/admin/setup/customization.rst
index e86adbeca56c..2094cc8b5069 100644
--- a/docs/admin/setup/customization.rst
+++ b/docs/admin/setup/customization.rst
@@ -7,4 +7,5 @@ instead of the TUM defaults:
 * The logo next to the “Artemis” heading on the navbar → ``${artemisRunDirectory}/public/images/logo.png``
 * The favicon → ``${artemisRunDirectory}/logo/favicon.svg``
 * The contact email address in the ``application-{dev,prod}.yml`` configuration file under the key ``info.contact``
+* The operator's name  (e.g. university) and the operator's contact information (administrator email address and name) can be specified in the ``application-{dev,prod}.yml`` configuration file under the keys ``info.operatorName``, ``info.contact`` and ``info.operatorAdminName``. These values are also displayed on the ``/about`` page. The operator's name is required, while the administrator's name is optional. Artemis also uses this information for the :ref:`telemetry` service.
 * The maximal number of plagiarism results stored per plagiarism checks in the ``application-{dev,prod}.yml`` configuration file under the key ``artemis.plagiarism-checks.plagiarism-results-limit``
diff --git a/docs/admin/telemetry.rst b/docs/admin/telemetry.rst
new file mode 100644
index 000000000000..95c3b8168f3a
--- /dev/null
+++ b/docs/admin/telemetry.rst
@@ -0,0 +1,37 @@
+.. _telemetry:
+
+Telemetry
+=========
+
+To help to improve Artemis, we collect some data when the application starts.
+This feature can be disabled by setting `telemetry.enabled` in the `application-prod.yml` to `false`.
+When this is set to false, no data is sent to the Artemis maintainer team.
+By setting `telemetry.sendAdminDetails` to false, personal information of the instance's admin (i.e. contact email and name) is excluded from the telemetry data.
+This includes the contact email and the administrator's name.
+
+Artemis collects the following data at the startup of an instance:
+
+* The used Artemis version
+* The contact email address of the admin, which is set in `info.contact`
+* The name of the admin, set in `info.operatorAdminName` (optional)
+* The server's URL
+* The operator's name
+* The used profiles (e.g. Gitlab, Jenkins, LocalVC, Aeolus, ...)
+
+Example configuration in `application-prod.yml`:
+
+.. code-block:: yaml
+
+    artemis:
+        telemetry:
+            enabled: true
+            sendAdminDetails: false
+            destination: telemetry.artemis.cit.tum.de
+
+    info:
+        contact: contactMailAddress@cit.tum.de
+        operatorName: Technical University of Munich
+        operatorAdminName: Stephan Krusche
+
+We collect this data to enhance Artemis by understanding how it is used, ensuring compatibility with different configurations, and providing better support to our users.
+Collecting admin contact information allows us to communicate important updates or address critical issues directly.
diff --git a/docs/dev/guidelines.rst b/docs/dev/guidelines.rst
index b53f26746d0d..8574b339f28d 100644
--- a/docs/dev/guidelines.rst
+++ b/docs/dev/guidelines.rst
@@ -7,6 +7,7 @@ Coding and design guidelines
    :includehidden:
    :maxdepth: 3
 
+   guidelines/performance
    guidelines/server
    guidelines/server-tests
    guidelines/client
diff --git a/docs/dev/guidelines/database.rst b/docs/dev/guidelines/database.rst
index 7898ab2caa33..0c7119159a9d 100644
--- a/docs/dev/guidelines/database.rst
+++ b/docs/dev/guidelines/database.rst
@@ -1,8 +1,6 @@
-**********************
-Database Relationships
-**********************
-
-WORK IN PROGRESS
+********
+Database
+********
 
 1. Retrieving and Building Objects
 ==================================
diff --git a/docs/dev/guidelines/performance.rst b/docs/dev/guidelines/performance.rst
new file mode 100644
index 000000000000..192f3dc34739
--- /dev/null
+++ b/docs/dev/guidelines/performance.rst
@@ -0,0 +1,219 @@
+***********
+Performance
+***********
+
+These guidelines focus on optimizing the performance of Spring Boot applications using Hibernate, with an emphasis on data economy, large-scale testing, paging, and general SQL database best practices. You can find more best practices in the `Database Guidelines <database.html>`_ section.
+
+1. Data Economy
+===============
+
+**Database-Level Filtering**
+
+Ensure that all filtering is done at the database level rather than in memory. This approach minimizes data transfer to the application and reduces memory usage.
+
+Example:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT e
+          FROM Exercise e
+          WHERE e.course.id = :courseId
+              AND e.releaseDate >= :releaseDate
+          """)
+   List<Exercise> findExercisesByCourseAndReleaseDate(@Param("courseId") Long courseId, @Param("releaseDate") ZonedDateTime releaseDate);
+
+**Projections and DTOs**
+
+When only a subset of fields is needed, use projections or Data Transfer Objects (DTOs) instead of fetching entire entities. This reduces the amount of data loaded and improves query performance.
+
+Example:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT new com.example.dto.ExerciseDTO(e.id, e.title)
+          FROM Exercise e
+          WHERE e.course.id = :courseId
+          AND e.releaseDate >= :releaseDate
+          """)
+   List<ExerciseDTO> findExerciseDTOsByCourseAndReleaseDate(@Param("courseId") Long courseId, @Param("releaseDate") ZonedDateTime releaseDate);
+
+2. Large Scale Testing
+=======================
+
+**Test with Realistic Data Loads**
+
+Given that courses can have up to 2,000 students, simulate this scale during testing to identify potential performance bottlenecks when handling large amounts of data.
+
+**Benchmarking**
+
+Perform load testing to ensure that the application can handle the expected volume of data efficiently.
+
+Example:
+
+Use tools like JMeter or Gatling to simulate concurrent users and large datasets.
+
+3. Paging
+=========
+
+**Implement Paging for Large Results**
+
+For queries that return large datasets, implement pagination to avoid loading too much data into memory at once.
+
+Example:
+
+.. code-block:: java
+
+   Page<Exercise> findByCourseId(Long courseId, Pageable pageable);
+
+**Caution with Collection Fetching and Pagination**
+
+Avoid combining `LEFT JOIN FETCH` with pagination, as this can cause performance issues or even fail due to the Cartesian Product problem.
+
+Example:
+
+Instead of:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT c
+          FROM Course c
+              LEFT JOIN FETCH c.exercises
+          WHERE c.id = :courseId
+          """)
+   Page<Course> findCourseWithExercises(@Param("courseId") Long courseId, Pageable pageable);
+
+Do:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT c
+          FROM Course c
+          WHERE c.id = :courseId
+          """)
+   Course findCourseById(@Param("courseId") Long courseId);
+
+   // Fetch exercises in a separate query if needed
+   @Query("""
+          SELECT e
+          FROM Exercise e
+          WHERE e.course.id = :courseId
+          """)
+   List<Exercise> findExercisesByCourseId(@Param("courseId") Long courseId);
+
+You can find out more on https://vladmihalcea.com/hibernate-query-fail-on-pagination-over-collection-fetch
+
+4. Avoiding the N+1 Issue
+=========================
+
+**Eager Fetching and Left Join Fetch**
+
+The N+1 query issue occurs when lazy-loaded collections cause multiple queries to be executed — one for the parent entity and additional queries for each related entity. To avoid this issue, consider using eager fetching or `JOIN FETCH` for collections that are critical to performance.
+
+Example:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT e
+          FROM Exercise e
+          JOIN FETCH e.submissions
+          WHERE e.course.id = :courseId
+          """)
+   List<Exercise> findExercisesWithSubmissions(@Param("courseId") Long courseId);
+
+In this example, the query fetches exercises along with their submissions in a single query, avoiding the N+1 problem. Be cautious, however, as fetching too many collections eagerly can lead to performance degradation due to large result sets.
+
+
+5. Optimal Use of Left Join Fetch
+=================================
+
+**Balance Between Queries**
+
+While reducing the number of queries by using `LEFT JOIN FETCH` is often beneficial, overusing this strategy can lead to performance issues, especially when fetching multiple `OneToMany` relationships. As a best practice, avoid fetching more than three `OneToMany` collections in a single query.
+
+Example:
+
+.. code-block:: java
+
+   @Query("""
+          SELECT c
+          FROM Course c
+              LEFT JOIN FETCH c.exercises e
+              LEFT JOIN FETCH e.participations
+          WHERE c.id = :courseId
+          """)
+   Course findCourseWithExercisesAndParticipations(@Param("courseId") Long courseId);
+
+This query efficiently fetches a course with its exercises and their submissions. However, if more collections are added to the fetch, consider splitting the query into multiple parts to prevent large result sets and excessive memory usage.
+
+**Selective Fetching**
+
+Use lazy loading by default, and override with `JOIN FETCH` only when necessary for performance-critical queries. This approach minimizes the risk of performance degradation due to large query results.
+
+Example:
+
+.. code-block:: java
+
+   @Entity
+   public class Exercise {
+
+       @OneToMany(fetch = FetchType.LAZY, mappedBy = "exercise")
+       private List<Participation> participations;
+
+       // Other fields and methods
+   }
+
+By default, participations are lazily loaded. When you need to fetch them, use a specific `JOIN FETCH` query only in performance-sensitive situations. Alternatively, consider using ``@EntityGraph`` to define fetch plans for specific queries.
+
+6. General SQL Database Best Practices
+======================================
+
+**Indexing**
+
+Indexes are critical for query performance, especially on columns that are frequently used in `WHERE` clauses, `JOIN` conditions, or are sorted. Ensure that all key fields, such as `releaseDate` and `courseId`, are properly indexed.
+
+Example:
+
+Create an index on the `releaseDate` column to speed up queries filtering exercises by date:
+
+.. code-block:: sql
+
+   CREATE INDEX idx_exercise_release_date ON exercise(release_date);
+
+**Normalization vs. Denormalization**
+
+While normalization reduces data redundancy, it can lead to complex queries with multiple joins. In scenarios where read performance is critical, consider denormalizing certain tables to reduce the number of joins. However, always balance this against potential issues such as data inconsistency and increased storage requirements.
+
+**Use of Foreign Keys**
+
+Maintain foreign key constraints to enforce data integrity. However, be aware of the potential performance impact on insert, update, and delete operations in high-load scenarios. Proper indexing can help mitigate these effects.
+
+Example:
+
+.. code-block:: sql
+
+   ALTER TABLE submission ADD CONSTRAINT fk_exercise FOREIGN KEY (exercise_id) REFERENCES exercise(id);
+
+This foreign key ensures that submissions are always linked to a valid exercise, maintaining data integrity.
+
+**Query Optimization**
+
+Regularly review and optimize SQL queries to ensure they are performing efficiently. Use tools like `EXPLAIN` to analyze query execution plans and make adjustments where necessary.
+
+Example:
+
+.. code-block:: sql
+
+   EXPLAIN SELECT * FROM exercise WHERE course_id = 1 AND release_date > '2024-01-01';
+
+Use the `EXPLAIN` output to identify slow-running queries and optimize them by adding indexes, rewriting queries, or adjusting table structures.
+
+**Avoid Transactions**
+
+Transactions are generally very slow and should be avoided when possible.
+
+By following these best practices, you can build Spring Boot applications with Hibernate that are optimized for performance, even under the demands of large-scale data processing.
diff --git a/docs/dev/guidelines/server.rst b/docs/dev/guidelines/server.rst
index 9e5a8ce068de..a4e510f362b0 100644
--- a/docs/dev/guidelines/server.rst
+++ b/docs/dev/guidelines/server.rst
@@ -99,7 +99,7 @@ Avoid code duplication. If we cannot reuse a method elsewhere, then the method i
 8. Comments
 ===========
 
-Only write comments for complicated algorithms, to help other developers better understand them. We should only add a comment, if our code is not self-explanatory.
+Always add JavaDoc and inline comments to help other developers better understand the code and the rationale behind it. ChatGPT can be a great help. It can generate comments for you, but you should always check them and adjust them to your needs. Prefer more extensive comments and documentation and avoid useless and non sense documentation. Comments should always be in English.
 
 9. Utility
 ==========
@@ -121,10 +121,10 @@ It gets activated when a particular jar file is detected on the classpath. The s
 
 * RestControllers should be stateless.
 * RestControllers are by default singletons.
-* RestControllers should not execute business logic but rely on delegation.
-* RestControllers should deal with the HTTP layer of the application.
+* RestControllers should not execute business logic but rely on delegation to ``@Service`` classes.
+* RestControllers should deal with the HTTP layer of the application, handle access control, input data validation, output data cleanup (if necessary) and error handling.
 * RestControllers should be oriented around a use-case/business-capability.
-* RestControllers should return DTOs that are as small as possible
+* RestControllers must always return DTOs that are as small as possible (please focus on data economy to improve performance and follow data privacy principles).
 
 Route naming conventions:
 
diff --git a/docs/index.rst b/docs/index.rst
index 64cd387ed5e1..32c130434e4f 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -77,6 +77,7 @@ All these exercises are supposed to be run either live in the lecture with insta
    admin/database
    admin/knownIssues
    admin/benchmarking-tool
+   admin/telemetry
 
 
 .. toctree::
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 980c9ef308b6..d7f6f239f035 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,4 @@
-Sphinx==7.2.6
+Sphinx==7.4.7
 sphinx-rtd-theme==2.0.0
-sphinx-autobuild==2024.2.4
+sphinx-autobuild==2024.04.16
 sphinxcontrib-bibtex==2.6.2
diff --git a/docs/user/exercises/programming-exercise-features.inc b/docs/user/exercises/programming-exercise-features.inc
index e73c16088efe..3675a9e4c2b0 100644
--- a/docs/user/exercises/programming-exercise-features.inc
+++ b/docs/user/exercises/programming-exercise-features.inc
@@ -33,6 +33,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------+---------+
   | OCaml                | yes      | no      |
   +----------------------+----------+---------+
+  | Rust                 | yes      | yes     |
+  +----------------------+----------+---------+
 
 - Not all ``templates`` support the same feature set and supported features can also change depending on the continuous integration system setup.
   Depending on the feature set, some options might not be available during the creation of the programming exercise.
@@ -63,6 +65,8 @@ Instructors can still use those templates to generate programming exercises and
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
   | OCaml                | no                   | no                   | no                  | no           | n/a                                      | yes                          | no                         | L: yes, J: no          |
   +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
+  | Rust                 | no                   | no                   | no                  | no           | n/a                                      | no                           | no                         | L: yes, J: no          |
+  +----------------------+----------------------+----------------------+---------------------+--------------+------------------------------------------+------------------------------+----------------------------+------------------------+
 
   - *Sequential Test Runs*: ``Artemis`` can generate a build plan which first executes structural and then behavioral tests. This feature can help students to better concentrate on the immediate challenge at hand.
   - *Static Code Analysis*: ``Artemis`` can generate a build plan which additionally executes static code analysis tools.
diff --git a/eslint.config.js b/eslint.config.js
index 14d17e283ee0..622299e984e1 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -27,7 +27,6 @@ module.exports = [
             'repos-download/',
             'src/main/generated/',
             'src/main/resources/',
-            'src/test/cypress/', // until we delete those files, we ignore them
             'target/',
             'uploads/',
         ],
@@ -37,19 +36,13 @@ module.exports = [
         languageOptions: {
             parser: typescriptParser,
             parserOptions: {
-                project: [
-                    './tsconfig.json',
-                    './tsconfig.app.json',
-                    './tsconfig.spec.json',
-                    'src/test/cypress/tsconfig.json',
-                    'src/test/playwright/tsconfig.json',
-                ],
+                project: ['./tsconfig.json', './tsconfig.app.json', './tsconfig.spec.json', 'src/test/playwright/tsconfig.json'],
             },
         },
         plugins: {
             '@typescript-eslint': tsPlugin,
             '@angular-eslint': angularPlugin,
-            'prettier': prettierPlugin,
+            prettier: prettierPlugin,
         },
         rules: {
             ...prettierPlugin.configs.recommended.rules,
@@ -102,7 +95,7 @@ module.exports = [
         },
         plugins: {
             '@angular-eslint': angularPlugin,
-            'prettier': prettierPlugin,
+            prettier: prettierPlugin,
         },
         rules: {
             // ...angularPlugin.configs['template/recommended'].rules,
@@ -126,7 +119,7 @@ module.exports = [
     {
         files: ['src/test/javascript/**'],
         plugins: {
-            'jest': jestPlugin,
+            jest: jestPlugin,
             'jest-extended': jestExtendedPlugin,
         },
         rules: {
diff --git a/gradle.properties b/gradle.properties
index db7d546da641..80dbe5279b3e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,29 +6,29 @@ node_version=20.14.0
 npm_version=10.7.0
 
 # Dependency versions
-jhipster_dependencies_version=8.6.0
-spring_boot_version=3.3.2
-spring_security_version=6.3.1
-# TODO: before we upgrade to 6.5.x, we need to make sure that there are no performance issues with empty sets or lists
-hibernate_version=6.4.9.Final
+jhipster_dependencies_version=8.7.0
+spring_boot_version=3.3.3
+spring_security_version=6.3.3
+# TODO: upgrading to 6.6.0 currently leads to issues due to internal changes in Hibernate and potentially wrong use in Artemis server code
+hibernate_version=6.4.10.Final
 # TODO: can we update to 5.x?
 opensaml_version=4.3.2
 jwt_version=0.12.6
 jaxb_runtime_version=4.0.5
-# TODO: we cannot update to 5.5.0 because we currently use the CP Subsystem for fenced locks, however CP Subsystem is only available to Enterprise customers
-hazelcast_version=5.4.0
+hazelcast_version=5.5.0
 junit_version=5.10.2
-mockito_version=5.12.0
+mockito_version=5.13.0
 fasterxml_version=2.17.2
 jgit_version=6.10.0.202406032230-r
 sshd_version=2.13.2
-checkstyle_version=10.17.0
+checkstyle_version=10.18.1
 jplag_version=5.1.0
 slf4j_version=2.0.16
-sentry_version=7.13.0
+sentry_version=7.14.0
 liquibase_version=4.29.1
 docker_java_version=3.4.0
-logback_version=1.5.6
+logback_version=1.5.7
+java_parser_version=3.26.1
 
 # gradle plugin version
 gradle_node_plugin_version=7.0.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d4..a4b76b9530d6 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0e5490..9355b4155759 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a426907..f5feea6d6b11 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 25da30dbdeee..9d21a21834d5 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/package-lock.json b/package-lock.json
index 499b23182e65..f05b86d4cc8f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,27 +1,27 @@
 {
     "name": "artemis",
-    "version": "7.5.1",
+    "version": "7.5.2",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "artemis",
-            "version": "7.5.1",
+            "version": "7.5.2",
             "hasInstallScript": true,
             "license": "MIT",
             "dependencies": {
-                "@angular/animations": "18.1.4",
-                "@angular/cdk": "18.1.4",
-                "@angular/common": "18.1.4",
-                "@angular/compiler": "18.1.4",
-                "@angular/core": "18.1.4",
-                "@angular/forms": "18.1.4",
-                "@angular/localize": "18.1.4",
-                "@angular/material": "18.1.4",
-                "@angular/platform-browser": "18.1.4",
-                "@angular/platform-browser-dynamic": "18.1.4",
-                "@angular/router": "18.1.4",
-                "@angular/service-worker": "18.1.4",
+                "@angular/animations": "18.2.3",
+                "@angular/cdk": "18.2.3",
+                "@angular/common": "18.2.3",
+                "@angular/compiler": "18.2.3",
+                "@angular/core": "18.2.3",
+                "@angular/forms": "18.2.3",
+                "@angular/localize": "18.2.3",
+                "@angular/material": "18.2.3",
+                "@angular/platform-browser": "18.2.3",
+                "@angular/platform-browser-dynamic": "18.2.3",
+                "@angular/router": "18.2.3",
+                "@angular/service-worker": "18.2.3",
                 "@ctrl/ngx-emoji-mart": "9.2.0",
                 "@danielmoncada/angular-datetime-picker": "18.1.0",
                 "@fingerprintjs/fingerprintjs": "4.4.3",
@@ -31,23 +31,21 @@
                 "@fortawesome/free-regular-svg-icons": "6.6.0",
                 "@fortawesome/free-solid-svg-icons": "6.6.0",
                 "@ls1intum/apollon": "3.3.14",
-                "@ng-bootstrap/ng-bootstrap": "17.0.0",
+                "@ng-bootstrap/ng-bootstrap": "17.0.1",
                 "@ngx-translate/core": "15.0.0",
                 "@ngx-translate/http-loader": "8.0.0",
-                "@sentry/angular": "8.25.0",
+                "@sentry/angular": "8.28.0",
                 "@swimlane/ngx-charts": "20.5.0",
                 "@swimlane/ngx-graph": "8.4.0",
                 "@vscode/codicons": "0.0.36",
-                "ace-builds": "1.35.4",
                 "bootstrap": "5.3.3",
-                "brace": "0.11.1",
                 "compare-versions": "6.1.1",
-                "core-js": "3.38.0",
+                "core-js": "3.38.1",
                 "crypto-js": "4.2.0",
-                "dayjs": "1.11.12",
-                "diff-match-patch-typescript": "1.0.8",
+                "dayjs": "1.11.13",
+                "diff-match-patch-typescript": "1.1.0",
                 "dompurify": "3.1.6",
-                "export-to-csv": "1.3.0",
+                "export-to-csv": "1.4.0",
                 "fast-json-patch": "3.1.1",
                 "franc-min": "6.2.0",
                 "html-diff-ts": "1.4.2",
@@ -57,21 +55,22 @@
                 "jszip": "3.10.1",
                 "lodash-es": "4.17.21",
                 "mobile-drag-drop": "3.0.0-rc.0",
-                "monaco-editor": "0.50.0",
+                "monaco-editor": "0.51.0",
                 "ngx-infinite-scroll": "18.0.0",
                 "ngx-webstorage": "18.0.0",
                 "papaparse": "5.4.1",
-                "posthog-js": "1.155.0",
+                "pdfjs-dist": "4.6.82",
+                "posthog-js": "1.160.3",
                 "rxjs": "7.8.1",
                 "showdown": "2.1.0",
                 "showdown-highlight": "3.1.0",
                 "showdown-katex": "0.6.0",
-                "simple-statistics": "7.8.3",
+                "simple-statistics": "7.8.5",
                 "smoothscroll-polyfill": "0.4.4",
                 "sockjs-client": "1.6.1",
                 "split.js": "1.6.5",
                 "ts-cacheable": "1.0.10",
-                "tslib": "2.6.3",
+                "tslib": "2.7.0",
                 "uuid": "10.0.0",
                 "webstomp-client": "1.2.6",
                 "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -79,37 +78,37 @@
             },
             "devDependencies": {
                 "@angular-builders/jest": "18.0.0",
-                "@angular-devkit/build-angular": "18.1.4",
-                "@angular-eslint/builder": "18.2.0",
-                "@angular-eslint/eslint-plugin": "18.2.0",
-                "@angular-eslint/eslint-plugin-template": "18.2.0",
-                "@angular-eslint/schematics": "18.2.0",
-                "@angular-eslint/template-parser": "18.2.0",
-                "@angular/cli": "18.1.4",
-                "@angular/compiler-cli": "18.1.4",
-                "@angular/language-service": "18.1.4",
-                "@sentry/types": "8.25.0",
+                "@angular-devkit/build-angular": "18.2.3",
+                "@angular-eslint/builder": "18.3.0",
+                "@angular-eslint/eslint-plugin": "18.3.0",
+                "@angular-eslint/eslint-plugin-template": "18.3.0",
+                "@angular-eslint/schematics": "18.3.0",
+                "@angular-eslint/template-parser": "18.3.0",
+                "@angular/cli": "18.2.3",
+                "@angular/compiler-cli": "18.2.3",
+                "@angular/language-service": "18.2.3",
+                "@sentry/types": "8.28.0",
                 "@types/crypto-js": "4.2.2",
                 "@types/d3-shape": "3.1.6",
                 "@types/dompurify": "3.0.5",
                 "@types/jest": "29.5.12",
                 "@types/lodash-es": "4.17.12",
-                "@types/node": "22.2.0",
+                "@types/node": "22.5.4",
                 "@types/papaparse": "5.3.14",
                 "@types/showdown": "2.0.6",
                 "@types/smoothscroll-polyfill": "0.3.4",
                 "@types/sockjs-client": "1.5.4",
                 "@types/uuid": "10.0.0",
-                "@typescript-eslint/eslint-plugin": "8.1.0",
-                "@typescript-eslint/parser": "8.1.0",
-                "eslint": "9.9.0",
+                "@typescript-eslint/eslint-plugin": "8.4.0",
+                "@typescript-eslint/parser": "8.4.0",
+                "eslint": "9.9.1",
                 "eslint-config-prettier": "9.1.0",
                 "eslint-plugin-deprecation": "3.0.0",
-                "eslint-plugin-jest": "28.8.0",
+                "eslint-plugin-jest": "28.8.3",
                 "eslint-plugin-jest-extended": "2.4.0",
                 "eslint-plugin-prettier": "5.2.1",
                 "folder-hash": "4.0.4",
-                "husky": "9.1.4",
+                "husky": "9.1.5",
                 "jest": "29.7.0",
                 "jest-canvas-mock": "2.5.2",
                 "jest-date-mock": "1.0.10",
@@ -117,11 +116,12 @@
                 "jest-fail-on-console": "3.3.0",
                 "jest-junit": "16.0.0",
                 "jest-preset-angular": "14.2.2",
-                "lint-staged": "15.2.8",
-                "ng-mocks": "14.13.0",
+                "lint-staged": "15.2.10",
+                "ng-mocks": "14.13.1",
                 "prettier": "3.3.3",
-                "sass": "1.77.8",
-                "ts-jest": "29.2.4",
+                "rimraf": "6.0.1",
+                "sass": "1.78.0",
+                "ts-jest": "29.2.5",
                 "typescript": "5.5.4",
                 "weak-napi": "2.0.2"
             },
@@ -211,13 +211,13 @@
             }
         },
         "node_modules/@angular-devkit/architect": {
-            "version": "0.1801.4",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1801.4.tgz",
-            "integrity": "sha512-Ch1ZwRh1N/vcCKHm4ErLcgZly3tlwdLUDGBaAIlhE3YFGq543Swv6a5IcDw0veD6iGFceJAmbrp+z5hmzI8p5A==",
+            "version": "0.1802.3",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1802.3.tgz",
+            "integrity": "sha512-WQ2AmkUKy1bqrDlNfozW8+VT2Tv/Fdmu4GIXps3ytZANyAKiIvTzmmql2cRCXXraa9FNMjLWNvz+qolDxWVdYQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "18.1.4",
+                "@angular-devkit/core": "18.2.3",
                 "rxjs": "7.8.1"
             },
             "engines": {
@@ -227,48 +227,48 @@
             }
         },
         "node_modules/@angular-devkit/build-angular": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.1.4.tgz",
-            "integrity": "sha512-CCoPT2fFw1DD3j9eSP3GKbp9KfvxQQfY6kV2aec0pqL/c6byz4/ku+rsV4lwE0N/dcaglwhttq4Xf+u+pkEpiw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-angular/-/build-angular-18.2.3.tgz",
+            "integrity": "sha512-uUQba0SIskKORHcPayt7LpqPRKD//48EW92SgGHEArn2KklM+FSYBOA9OtrJeZ/UAcoJpdLDtvyY4+S7oFzomg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "2.3.0",
-                "@angular-devkit/architect": "0.1801.4",
-                "@angular-devkit/build-webpack": "0.1801.4",
-                "@angular-devkit/core": "18.1.4",
-                "@angular/build": "18.1.4",
-                "@babel/core": "7.24.7",
-                "@babel/generator": "7.24.7",
+                "@angular-devkit/architect": "0.1802.3",
+                "@angular-devkit/build-webpack": "0.1802.3",
+                "@angular-devkit/core": "18.2.3",
+                "@angular/build": "18.2.3",
+                "@babel/core": "7.25.2",
+                "@babel/generator": "7.25.0",
                 "@babel/helper-annotate-as-pure": "7.24.7",
                 "@babel/helper-split-export-declaration": "7.24.7",
-                "@babel/plugin-transform-async-generator-functions": "7.24.7",
+                "@babel/plugin-transform-async-generator-functions": "7.25.0",
                 "@babel/plugin-transform-async-to-generator": "7.24.7",
                 "@babel/plugin-transform-runtime": "7.24.7",
-                "@babel/preset-env": "7.24.7",
-                "@babel/runtime": "7.24.7",
-                "@discoveryjs/json-ext": "0.5.7",
-                "@ngtools/webpack": "18.1.4",
+                "@babel/preset-env": "7.25.3",
+                "@babel/runtime": "7.25.0",
+                "@discoveryjs/json-ext": "0.6.1",
+                "@ngtools/webpack": "18.2.3",
                 "@vitejs/plugin-basic-ssl": "1.1.0",
                 "ansi-colors": "4.1.3",
-                "autoprefixer": "10.4.19",
+                "autoprefixer": "10.4.20",
                 "babel-loader": "9.1.3",
                 "browserslist": "^4.21.5",
                 "copy-webpack-plugin": "12.0.2",
                 "critters": "0.0.24",
                 "css-loader": "7.1.2",
-                "esbuild-wasm": "0.21.5",
+                "esbuild-wasm": "0.23.0",
                 "fast-glob": "3.3.2",
                 "http-proxy-middleware": "3.0.0",
                 "https-proxy-agent": "7.0.5",
-                "istanbul-lib-instrument": "6.0.2",
+                "istanbul-lib-instrument": "6.0.3",
                 "jsonc-parser": "3.3.1",
                 "karma-source-map-support": "1.4.0",
                 "less": "4.2.0",
                 "less-loader": "12.2.0",
                 "license-webpack-plugin": "4.0.2",
                 "loader-utils": "3.3.1",
-                "magic-string": "0.30.10",
+                "magic-string": "0.30.11",
                 "mini-css-extract-plugin": "2.9.0",
                 "mrmime": "2.0.0",
                 "open": "10.1.0",
@@ -276,25 +276,24 @@
                 "parse5-html-rewriting-stream": "7.0.0",
                 "picomatch": "4.0.2",
                 "piscina": "4.6.1",
-                "postcss": "8.4.38",
+                "postcss": "8.4.41",
                 "postcss-loader": "8.1.1",
                 "resolve-url-loader": "5.0.0",
                 "rxjs": "7.8.1",
                 "sass": "1.77.6",
-                "sass-loader": "14.2.1",
-                "semver": "7.6.2",
+                "sass-loader": "16.0.0",
+                "semver": "7.6.3",
                 "source-map-loader": "5.0.0",
                 "source-map-support": "0.5.21",
-                "terser": "5.29.2",
+                "terser": "5.31.6",
                 "tree-kill": "1.2.2",
                 "tslib": "2.6.3",
-                "undici": "6.19.2",
-                "vite": "5.3.2",
+                "vite": "5.4.0",
                 "watchpack": "2.4.1",
-                "webpack": "5.92.1",
-                "webpack-dev-middleware": "7.2.1",
+                "webpack": "5.94.0",
+                "webpack-dev-middleware": "7.4.2",
                 "webpack-dev-server": "5.0.4",
-                "webpack-merge": "5.10.0",
+                "webpack-merge": "6.0.1",
                 "webpack-subresource-integrity": "5.1.0"
             },
             "engines": {
@@ -303,7 +302,7 @@
                 "yarn": ">= 1.13.0"
             },
             "optionalDependencies": {
-                "esbuild": "0.21.5"
+                "esbuild": "0.23.0"
             },
             "peerDependencies": {
                 "@angular/compiler-cli": "^18.0.0",
@@ -374,14 +373,21 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@angular-devkit/build-angular/node_modules/tslib": {
+            "version": "2.6.3",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+            "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+            "dev": true,
+            "license": "0BSD"
+        },
         "node_modules/@angular-devkit/build-webpack": {
-            "version": "0.1801.4",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1801.4.tgz",
-            "integrity": "sha512-Srhs/PcnuUaMiO9FLQLi1QiGZqtnG5NTpkufjJuWxolSLGNRmb/h/ZeCYgRnxeH/4jd8GCD31RD78qy+pviiLQ==",
+            "version": "0.1802.3",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1802.3.tgz",
+            "integrity": "sha512-/Nixv9uAg6v/OPoZa0PB0zi+iezzBkgLrnrJnestny5B536l9WRtsw97RjeQDu+x2BClQsxNe8NL2A7EvjVD6w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/architect": "0.1801.4",
+                "@angular-devkit/architect": "0.1802.3",
                 "rxjs": "7.8.1"
             },
             "engines": {
@@ -395,13 +401,13 @@
             }
         },
         "node_modules/@angular-devkit/core": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.1.4.tgz",
-            "integrity": "sha512-lKBsvbqW2QFL8terzNuSDSmKBo8//QNRO4qU5mVJ1fFf4xBJanXKoiAMuADhx+/owVIptnYT59IZ8jUAna+Srg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-18.2.3.tgz",
+            "integrity": "sha512-vbFs+ofNK9OWeMIcFarFjegXVklhtSdLTEFKZ9trDVr8alTJdjI9AiYa6OOUTDAyq0hqYxV26xlCisWAPe7s5w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "ajv": "8.16.0",
+                "ajv": "8.17.1",
                 "ajv-formats": "3.0.1",
                 "jsonc-parser": "3.3.1",
                 "picomatch": "4.0.2",
@@ -423,15 +429,15 @@
             }
         },
         "node_modules/@angular-devkit/schematics": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.1.4.tgz",
-            "integrity": "sha512-0ekArCeYqJngCKWZ9I+RtNObP/33zGkzWdJOmCB6nj9/ZevALZ6F4RDkHp0TqDYhOt+A2muI29ZK/cILmKA+sA==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.2.3.tgz",
+            "integrity": "sha512-N3tRAzBW2yWQhebvc1Ha18XTMSXOQTfr8HNjx7Fasx0Fg1tNyGR612MJNZw6je/PqyItKeUHOhztvFMfCQjRyg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "18.1.4",
+                "@angular-devkit/core": "18.2.3",
                 "jsonc-parser": "3.3.1",
-                "magic-string": "0.30.10",
+                "magic-string": "0.30.11",
                 "ora": "5.4.1",
                 "rxjs": "7.8.1"
             },
@@ -442,36 +448,32 @@
             }
         },
         "node_modules/@angular-eslint/builder": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.2.0.tgz",
-            "integrity": "sha512-2NsrYqvVVha2XUUXm1T0XshW0d1TzYU6rXNCTut1t8qS/uinbxNiszKzJN1TuUsXFwpZfITRnEY3cjaqJDlsdA==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-18.3.0.tgz",
+            "integrity": "sha512-httEQyqyBw3+0CRtAa7muFxHrauRfkEfk/jmrh5fn2Eiu+I53hAqFPgrwVi1V6AP/kj2zbAiWhd5xM3pMJdoRQ==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "@nx/devkit": "^19.0.6",
-                "nx": "^19.0.6"
-            },
             "peerDependencies": {
                 "eslint": "^8.57.0 || ^9.0.0",
                 "typescript": "*"
             }
         },
         "node_modules/@angular-eslint/bundled-angular-compiler": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.2.0.tgz",
-            "integrity": "sha512-p/YvlvDJscSAbNOOAbT/BRdscEfWpQunUK+KuWM6/PXL07tTVae5dmp8B8A5am7Cxvp+ZVLVLZG4LFYB1TX1cw==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-18.3.0.tgz",
+            "integrity": "sha512-v/59FxUKnMzymVce99gV43huxoqXWMb85aKvzlNvLN+ScDu6ZE4YMiTQNpfapVL2lkxhs0uwB3jH17EYd5TcsA==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@angular-eslint/eslint-plugin": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.2.0.tgz",
-            "integrity": "sha512-vJ7pstQPqCqkvMrEsjjocvHdPBl/frs0+fqkckog2Sq0QisBEjUPkbImvId6dw7JzxSDSvttdAklakF97CE4VA==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-18.3.0.tgz",
+            "integrity": "sha512-Vl7gfPMXxvtHTjYdlzR161aj5xrqW6T57wd8ToQ7Gqzm0qHGfY6kE4SQobUa2LCYckTNSlv+zXe48C4ah/dSjw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-eslint/bundled-angular-compiler": "18.2.0",
-                "@angular-eslint/utils": "18.2.0"
+                "@angular-eslint/bundled-angular-compiler": "18.3.0",
+                "@angular-eslint/utils": "18.3.0"
             },
             "peerDependencies": {
                 "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -480,14 +482,14 @@
             }
         },
         "node_modules/@angular-eslint/eslint-plugin-template": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.2.0.tgz",
-            "integrity": "sha512-YHh+AUY9ubLAdmIRXH8vSpv+8EQkGjdX3B9xdj/grnrVzgzu+5W86F/spGp2tEny9l85R3JZNqjaMpW/vwibfw==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-18.3.0.tgz",
+            "integrity": "sha512-ddR/qwYbUeq9IpyVKrPbfZyRBTy6V8uc5I0JcBKttQ4CZ4joXhqsVgWFsI+JAMi8E66uNj1VC7NuKCOjDINv2Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-eslint/bundled-angular-compiler": "18.2.0",
-                "@angular-eslint/utils": "18.2.0",
+                "@angular-eslint/bundled-angular-compiler": "18.3.0",
+                "@angular-eslint/utils": "18.3.0",
                 "aria-query": "5.3.0",
                 "axobject-query": "4.1.0"
             },
@@ -498,17 +500,15 @@
             }
         },
         "node_modules/@angular-eslint/schematics": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.2.0.tgz",
-            "integrity": "sha512-6niXUrwyAmhuFcsRx88cOOVrko0EmsUGjLZ4yso3op/I9ZgI4SfuLCtl9gzJIR4TLBYc4zAuC/TE/rsLP+WCtw==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-18.3.0.tgz",
+            "integrity": "sha512-rQ4DEWwf3f5n096GAK6JvXD0SRzRJ52WRaIyKg8MMkk6qvUDfZI8seOkcbjDtZoIe6Ds7DfqSfJgNVte75qvPQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-eslint/eslint-plugin": "18.2.0",
-                "@angular-eslint/eslint-plugin-template": "18.2.0",
-                "@nx/devkit": "^19.0.6",
-                "ignore": "5.3.1",
-                "nx": "^19.0.6",
+                "@angular-eslint/eslint-plugin": "18.3.0",
+                "@angular-eslint/eslint-plugin-template": "18.3.0",
+                "ignore": "5.3.2",
                 "semver": "7.6.3",
                 "strip-json-comments": "3.1.1"
             },
@@ -518,13 +518,13 @@
             }
         },
         "node_modules/@angular-eslint/template-parser": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.2.0.tgz",
-            "integrity": "sha512-1jKH2fL8ir1ajcgu/N0xIWVtlpJQmbJBRRe1+WbBoomykcu1KnLwCSue/LuUDQOf3CTmMHxQE0f+58VpafYoyA==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-18.3.0.tgz",
+            "integrity": "sha512-1mUquqcnugI4qsoxcYZKZ6WMi6RPelDcJZg2YqGyuaIuhWmi3ZqJZLErSSpjP60+TbYZu7wM8Kchqa1bwJtEaQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-eslint/bundled-angular-compiler": "18.2.0",
+                "@angular-eslint/bundled-angular-compiler": "18.3.0",
                 "eslint-scope": "^8.0.2"
             },
             "peerDependencies": {
@@ -533,13 +533,13 @@
             }
         },
         "node_modules/@angular-eslint/utils": {
-            "version": "18.2.0",
-            "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.2.0.tgz",
-            "integrity": "sha512-g+b0L4RCZaKYPz4bGRRifo7g5guVJi2kUWymlDYmCkq3NhZng1HQQbNpVF1n5o034zT5lnaC5HENwaKIZ1Y37Q==",
+            "version": "18.3.0",
+            "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-18.3.0.tgz",
+            "integrity": "sha512-sCrkHkpxBJZLuCikdboZoawCfc2UgbJv+T14tu2uQCv+Vwzeadnu04vkeY2vTkA8GeBdBij/G9/N/nvwmwVw3g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-eslint/bundled-angular-compiler": "18.2.0"
+                "@angular-eslint/bundled-angular-compiler": "18.3.0"
             },
             "peerDependencies": {
                 "@typescript-eslint/utils": "^7.11.0 || ^8.0.0",
@@ -548,9 +548,9 @@
             }
         },
         "node_modules/@angular/animations": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.1.4.tgz",
-            "integrity": "sha512-m0yusB7BI3wrotx9F9rf7YUD5bvhF+lT2fLNF1QCzCU819rtLnDoj0b4/z+D0i5qe7gQjtAJ42e/Hv7eGuq0VQ==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-18.2.3.tgz",
+            "integrity": "sha512-rIATopHr83lYR0X05buHeHssq9CGw0I0YPIQcpUTGnlqIpJcQVCf7jCFn4KGZrE9V55hFY3MD4S28njlwCToQQ==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -559,42 +559,40 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/core": "18.1.4"
+                "@angular/core": "18.2.3"
             }
         },
         "node_modules/@angular/build": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.1.4.tgz",
-            "integrity": "sha512-jkqccHpGhxUOe0zIHpA1nPdeuPUxnBK7Wvazc2rA+ccI30BPrROkEDbrHP8yD8JeviUCFwwLE+hM+rRg+NneVw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/build/-/build-18.2.3.tgz",
+            "integrity": "sha512-USrD2Zvcb1te2dnqhH7JZ5XeJDg/t7fjUHR4f93vvMrnrncwCjLoHbHpz01HCHfcIVRgsYUdAmAi1iG7vpak7w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "2.3.0",
-                "@angular-devkit/architect": "0.1801.4",
-                "@babel/core": "7.24.7",
+                "@angular-devkit/architect": "0.1802.3",
+                "@babel/core": "7.25.2",
                 "@babel/helper-annotate-as-pure": "7.24.7",
                 "@babel/helper-split-export-declaration": "7.24.7",
                 "@babel/plugin-syntax-import-attributes": "7.24.7",
-                "@inquirer/confirm": "3.1.11",
+                "@inquirer/confirm": "3.1.22",
                 "@vitejs/plugin-basic-ssl": "1.1.0",
-                "ansi-colors": "4.1.3",
                 "browserslist": "^4.23.0",
                 "critters": "0.0.24",
-                "esbuild": "0.21.5",
+                "esbuild": "0.23.0",
                 "fast-glob": "3.3.2",
                 "https-proxy-agent": "7.0.5",
-                "lmdb": "3.0.12",
-                "magic-string": "0.30.10",
+                "listr2": "8.2.4",
+                "lmdb": "3.0.13",
+                "magic-string": "0.30.11",
                 "mrmime": "2.0.0",
-                "ora": "5.4.1",
                 "parse5-html-rewriting-stream": "7.0.0",
                 "picomatch": "4.0.2",
                 "piscina": "4.6.1",
-                "rollup": "4.18.0",
+                "rollup": "4.20.0",
                 "sass": "1.77.6",
-                "semver": "7.6.2",
-                "undici": "6.19.2",
-                "vite": "5.3.2",
+                "semver": "7.6.3",
+                "vite": "5.4.0",
                 "watchpack": "2.4.1"
             },
             "engines": {
@@ -652,9 +650,9 @@
             }
         },
         "node_modules/@angular/cdk": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.1.4.tgz",
-            "integrity": "sha512-xFOg2wT2iLyJXqgeNRK1uF4Lxn0B1wzBjaEQoOwFm1EHOdu5D4mNOTwfuB3DkH4KWM+mI3Qtxd7vOhOXNwB3Dg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-18.2.3.tgz",
+            "integrity": "sha512-lUcpYTxPZuntJ1FK7V2ugapCGMIhT6TUDjIGgXfS9AxGSSKgwr8HNs6Ze9pcjYC44UhP40sYAZuiaFwmE60A2A==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -669,27 +667,27 @@
             }
         },
         "node_modules/@angular/cli": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.1.4.tgz",
-            "integrity": "sha512-ppX4iilA6k+sKD6iRMRYnt2bH9Jpik+hJlndRBCjWo2EmEUQ04CBRKYONh8BLbnmwBxPG+/osUpcFrbkPCjQUw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/cli/-/cli-18.2.3.tgz",
+            "integrity": "sha512-40258vuliH6+p8QSByZe5EcIXSj0iR3PNF6yuusClR/ByToHOnmuPw7WC+AYr0ooozmqlim/EjQe4/037OUB3w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/architect": "0.1801.4",
-                "@angular-devkit/core": "18.1.4",
-                "@angular-devkit/schematics": "18.1.4",
-                "@inquirer/prompts": "5.0.7",
-                "@listr2/prompt-adapter-inquirer": "2.0.13",
-                "@schematics/angular": "18.1.4",
+                "@angular-devkit/architect": "0.1802.3",
+                "@angular-devkit/core": "18.2.3",
+                "@angular-devkit/schematics": "18.2.3",
+                "@inquirer/prompts": "5.3.8",
+                "@listr2/prompt-adapter-inquirer": "2.0.15",
+                "@schematics/angular": "18.2.3",
                 "@yarnpkg/lockfile": "1.1.0",
                 "ini": "4.1.3",
                 "jsonc-parser": "3.3.1",
-                "listr2": "8.2.3",
-                "npm-package-arg": "11.0.2",
-                "npm-pick-manifest": "9.0.1",
+                "listr2": "8.2.4",
+                "npm-package-arg": "11.0.3",
+                "npm-pick-manifest": "9.1.0",
                 "pacote": "18.0.6",
                 "resolve": "1.22.8",
-                "semver": "7.6.2",
+                "semver": "7.6.3",
                 "symbol-observable": "4.0.0",
                 "yargs": "17.7.2"
             },
@@ -703,9 +701,9 @@
             }
         },
         "node_modules/@angular/common": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.1.4.tgz",
-            "integrity": "sha512-No4lCrL80WlAGg0DAyuPW+jsfA6EIQ06CFrRgt3R6YFrKbIuU0NKUt+D8IB7UNgTLNYXmurxapNf8jef8rq1wg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/common/-/common-18.2.3.tgz",
+            "integrity": "sha512-NFL4yXXImSCH7i1xnHykUjHa9vl9827fGiwSV2mnf7LjSUsyDzFD8/54dNuYN9OY8AUD+PnK0YdNro6cczVyIA==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -714,14 +712,14 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/core": "18.1.4",
+                "@angular/core": "18.2.3",
                 "rxjs": "^6.5.3 || ^7.4.0"
             }
         },
         "node_modules/@angular/compiler": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.1.4.tgz",
-            "integrity": "sha512-Xdvm9trEmrWZaxCk3a7bt5kN/jdXBPukVsibFpu5lKl9ZL7j2sn4JUd7j/dVNRUIVsPahQMATAOgl8xdUJzh4Q==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-18.2.3.tgz",
+            "integrity": "sha512-Il3ljs0j1GaYoqYFdShjUP1ryck5xTOaA8uQuRgqwU0FOwEDfugSAM3Qf7nJx/sgxTM0Lm/Nrdv2u6i1gZWeuQ==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -730,7 +728,7 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/core": "18.1.4"
+                "@angular/core": "18.2.3"
             },
             "peerDependenciesMeta": {
                 "@angular/core": {
@@ -739,12 +737,12 @@
             }
         },
         "node_modules/@angular/compiler-cli": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.1.4.tgz",
-            "integrity": "sha512-wOOLzxPLsDYsD+f6Bqr31ol8K7I4cm4k5uuaQl+wkLBpX9AD1rMi/7CPJrXAWBdgOW67uPzAdLBsK+axKfg91w==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-18.2.3.tgz",
+            "integrity": "sha512-BcmqYKnkcJTkGjuPztClZNQve7tdI290J5F3iZBx6c7/vaw8EU8EGZtpWYZpgiVn5S6jhcKyc1dLF9ggO9vftg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "7.24.9",
+                "@babel/core": "7.25.2",
                 "@jridgewell/sourcemap-codec": "^1.4.14",
                 "chokidar": "^3.0.0",
                 "convert-source-map": "^1.5.1",
@@ -762,65 +760,14 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/compiler": "18.1.4",
+                "@angular/compiler": "18.2.3",
                 "typescript": ">=5.4 <5.6"
             }
         },
-        "node_modules/@angular/compiler-cli/node_modules/@babel/core": {
-            "version": "7.24.9",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
-            "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
-            "license": "MIT",
-            "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.24.9",
-                "@babel/helper-compilation-targets": "^7.24.8",
-                "@babel/helper-module-transforms": "^7.24.9",
-                "@babel/helpers": "^7.24.8",
-                "@babel/parser": "^7.24.8",
-                "@babel/template": "^7.24.7",
-                "@babel/traverse": "^7.24.8",
-                "@babel/types": "^7.24.9",
-                "convert-source-map": "^2.0.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.3",
-                "semver": "^6.3.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/babel"
-            }
-        },
-        "node_modules/@angular/compiler-cli/node_modules/@babel/core/node_modules/convert-source-map": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "license": "MIT"
-        },
-        "node_modules/@angular/compiler-cli/node_modules/@babel/generator": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-            "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.25.0",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
-                "jsesc": "^2.5.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
         "node_modules/@angular/core": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.1.4.tgz",
-            "integrity": "sha512-+N3oWYFubT3GdCkBfD/CmH4DGjr/fGFQZChWbph2ZuPpK7JYNgfyvXS4SjLtdL4WTjjBevBTgR70GyLH/5EbKA==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/core/-/core-18.2.3.tgz",
+            "integrity": "sha512-VGhMJxj7d0rYpqVfQrcGRB7EE/BCziotft/I/YPl6bOMPSAvMukG7DXQuJdYpNrr62ks78mlzHlZX/cdmB9Prw==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -830,13 +777,13 @@
             },
             "peerDependencies": {
                 "rxjs": "^6.5.3 || ^7.4.0",
-                "zone.js": "~0.14.0"
+                "zone.js": "~0.14.10"
             }
         },
         "node_modules/@angular/forms": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.1.4.tgz",
-            "integrity": "sha512-PYaQ7/2toAwgJWIznVWgJAd3l8mjAreilGOVIMbBIaotL/EHRQjhlikitJEFDGXeVUarY/rm3IlLWBYnLyliyg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-18.2.3.tgz",
+            "integrity": "sha512-+OBaAH0e8hue9eyLnbgpxg1/X9fps6bwXECfJ0nL5BDPU5itZ428YJbEnj5bTx0hEbqfTRiV4LgexdI+D9eOpw==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -845,16 +792,16 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/common": "18.1.4",
-                "@angular/core": "18.1.4",
-                "@angular/platform-browser": "18.1.4",
+                "@angular/common": "18.2.3",
+                "@angular/core": "18.2.3",
+                "@angular/platform-browser": "18.2.3",
                 "rxjs": "^6.5.3 || ^7.4.0"
             }
         },
         "node_modules/@angular/language-service": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.1.4.tgz",
-            "integrity": "sha512-nvO6lG/vMWRXUj+nY2HyvhOSlSYqBx1ER2rk5MezzYo3I0qgiNuV9YfgTyXLWywDAvc9jcTrIyi4nxBm6a0xvQ==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-18.2.3.tgz",
+            "integrity": "sha512-bTZ1O7s0uJqKdd9ImCleRS9Wg6yVy2ZXchnS5ap2gYJx51MJgwOM/fL6is0OsovtZG/UJaKK5FeEqUUxNqZJVA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -862,12 +809,12 @@
             }
         },
         "node_modules/@angular/localize": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.1.4.tgz",
-            "integrity": "sha512-GqrVYc3PwYFd9nDbOV0nL2ZhsLfb1LOZLnpsGqTBJT6zfmbqTUnwQWjHmj6SoGzTQl9r9OAvawaMrICzB6Rrfw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/localize/-/localize-18.2.3.tgz",
+            "integrity": "sha512-ZTliuRfH/hGwQTmFb1FwKOyMUks2ATuFVFzKnxbsxoo+XgTg+e12FcUfPEfdtPAteZ9gSuc/9hP8sM0RzW0LPg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "7.24.9",
+                "@babel/core": "7.25.2",
                 "@types/babel__core": "7.20.5",
                 "fast-glob": "3.3.2",
                 "yargs": "^17.2.1"
@@ -881,72 +828,21 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/compiler": "18.1.4",
-                "@angular/compiler-cli": "18.1.4"
-            }
-        },
-        "node_modules/@angular/localize/node_modules/@babel/core": {
-            "version": "7.24.9",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz",
-            "integrity": "sha512-5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==",
-            "license": "MIT",
-            "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.24.9",
-                "@babel/helper-compilation-targets": "^7.24.8",
-                "@babel/helper-module-transforms": "^7.24.9",
-                "@babel/helpers": "^7.24.8",
-                "@babel/parser": "^7.24.8",
-                "@babel/template": "^7.24.7",
-                "@babel/traverse": "^7.24.8",
-                "@babel/types": "^7.24.9",
-                "convert-source-map": "^2.0.0",
-                "debug": "^4.1.0",
-                "gensync": "^1.0.0-beta.2",
-                "json5": "^2.2.3",
-                "semver": "^6.3.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/babel"
+                "@angular/compiler": "18.2.3",
+                "@angular/compiler-cli": "18.2.3"
             }
         },
-        "node_modules/@angular/localize/node_modules/@babel/generator": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-            "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.25.0",
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.25",
-                "jsesc": "^2.5.1"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@angular/localize/node_modules/convert-source-map": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "license": "MIT"
-        },
         "node_modules/@angular/material": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.1.4.tgz",
-            "integrity": "sha512-xmKIVOKZA8yFXrw4PsBvShFSYFQCnuVNGGuJlc8S8xvURh/f9P6hAo1Ua9pSBkOKz2W2dHE+726zOqL+o4kNxg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/material/-/material-18.2.3.tgz",
+            "integrity": "sha512-JFfvXaMHMhskncaxxus4sDvie9VYdMkfYgfinkLXpZlPFyn1IzjDw0c1BcrcsuD7UxQVZ/v5tucCgq1FQfGRpA==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
             },
             "peerDependencies": {
                 "@angular/animations": "^18.0.0 || ^19.0.0",
-                "@angular/cdk": "18.1.4",
+                "@angular/cdk": "18.2.3",
                 "@angular/common": "^18.0.0 || ^19.0.0",
                 "@angular/core": "^18.0.0 || ^19.0.0",
                 "@angular/forms": "^18.0.0 || ^19.0.0",
@@ -955,9 +851,9 @@
             }
         },
         "node_modules/@angular/platform-browser": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.1.4.tgz",
-            "integrity": "sha512-zGx33St0JVYT8EZOaf0s8Twr0RgfU2cqEAc9Wwx9HVJ0pF5y4VnftK3pewwiHWDHkPfiJy0jBKbtrkVUSbgZfg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-18.2.3.tgz",
+            "integrity": "sha512-M2ob4zN7tAcL2mx7U6KnZNqNFPFl9MlPBE0FrjQjIzAjU0wSYPIJXmaPu9aMUp9niyo+He5iX98I+URi2Yc99g==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -966,9 +862,9 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/animations": "18.1.4",
-                "@angular/common": "18.1.4",
-                "@angular/core": "18.1.4"
+                "@angular/animations": "18.2.3",
+                "@angular/common": "18.2.3",
+                "@angular/core": "18.2.3"
             },
             "peerDependenciesMeta": {
                 "@angular/animations": {
@@ -977,9 +873,9 @@
             }
         },
         "node_modules/@angular/platform-browser-dynamic": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.1.4.tgz",
-            "integrity": "sha512-ZQQcKXGIriOzILTZxIbmDpGnwuiwfJ0xh2EmmnfC0zh/NB+li6whgplOLEciaHgsUKtDn7kNZFn2vKrx+B/cDQ==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-18.2.3.tgz",
+            "integrity": "sha512-nWi9ZxN4KpbJkttIckFO1PCoW0+gb/18xFO+JWyLBAtcbsudj/Mv0P/fdOaSfQdLkPhZfORr3ZcfiTkhmuGyEg==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -988,16 +884,16 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/common": "18.1.4",
-                "@angular/compiler": "18.1.4",
-                "@angular/core": "18.1.4",
-                "@angular/platform-browser": "18.1.4"
+                "@angular/common": "18.2.3",
+                "@angular/compiler": "18.2.3",
+                "@angular/core": "18.2.3",
+                "@angular/platform-browser": "18.2.3"
             }
         },
         "node_modules/@angular/router": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.1.4.tgz",
-            "integrity": "sha512-982+bnO3uGFYjRFcQDoKmnWvUcZUvFxEpX/I2Yu+WmPJrY7fPJ693mBaWgwVFa0xIBNfjvJjNXdikGBz5UrMsw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/router/-/router-18.2.3.tgz",
+            "integrity": "sha512-fvD9eSDIiIbeYoUokoWkXzu7/ZaxlzKPUHFqX1JuKuH5ciQDeT/d7lp4mj31Bxammhohzi3+z12THJYsCkj/iQ==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -1006,16 +902,16 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/common": "18.1.4",
-                "@angular/core": "18.1.4",
-                "@angular/platform-browser": "18.1.4",
+                "@angular/common": "18.2.3",
+                "@angular/core": "18.2.3",
+                "@angular/platform-browser": "18.2.3",
                 "rxjs": "^6.5.3 || ^7.4.0"
             }
         },
         "node_modules/@angular/service-worker": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.1.4.tgz",
-            "integrity": "sha512-7knx0I82ud6IWu2NOEtmtikApm/Ix8YEbXk2/J8YiN7ozGSTjTK5X8cpvFUzfG4MbARH6sxVAPffNJduzW4ZAw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@angular/service-worker/-/service-worker-18.2.3.tgz",
+            "integrity": "sha512-KplaBYhhwsM3gPeOImfDGhAknN+BIcZJkHl8YRnhoUEFHsTZ8LTV02C4LWQL3YTu3pK+uj/lPMKi1CA37cXQ8g==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -1027,8 +923,8 @@
                 "node": "^18.19.1 || ^20.11.1 || >=22.0.0"
             },
             "peerDependencies": {
-                "@angular/common": "18.1.4",
-                "@angular/core": "18.1.4"
+                "@angular/common": "18.2.3",
+                "@angular/core": "18.2.3"
             }
         },
         "node_modules/@babel/code-frame": {
@@ -1045,30 +941,30 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.25.2",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz",
-            "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.4.tgz",
+            "integrity": "sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz",
-            "integrity": "sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==",
+            "version": "7.25.2",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz",
+            "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==",
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.24.7",
-                "@babel/helper-compilation-targets": "^7.24.7",
-                "@babel/helper-module-transforms": "^7.24.7",
-                "@babel/helpers": "^7.24.7",
-                "@babel/parser": "^7.24.7",
-                "@babel/template": "^7.24.7",
-                "@babel/traverse": "^7.24.7",
-                "@babel/types": "^7.24.7",
+                "@babel/generator": "^7.25.0",
+                "@babel/helper-compilation-targets": "^7.25.2",
+                "@babel/helper-module-transforms": "^7.25.2",
+                "@babel/helpers": "^7.25.0",
+                "@babel/parser": "^7.25.0",
+                "@babel/template": "^7.25.0",
+                "@babel/traverse": "^7.25.2",
+                "@babel/types": "^7.25.2",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -1090,12 +986,12 @@
             "license": "MIT"
         },
         "node_modules/@babel/generator": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz",
-            "integrity": "sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==",
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
+            "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.24.7",
+                "@babel/types": "^7.25.0",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^2.5.1"
@@ -1147,9 +1043,9 @@
             }
         },
         "node_modules/@babel/helper-create-class-features-plugin": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.0.tgz",
-            "integrity": "sha512-GYM6BxeQsETc9mnct+nIIpf63SAyzvyYN7UB/IlTyd+MBg06afFGp0mIeUqGyWgS2mxad6vqbMrHVlaL3m70sQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.4.tgz",
+            "integrity": "sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1158,7 +1054,7 @@
                 "@babel/helper-optimise-call-expression": "^7.24.7",
                 "@babel/helper-replace-supers": "^7.25.0",
                 "@babel/helper-skip-transparent-expression-wrappers": "^7.24.7",
-                "@babel/traverse": "^7.25.0",
+                "@babel/traverse": "^7.25.4",
                 "semver": "^6.3.1"
             },
             "engines": {
@@ -1203,19 +1099,6 @@
                 "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
             }
         },
-        "node_modules/@babel/helper-environment-visitor": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-            "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@babel/types": "^7.24.7"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
         "node_modules/@babel/helper-member-expression-to-functions": {
             "version": "7.24.8",
             "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz",
@@ -1402,13 +1285,13 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz",
-            "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.6.tgz",
+            "integrity": "sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==",
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.25.0",
-                "@babel/types": "^7.25.0"
+                "@babel/types": "^7.25.6"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1430,12 +1313,12 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.25.3",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz",
-            "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.6.tgz",
+            "integrity": "sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.25.2"
+                "@babel/types": "^7.25.6"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -1461,6 +1344,22 @@
                 "@babel/core": "^7.0.0"
             }
         },
+        "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.0.tgz",
+            "integrity": "sha512-Bm4bH2qsX880b/3ziJ8KD711LT7z4u8CFudmjqle65AZj/HNUFhEf90dqYv6O86buWvSBmeQDjv0Tn2aF/bIBA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.24.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
         "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
             "version": "7.25.0",
             "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.0.tgz",
@@ -1607,13 +1506,13 @@
             }
         },
         "node_modules/@babel/plugin-syntax-import-assertions": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.7.tgz",
-            "integrity": "sha512-Ec3NRUMoi8gskrkBe3fNmEQfxDvY8bgfQpz6jlk/41kX9eUjvpyqWU7PBP/pLAvMaSQjbMNKJmvX57jP+M6bPg==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.25.6.tgz",
+            "integrity": "sha512-aABl0jHw9bZ2karQ/uUD6XP4u0SG22SJrOHFoL6XB1R7dTovOP4TzTlsxOYC5yQ1pdscVK2JTUnF6QL3ARoAiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1790,13 +1689,13 @@
             }
         },
         "node_modules/@babel/plugin-syntax-typescript": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
-            "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.4.tgz",
+            "integrity": "sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1839,16 +1738,16 @@
             }
         },
         "node_modules/@babel/plugin-transform-async-generator-functions": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.24.7.tgz",
-            "integrity": "sha512-o+iF77e3u7ZS4AoAuJvapz9Fm001PuD2V3Lp6OSE4FYQke+cSewYtnek+THqGRWyQloRCyvWL1OkyfNEl9vr/g==",
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.0.tgz",
+            "integrity": "sha512-uaIi2FdqzjpAMvVqvB51S42oC2JEVgh0LDsGfZVDysWE8LrJtQC2jvKmOqEYThKyB7bDEb7BP1GYWDm7tABA0Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-environment-visitor": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7",
-                "@babel/helper-remap-async-to-generator": "^7.24.7",
-                "@babel/plugin-syntax-async-generators": "^7.8.4"
+                "@babel/helper-plugin-utils": "^7.24.8",
+                "@babel/helper-remap-async-to-generator": "^7.25.0",
+                "@babel/plugin-syntax-async-generators": "^7.8.4",
+                "@babel/traverse": "^7.25.0"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1908,14 +1807,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-class-properties": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.24.7.tgz",
-            "integrity": "sha512-vKbfawVYayKcSeSR5YYzzyXvsDFWU2mD8U5TFeXtbCPLFUqe7GyCgvO6XDHzje862ODrOwy6WCPmKeWHbCFJ4w==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.4.tgz",
+            "integrity": "sha512-nZeZHyCWPfjkdU5pA/uHiTaDAFUEqkpzf1YoQT2NeSynCGYq9rxfyI3XpQbfx/a0hSnFH6TGlEXvae5Vi7GD8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-class-features-plugin": "^7.25.4",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -1943,17 +1842,17 @@
             }
         },
         "node_modules/@babel/plugin-transform-classes": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.0.tgz",
-            "integrity": "sha512-xyi6qjr/fYU304fiRwFbekzkqVJZ6A7hOjWZd+89FVcBqPV3S9Wuozz82xdpLspckeaafntbzglaW4pqpzvtSw==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.4.tgz",
+            "integrity": "sha512-oexUfaQle2pF/b6E0dwsxQtAol9TLSO88kQvym6HHBWFliV2lGdrPieX+WgMRLSJDVzdYywk7jXbLPuO2KLTLg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-annotate-as-pure": "^7.24.7",
-                "@babel/helper-compilation-targets": "^7.24.8",
+                "@babel/helper-compilation-targets": "^7.25.2",
                 "@babel/helper-plugin-utils": "^7.24.8",
                 "@babel/helper-replace-supers": "^7.25.0",
-                "@babel/traverse": "^7.25.0",
+                "@babel/traverse": "^7.25.4",
                 "globals": "^11.1.0"
             },
             "engines": {
@@ -2029,6 +1928,23 @@
                 "@babel/core": "^7.0.0-0"
             }
         },
+        "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.0.tgz",
+            "integrity": "sha512-YLpb4LlYSc3sCUa35un84poXoraOiQucUTTu8X1j18JV+gNa8E0nyUf/CjZ171IRGr4jEguF+vzJU66QZhn29g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-create-regexp-features-plugin": "^7.25.0",
+                "@babel/helper-plugin-utils": "^7.24.8"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0"
+            }
+        },
         "node_modules/@babel/plugin-transform-dynamic-import": {
             "version": "7.24.7",
             "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.24.7.tgz",
@@ -2407,14 +2323,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-private-methods": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.24.7.tgz",
-            "integrity": "sha512-COTCOkG2hn4JKGEKBADkA8WNb35TGkkRbI5iT845dB+NyqgO8Hn+ajPbSnIQznneJTa3d30scb6iz/DhH8GsJQ==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.4.tgz",
+            "integrity": "sha512-ao8BG7E2b/URaUQGqN3Tlsg+M3KlHY6rJ1O1gXAEUnZoyNQnvKyH87Kfg+FoxSeyWUB8ISZZsC91C44ZuBFytw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-class-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-class-features-plugin": "^7.25.4",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -2644,14 +2560,14 @@
             }
         },
         "node_modules/@babel/plugin-transform-unicode-sets-regex": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.24.7.tgz",
-            "integrity": "sha512-2G8aAvF4wy1w/AGZkemprdGMRg5o6zPNhbHVImRz3lss55TYCBd6xStN19rt8XJHq20sqV0JbyWjOWwQRwV/wg==",
+            "version": "7.25.4",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.4.tgz",
+            "integrity": "sha512-qesBxiWkgN1Q+31xUE9RcMk79eOXXDCv6tfyGMRSs4RGlioSg2WVyQAm07k726cSE56pa+Kb0y9epX2qaXzTvA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-create-regexp-features-plugin": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7"
+                "@babel/helper-create-regexp-features-plugin": "^7.25.2",
+                "@babel/helper-plugin-utils": "^7.24.8"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -2661,20 +2577,21 @@
             }
         },
         "node_modules/@babel/preset-env": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz",
-            "integrity": "sha512-1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==",
+            "version": "7.25.3",
+            "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.25.3.tgz",
+            "integrity": "sha512-QsYW7UeAaXvLPX9tdVliMJE7MD7M6MLYVTovRTIwhoYQVFHR1rM4wO8wqAezYi3/BpSD+NzVCZ69R6smWiIi8g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.24.7",
-                "@babel/helper-compilation-targets": "^7.24.7",
-                "@babel/helper-plugin-utils": "^7.24.7",
-                "@babel/helper-validator-option": "^7.24.7",
-                "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.24.7",
-                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.24.7",
+                "@babel/compat-data": "^7.25.2",
+                "@babel/helper-compilation-targets": "^7.25.2",
+                "@babel/helper-plugin-utils": "^7.24.8",
+                "@babel/helper-validator-option": "^7.24.8",
+                "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.3",
+                "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.0",
+                "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.0",
                 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.24.7",
-                "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.24.7",
+                "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.0",
                 "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
                 "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -2695,29 +2612,30 @@
                 "@babel/plugin-syntax-top-level-await": "^7.14.5",
                 "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
                 "@babel/plugin-transform-arrow-functions": "^7.24.7",
-                "@babel/plugin-transform-async-generator-functions": "^7.24.7",
+                "@babel/plugin-transform-async-generator-functions": "^7.25.0",
                 "@babel/plugin-transform-async-to-generator": "^7.24.7",
                 "@babel/plugin-transform-block-scoped-functions": "^7.24.7",
-                "@babel/plugin-transform-block-scoping": "^7.24.7",
+                "@babel/plugin-transform-block-scoping": "^7.25.0",
                 "@babel/plugin-transform-class-properties": "^7.24.7",
                 "@babel/plugin-transform-class-static-block": "^7.24.7",
-                "@babel/plugin-transform-classes": "^7.24.7",
+                "@babel/plugin-transform-classes": "^7.25.0",
                 "@babel/plugin-transform-computed-properties": "^7.24.7",
-                "@babel/plugin-transform-destructuring": "^7.24.7",
+                "@babel/plugin-transform-destructuring": "^7.24.8",
                 "@babel/plugin-transform-dotall-regex": "^7.24.7",
                 "@babel/plugin-transform-duplicate-keys": "^7.24.7",
+                "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.0",
                 "@babel/plugin-transform-dynamic-import": "^7.24.7",
                 "@babel/plugin-transform-exponentiation-operator": "^7.24.7",
                 "@babel/plugin-transform-export-namespace-from": "^7.24.7",
                 "@babel/plugin-transform-for-of": "^7.24.7",
-                "@babel/plugin-transform-function-name": "^7.24.7",
+                "@babel/plugin-transform-function-name": "^7.25.1",
                 "@babel/plugin-transform-json-strings": "^7.24.7",
-                "@babel/plugin-transform-literals": "^7.24.7",
+                "@babel/plugin-transform-literals": "^7.25.2",
                 "@babel/plugin-transform-logical-assignment-operators": "^7.24.7",
                 "@babel/plugin-transform-member-expression-literals": "^7.24.7",
                 "@babel/plugin-transform-modules-amd": "^7.24.7",
-                "@babel/plugin-transform-modules-commonjs": "^7.24.7",
-                "@babel/plugin-transform-modules-systemjs": "^7.24.7",
+                "@babel/plugin-transform-modules-commonjs": "^7.24.8",
+                "@babel/plugin-transform-modules-systemjs": "^7.25.0",
                 "@babel/plugin-transform-modules-umd": "^7.24.7",
                 "@babel/plugin-transform-named-capturing-groups-regex": "^7.24.7",
                 "@babel/plugin-transform-new-target": "^7.24.7",
@@ -2726,7 +2644,7 @@
                 "@babel/plugin-transform-object-rest-spread": "^7.24.7",
                 "@babel/plugin-transform-object-super": "^7.24.7",
                 "@babel/plugin-transform-optional-catch-binding": "^7.24.7",
-                "@babel/plugin-transform-optional-chaining": "^7.24.7",
+                "@babel/plugin-transform-optional-chaining": "^7.24.8",
                 "@babel/plugin-transform-parameters": "^7.24.7",
                 "@babel/plugin-transform-private-methods": "^7.24.7",
                 "@babel/plugin-transform-private-property-in-object": "^7.24.7",
@@ -2737,7 +2655,7 @@
                 "@babel/plugin-transform-spread": "^7.24.7",
                 "@babel/plugin-transform-sticky-regex": "^7.24.7",
                 "@babel/plugin-transform-template-literals": "^7.24.7",
-                "@babel/plugin-transform-typeof-symbol": "^7.24.7",
+                "@babel/plugin-transform-typeof-symbol": "^7.24.8",
                 "@babel/plugin-transform-unicode-escapes": "^7.24.7",
                 "@babel/plugin-transform-unicode-property-regex": "^7.24.7",
                 "@babel/plugin-transform-unicode-regex": "^7.24.7",
@@ -2746,7 +2664,7 @@
                 "babel-plugin-polyfill-corejs2": "^0.4.10",
                 "babel-plugin-polyfill-corejs3": "^0.10.4",
                 "babel-plugin-polyfill-regenerator": "^0.6.1",
-                "core-js-compat": "^3.31.0",
+                "core-js-compat": "^3.37.1",
                 "semver": "^6.3.1"
             },
             "engines": {
@@ -2779,9 +2697,9 @@
             "license": "MIT"
         },
         "node_modules/@babel/runtime": {
-            "version": "7.24.7",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
-            "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
+            "version": "7.25.0",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz",
+            "integrity": "sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==",
             "license": "MIT",
             "dependencies": {
                 "regenerator-runtime": "^0.14.0"
@@ -2805,16 +2723,16 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.25.3",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz",
-            "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.6.tgz",
+            "integrity": "sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.24.7",
-                "@babel/generator": "^7.25.0",
-                "@babel/parser": "^7.25.3",
+                "@babel/generator": "^7.25.6",
+                "@babel/parser": "^7.25.6",
                 "@babel/template": "^7.25.0",
-                "@babel/types": "^7.25.2",
+                "@babel/types": "^7.25.6",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -2823,12 +2741,12 @@
             }
         },
         "node_modules/@babel/traverse/node_modules/@babel/generator": {
-            "version": "7.25.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz",
-            "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.6.tgz",
+            "integrity": "sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.25.0",
+                "@babel/types": "^7.25.6",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^2.5.1"
@@ -2838,9 +2756,9 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.25.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz",
-            "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==",
+            "version": "7.25.6",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.6.tgz",
+            "integrity": "sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.24.8",
@@ -2909,44 +2827,13 @@
             }
         },
         "node_modules/@discoveryjs/json-ext": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
-            "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+            "version": "0.6.1",
+            "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.1.tgz",
+            "integrity": "sha512-boghen8F0Q8D+0/Q1/1r6DUEieUJ8w2a1gIknExMSHBsJFOr2+0KUfHiVYBvucPwl3+RU5PFBK833FjFCh3BhA==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=10.0.0"
-            }
-        },
-        "node_modules/@emnapi/core": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.2.0.tgz",
-            "integrity": "sha512-E7Vgw78I93we4ZWdYCb4DGAwRROGkMIXk7/y87UmANR+J6qsWusmC3gLt0H+O0KOt5e6O38U8oJamgbudrES/w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@emnapi/wasi-threads": "1.0.1",
-                "tslib": "^2.4.0"
-            }
-        },
-        "node_modules/@emnapi/runtime": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.2.0.tgz",
-            "integrity": "sha512-bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.4.0"
-            }
-        },
-        "node_modules/@emnapi/wasi-threads": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz",
-            "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.4.0"
+                "node": ">=14.17.0"
             }
         },
         "node_modules/@emotion/is-prop-valid": {
@@ -2977,9 +2864,9 @@
             "license": "MIT"
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.23.0.tgz",
+            "integrity": "sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -2990,13 +2877,13 @@
                 "aix"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
-            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.23.0.tgz",
+            "integrity": "sha512-+KuOHTKKyIKgEEqKbGTK8W7mPp+hKinbMBeEnNzjJGyFcWsfrXjSTNluJHCY1RqhxFurdD8uNXQDei7qDlR6+g==",
             "cpu": [
                 "arm"
             ],
@@ -3007,13 +2894,13 @@
                 "android"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
-            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.23.0.tgz",
+            "integrity": "sha512-EuHFUYkAVfU4qBdyivULuu03FhJO4IJN9PGuABGrFy4vUuzk91P2d+npxHcFdpUnfYKy0PuV+n6bKIpHOB3prQ==",
             "cpu": [
                 "arm64"
             ],
@@ -3024,13 +2911,13 @@
                 "android"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
-            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.23.0.tgz",
+            "integrity": "sha512-WRrmKidLoKDl56LsbBMhzTTBxrsVwTKdNbKDalbEZr0tcsBgCLbEtoNthOW6PX942YiYq8HzEnb4yWQMLQuipQ==",
             "cpu": [
                 "x64"
             ],
@@ -3041,13 +2928,13 @@
                 "android"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
-            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.23.0.tgz",
+            "integrity": "sha512-YLntie/IdS31H54Ogdn+v50NuoWF5BDkEUFpiOChVa9UnKpftgwzZRrI4J132ETIi+D8n6xh9IviFV3eXdxfow==",
             "cpu": [
                 "arm64"
             ],
@@ -3058,13 +2945,13 @@
                 "darwin"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
-            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.23.0.tgz",
+            "integrity": "sha512-IMQ6eme4AfznElesHUPDZ+teuGwoRmVuuixu7sv92ZkdQcPbsNHzutd+rAfaBKo8YK3IrBEi9SLLKWJdEvJniQ==",
             "cpu": [
                 "x64"
             ],
@@ -3075,13 +2962,13 @@
                 "darwin"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
-            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.23.0.tgz",
+            "integrity": "sha512-0muYWCng5vqaxobq6LB3YNtevDFSAZGlgtLoAc81PjUfiFz36n4KMpwhtAd4he8ToSI3TGyuhyx5xmiWNYZFyw==",
             "cpu": [
                 "arm64"
             ],
@@ -3092,13 +2979,13 @@
                 "freebsd"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
-            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.23.0.tgz",
+            "integrity": "sha512-XKDVu8IsD0/q3foBzsXGt/KjD/yTKBCIwOHE1XwiXmrRwrX6Hbnd5Eqn/WvDekddK21tfszBSrE/WMaZh+1buQ==",
             "cpu": [
                 "x64"
             ],
@@ -3109,13 +2996,13 @@
                 "freebsd"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
-            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.23.0.tgz",
+            "integrity": "sha512-SEELSTEtOFu5LPykzA395Mc+54RMg1EUgXP+iw2SJ72+ooMwVsgfuwXo5Fn0wXNgWZsTVHwY2cg4Vi/bOD88qw==",
             "cpu": [
                 "arm"
             ],
@@ -3126,13 +3013,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
-            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.23.0.tgz",
+            "integrity": "sha512-j1t5iG8jE7BhonbsEg5d9qOYcVZv/Rv6tghaXM/Ug9xahM0nX/H2gfu6X6z11QRTMT6+aywOMA8TDkhPo8aCGw==",
             "cpu": [
                 "arm64"
             ],
@@ -3143,13 +3030,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
-            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.23.0.tgz",
+            "integrity": "sha512-P7O5Tkh2NbgIm2R6x1zGJJsnacDzTFcRWZyTTMgFdVit6E98LTxO+v8LCCLWRvPrjdzXHx9FEOA8oAZPyApWUA==",
             "cpu": [
                 "ia32"
             ],
@@ -3160,13 +3047,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
-            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.23.0.tgz",
+            "integrity": "sha512-InQwepswq6urikQiIC/kkx412fqUZudBO4SYKu0N+tGhXRWUqAx+Q+341tFV6QdBifpjYgUndV1hhMq3WeJi7A==",
             "cpu": [
                 "loong64"
             ],
@@ -3177,13 +3064,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
-            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.23.0.tgz",
+            "integrity": "sha512-J9rflLtqdYrxHv2FqXE2i1ELgNjT+JFURt/uDMoPQLcjWQA5wDKgQA4t/dTqGa88ZVECKaD0TctwsUfHbVoi4w==",
             "cpu": [
                 "mips64el"
             ],
@@ -3194,13 +3081,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
-            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.23.0.tgz",
+            "integrity": "sha512-cShCXtEOVc5GxU0fM+dsFD10qZ5UpcQ8AM22bYj0u/yaAykWnqXJDpd77ublcX6vdDsWLuweeuSNZk4yUxZwtw==",
             "cpu": [
                 "ppc64"
             ],
@@ -3211,13 +3098,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
-            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.23.0.tgz",
+            "integrity": "sha512-HEtaN7Y5UB4tZPeQmgz/UhzoEyYftbMXrBCUjINGjh3uil+rB/QzzpMshz3cNUxqXN7Vr93zzVtpIDL99t9aRw==",
             "cpu": [
                 "riscv64"
             ],
@@ -3228,13 +3115,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
-            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.23.0.tgz",
+            "integrity": "sha512-WDi3+NVAuyjg/Wxi+o5KPqRbZY0QhI9TjrEEm+8dmpY9Xir8+HE/HNx2JoLckhKbFopW0RdO2D72w8trZOV+Wg==",
             "cpu": [
                 "s390x"
             ],
@@ -3245,13 +3132,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
-            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.23.0.tgz",
+            "integrity": "sha512-a3pMQhUEJkITgAw6e0bWA+F+vFtCciMjW/LPtoj99MhVt+Mfb6bbL9hu2wmTZgNd994qTAEw+U/r6k3qHWWaOQ==",
             "cpu": [
                 "x64"
             ],
@@ -3262,13 +3149,13 @@
                 "linux"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.23.0.tgz",
+            "integrity": "sha512-cRK+YDem7lFTs2Q5nEv/HHc4LnrfBCbH5+JHu6wm2eP+d8OZNoSMYgPZJq78vqQ9g+9+nMuIsAO7skzphRXHyw==",
             "cpu": [
                 "x64"
             ],
@@ -3279,13 +3166,30 @@
                 "netbsd"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
+            }
+        },
+        "node_modules/@esbuild/openbsd-arm64": {
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.23.0.tgz",
+            "integrity": "sha512-suXjq53gERueVWu0OKxzWqk7NxiUWSUlrxoZK7usiF50C6ipColGR5qie2496iKGYNLhDZkPxBI3erbnYkU0rQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
+            "engines": {
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
-            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.23.0.tgz",
+            "integrity": "sha512-6p3nHpby0DM/v15IFKMjAaayFhqnXV52aEmv1whZHX56pdkK+MEaLoQWj+H42ssFarP1PcomVhbsR4pkz09qBg==",
             "cpu": [
                 "x64"
             ],
@@ -3296,13 +3200,13 @@
                 "openbsd"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
-            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.23.0.tgz",
+            "integrity": "sha512-BFelBGfrBwk6LVrmFzCq1u1dZbG4zy/Kp93w2+y83Q5UGYF1d8sCzeLI9NXjKyujjBBniQa8R8PzLFAUrSM9OA==",
             "cpu": [
                 "x64"
             ],
@@ -3313,13 +3217,13 @@
                 "sunos"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
-            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.23.0.tgz",
+            "integrity": "sha512-lY6AC8p4Cnb7xYHuIxQ6iYPe6MfO2CC43XXKo9nBXDb35krYt7KGhQnOkRGar5psxYkircpCqfbNDB4uJbS2jQ==",
             "cpu": [
                 "arm64"
             ],
@@ -3330,13 +3234,13 @@
                 "win32"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
-            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.23.0.tgz",
+            "integrity": "sha512-7L1bHlOTcO4ByvI7OXVI5pNN6HSu6pUQq9yodga8izeuB1KcT2UkHaH6118QJwopExPn0rMHIseCTx1CRo/uNA==",
             "cpu": [
                 "ia32"
             ],
@@ -3347,13 +3251,13 @@
                 "win32"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
-            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.23.0.tgz",
+            "integrity": "sha512-Arm+WgUFLUATuoxCJcahGuk6Yj9Pzxd6l11Zb/2aAuv5kWWvvfhLFo2fni4uSK5vzlUdCGZ/BdV5tH8klj8p8g==",
             "cpu": [
                 "x64"
             ],
@@ -3364,7 +3268,7 @@
                 "win32"
             ],
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
@@ -3394,9 +3298,9 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.17.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz",
-            "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==",
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.18.0.tgz",
+            "integrity": "sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -3518,9 +3422,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.9.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz",
-            "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==",
+            "version": "9.9.1",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.1.tgz",
+            "integrity": "sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3657,41 +3561,16 @@
             }
         },
         "node_modules/@inquirer/checkbox": {
-            "version": "2.4.7",
-            "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.7.tgz",
-            "integrity": "sha512-5YwCySyV1UEgqzz34gNsC38eKxRBtlRDpJLlKcRtTjlYA/yDKuc1rfw+hjw+2WJxbAZtaDPsRl5Zk7J14SBoBw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "ansi-escapes": "^4.3.2",
-                "yoctocolors-cjs": "^2.1.2"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/@inquirer/checkbox/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.5.0.tgz",
+            "integrity": "sha512-sMgdETOfi2dUHT8r7TT1BTKOwNvdDGFDXYWtQ2J69SvlYNntk9I/gJe7r5yvMwwsuKnYbuRs3pNhx4tgNck5aA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
+                "@inquirer/core": "^9.1.0",
                 "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
+                "@inquirer/type": "^1.5.3",
                 "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
                 "yoctocolors-cjs": "^2.1.2"
             },
             "engines": {
@@ -3699,87 +3578,30 @@
             }
         },
         "node_modules/@inquirer/confirm": {
-            "version": "3.1.11",
-            "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.11.tgz",
-            "integrity": "sha512-3wWw10VPxQP279FO4bzWsf8YjIAq7NdwATJ4xS2h1uwsXZu/RmtOVV95rZ7yllS1h/dzu+uLewjMAzNDEj8h2w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@inquirer/core": "^8.2.4",
-                "@inquirer/type": "^1.3.3"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/@inquirer/core": {
-            "version": "8.2.4",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-8.2.4.tgz",
-            "integrity": "sha512-7vsXSfxtrrbwMTirfaKwPcjqJy7pzeuF/bP62yo1NQrRJ5HjmMlrhZml/Ljm9ODc1RnbhJlTeSnCkjtFddKjwA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@inquirer/figures": "^1.0.3",
-                "@inquirer/type": "^1.3.3",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^20.14.9",
-                "@types/wrap-ansi": "^3.0.0",
-                "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "picocolors": "^1.0.1",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/@inquirer/core/node_modules/@types/node": {
-            "version": "20.14.14",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.14.tgz",
-            "integrity": "sha512-d64f00982fS9YoOgJkAMolK7MN8Iq3TDdVjchbYHdEmjth/DHowx82GnoA+tVUAN+7vxfYUgAzi+JXbKNd2SDQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "undici-types": "~5.26.4"
-            }
-        },
-        "node_modules/@inquirer/core/node_modules/undici-types": {
-            "version": "5.26.5",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/@inquirer/editor": {
-            "version": "2.1.22",
-            "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.22.tgz",
-            "integrity": "sha512-K1QwTu7GCK+nKOVRBp5HY9jt3DXOfPGPr6WRDrPImkcJRelG9UTx2cAtK1liXmibRrzJlTWOwqgWT3k2XnS62w==",
+            "version": "3.1.22",
+            "resolved": "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.22.tgz",
+            "integrity": "sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@inquirer/core": "^9.0.10",
-                "@inquirer/type": "^1.5.2",
-                "external-editor": "^3.1.0"
+                "@inquirer/type": "^1.5.2"
             },
             "engines": {
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/editor/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+        "node_modules/@inquirer/core": {
+            "version": "9.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.1.0.tgz",
+            "integrity": "sha512-RZVfH//2ytTjmaBIzeKT1zefcQZzuruwkpTwwbe/i2jTl4o9M+iML5ChULzz6iw1Ok8iUBBsRCjY2IEbD8Ft4w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
+                "@inquirer/type": "^1.5.3",
                 "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
+                "@types/node": "^22.5.2",
                 "@types/wrap-ansi": "^3.0.0",
                 "ansi-escapes": "^4.3.2",
                 "cli-spinners": "^2.9.2",
@@ -3794,40 +3616,30 @@
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/expand": {
-            "version": "2.1.22",
-            "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.22.tgz",
-            "integrity": "sha512-wTZOBkzH+ItPuZ3ZPa9lynBsdMp6kQ9zbjVPYEtSBG7UulGjg2kQiAnUjgyG4SlntpTce5bOmXAPvE4sguXjpA==",
+        "node_modules/@inquirer/editor": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/editor/-/editor-2.2.0.tgz",
+            "integrity": "sha512-9KHOpJ+dIL5SZli8lJ6xdaYLPPzB8xB9GZItg39MBybzhxA16vxmszmQFrRwbOA918WA2rvu8xhDEg/p6LXKbw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/type": "^1.5.2",
-                "yoctocolors-cjs": "^2.1.2"
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3",
+                "external-editor": "^3.1.0"
             },
             "engines": {
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/expand/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+        "node_modules/@inquirer/expand": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/expand/-/expand-2.2.0.tgz",
+            "integrity": "sha512-PD0z1dTRTIlpcnXRMRvdVPfBe10jBf4i7YLBU8tNWDkf3HxqmdymVvqnT8XG+hxQSvqfpJCe13Jv2Iv1eB3bIg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
-                "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3",
                 "yoctocolors-cjs": "^2.1.2"
             },
             "engines": {
@@ -3845,138 +3657,95 @@
             }
         },
         "node_modules/@inquirer/input": {
-            "version": "2.2.9",
-            "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.2.9.tgz",
-            "integrity": "sha512-7Z6N+uzkWM7+xsE+3rJdhdG/+mQgejOVqspoW+w0AbSZnL6nq5tGMEVASaYVWbkoSzecABWwmludO2evU3d31g==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/input/-/input-2.3.0.tgz",
+            "integrity": "sha512-XfnpCStx2xgh1LIRqPXrTNEEByqQWoxsWYzNRSEUxJ5c6EQlhMogJ3vHKu8aXuTacebtaZzMAHwEL0kAflKOBw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/type": "^1.5.2"
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3"
             },
             "engines": {
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/input/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+        "node_modules/@inquirer/number": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/number/-/number-1.1.0.tgz",
+            "integrity": "sha512-ilUnia/GZUtfSZy3YEErXLJ2Sljo/mf9fiKc08n18DdwdmDbOzRcTv65H1jjDvlsAuvdFXf4Sa/aL7iw/NanVA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
-                "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
-                "yoctocolors-cjs": "^2.1.2"
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3"
             },
             "engines": {
                 "node": ">=18"
             }
         },
         "node_modules/@inquirer/password": {
-            "version": "2.1.22",
-            "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.1.22.tgz",
-            "integrity": "sha512-5Fxt1L9vh3rAKqjYwqsjU4DZsEvY/2Gll+QkqR4yEpy6wvzLxdSgFhUcxfDAOtO4BEoTreWoznC0phagwLU5Kw==",
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/password/-/password-2.2.0.tgz",
+            "integrity": "sha512-5otqIpgsPYIshqhgtEwSspBQE40etouR8VIxzpJkv9i0dVHIpyhiivbkH9/dGiMLdyamT54YRdGJLfl8TFnLHg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/type": "^1.5.2",
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3",
                 "ansi-escapes": "^4.3.2"
             },
             "engines": {
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/password/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
-                "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
-                "yoctocolors-cjs": "^2.1.2"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
         "node_modules/@inquirer/prompts": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.0.7.tgz",
-            "integrity": "sha512-GFcigCxJTKCH3aECzMIu4FhgLJWnFvMXzpI4CCSoELWFtkOOU2P+goYA61+OKpGrB8fPE7q6n8zAXBSlZRrHjQ==",
+            "version": "5.3.8",
+            "resolved": "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.3.8.tgz",
+            "integrity": "sha512-b2BudQY/Si4Y2a0PdZZL6BeJtl8llgeZa7U2j47aaJSCeAl1e4UI7y8a9bSkO3o/ZbZrgT5muy/34JbsjfIWxA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/checkbox": "^2.3.7",
-                "@inquirer/confirm": "^3.1.11",
-                "@inquirer/editor": "^2.1.11",
-                "@inquirer/expand": "^2.1.11",
-                "@inquirer/input": "^2.1.11",
-                "@inquirer/password": "^2.1.11",
-                "@inquirer/rawlist": "^2.1.11",
-                "@inquirer/select": "^2.3.7"
+                "@inquirer/checkbox": "^2.4.7",
+                "@inquirer/confirm": "^3.1.22",
+                "@inquirer/editor": "^2.1.22",
+                "@inquirer/expand": "^2.1.22",
+                "@inquirer/input": "^2.2.9",
+                "@inquirer/number": "^1.0.10",
+                "@inquirer/password": "^2.1.22",
+                "@inquirer/rawlist": "^2.2.4",
+                "@inquirer/search": "^1.0.7",
+                "@inquirer/select": "^2.4.7"
             },
             "engines": {
                 "node": ">=18"
             }
         },
         "node_modules/@inquirer/rawlist": {
-            "version": "2.2.4",
-            "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.2.4.tgz",
-            "integrity": "sha512-pb6w9pWrm7EfnYDgQObOurh2d2YH07+eDo3xQBsNAM2GRhliz6wFXGi1thKQ4bN6B0xDd6C3tBsjdr3obsCl3Q==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.3.0.tgz",
+            "integrity": "sha512-zzfNuINhFF7OLAtGHfhwOW2TlYJyli7lOUoJUXw/uyklcwalV6WRXBXtFIicN8rTRK1XTiPWB4UY+YuW8dsnLQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/type": "^1.5.2",
+                "@inquirer/core": "^9.1.0",
+                "@inquirer/type": "^1.5.3",
                 "yoctocolors-cjs": "^2.1.2"
             },
             "engines": {
                 "node": ">=18"
             }
         },
-        "node_modules/@inquirer/rawlist/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+        "node_modules/@inquirer/search": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/search/-/search-1.1.0.tgz",
+            "integrity": "sha512-h+/5LSj51dx7hp5xOn4QFnUaKeARwUCLs6mIhtkJ0JYPBLmEYjdHSYh7I6GrLg9LwpJ3xeX0FZgAG1q0QdCpVQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
+                "@inquirer/core": "^9.1.0",
                 "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
-                "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
+                "@inquirer/type": "^1.5.3",
                 "yoctocolors-cjs": "^2.1.2"
             },
             "engines": {
@@ -3984,41 +3753,16 @@
             }
         },
         "node_modules/@inquirer/select": {
-            "version": "2.4.7",
-            "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.4.7.tgz",
-            "integrity": "sha512-JH7XqPEkBpNWp3gPCqWqY8ECbyMoFcCZANlL6pV9hf59qK6dGmkOlx1ydyhY+KZ0c5X74+W6Mtp+nm2QX0/MAQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@inquirer/core": "^9.0.10",
-                "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "ansi-escapes": "^4.3.2",
-                "yoctocolors-cjs": "^2.1.2"
-            },
-            "engines": {
-                "node": ">=18"
-            }
-        },
-        "node_modules/@inquirer/select/node_modules/@inquirer/core": {
-            "version": "9.0.10",
-            "resolved": "https://registry.npmjs.org/@inquirer/core/-/core-9.0.10.tgz",
-            "integrity": "sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@inquirer/select/-/select-2.5.0.tgz",
+            "integrity": "sha512-YmDobTItPP3WcEI86GvPo+T2sRHkxxOq/kXmsBjHS5BVXUgvgZ5AfJjkvQvZr03T81NnI3KrrRuMzeuYUQRFOA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
+                "@inquirer/core": "^9.1.0",
                 "@inquirer/figures": "^1.0.5",
-                "@inquirer/type": "^1.5.2",
-                "@types/mute-stream": "^0.0.4",
-                "@types/node": "^22.1.0",
-                "@types/wrap-ansi": "^3.0.0",
+                "@inquirer/type": "^1.5.3",
                 "ansi-escapes": "^4.3.2",
-                "cli-spinners": "^2.9.2",
-                "cli-width": "^4.1.0",
-                "mute-stream": "^1.0.0",
-                "signal-exit": "^4.1.0",
-                "strip-ansi": "^6.0.1",
-                "wrap-ansi": "^6.2.0",
                 "yoctocolors-cjs": "^2.1.2"
             },
             "engines": {
@@ -4026,9 +3770,9 @@
             }
         },
         "node_modules/@inquirer/type": {
-            "version": "1.5.2",
-            "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.2.tgz",
-            "integrity": "sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/@inquirer/type/-/type-1.5.3.tgz",
+            "integrity": "sha512-xUQ14WQGR/HK5ei+2CvgcwoH9fQ4PgPGmVFSN0pc1+fVyDL3MREhyAY7nxEErSu6CkllBM3D7e3e+kOvtu+eIg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4352,6 +4096,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@jest/console/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/@jest/console/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -4476,12 +4230,22 @@
                 "node": ">=8"
             }
         },
-        "node_modules/@jest/core/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "license": "MIT",
+        "node_modules/@jest/core/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/@jest/core/node_modules/supports-color": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
                 "has-flag": "^4.0.0"
             },
@@ -4673,6 +4437,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@jest/reporters/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/@jest/reporters/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -4746,6 +4520,16 @@
                 "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
             }
         },
+        "node_modules/@jest/test-sequencer/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/@jest/transform": {
             "version": "29.7.0",
             "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
@@ -4843,6 +4627,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/@jest/transform/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/@jest/transform/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -5074,13 +4868,13 @@
             "license": "MIT"
         },
         "node_modules/@listr2/prompt-adapter-inquirer": {
-            "version": "2.0.13",
-            "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz",
-            "integrity": "sha512-nAl6teTt7EWSjttNavAnv3uFR3w3vPP3OTYmHyPNHzKhAj2NoBDHmbS3MGpvvO8KXXPASnHjEGrrKrdKTMKPnQ==",
+            "version": "2.0.15",
+            "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.15.tgz",
+            "integrity": "sha512-MZrGem/Ujjd4cPTLYDfCZK2iKKeiO/8OX13S6jqxldLs0Prf2aGqVlJ77nMBqMv7fzqgXEgjrNHLXcKR8l9lOg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@inquirer/type": "^1.3.3"
+                "@inquirer/type": "^1.5.1"
             },
             "engines": {
                 "node": ">=18.0.0"
@@ -5090,9 +4884,9 @@
             }
         },
         "node_modules/@lmdb/lmdb-darwin-arm64": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.12.tgz",
-            "integrity": "sha512-vgTwzNUD3Hy4aqtGhX2+nV/usI0mwy3hDRuTjs8VcK0BLiMVEpNQXgzwlWEgPmA8AAPloUgyOs2nK5clJF5oIg==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-3.0.13.tgz",
+            "integrity": "sha512-uiKPB0Fv6WEEOZjruu9a6wnW/8jrjzlZbxXscMB8kuCJ1k6kHpcBnuvaAWcqhbI7rqX5GKziwWEdD+wi2gNLfA==",
             "cpu": [
                 "arm64"
             ],
@@ -5104,9 +4898,9 @@
             ]
         },
         "node_modules/@lmdb/lmdb-darwin-x64": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.12.tgz",
-            "integrity": "sha512-qOt0hAhj2ZLY6aEWu85rzt5zcyCAQITMhCMEPNlo1tuYekpVAdkQNiwXxEkCjBYvwTskvXuwXOOUpjuSc+aJnA==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-3.0.13.tgz",
+            "integrity": "sha512-bEVIIfK5mSQoG1R19qA+fJOvCB+0wVGGnXHT3smchBVahYBdlPn2OsZZKzlHWfb1E+PhLBmYfqB5zQXFP7hJig==",
             "cpu": [
                 "x64"
             ],
@@ -5118,9 +4912,9 @@
             ]
         },
         "node_modules/@lmdb/lmdb-linux-arm": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.12.tgz",
-            "integrity": "sha512-Ggd/UXpE+alMncbELCXA3OKpDj9bDBR3qVO7WRTxstloDglRAHfZmUJgTkeaNKjFO1JHqS7AKy0jba9XebZB1w==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-3.0.13.tgz",
+            "integrity": "sha512-Yml1KlMzOnXj/tnW7yX8U78iAzTk39aILYvCPbqeewAq1kSzl+w59k/fiVkTBfvDi/oW/5YRxL+Fq+Y1Fr1r2Q==",
             "cpu": [
                 "arm"
             ],
@@ -5132,9 +4926,9 @@
             ]
         },
         "node_modules/@lmdb/lmdb-linux-arm64": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.12.tgz",
-            "integrity": "sha512-Qy4cFXFe9h1wAWMsojex8x1ifvw2kqiZv686YiRTdQEzAfc3vJASHFcD/QejHUCx7YHMYdnUoCS45rG2AiGDTQ==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-3.0.13.tgz",
+            "integrity": "sha512-afbVrsMgZ9dUTNUchFpj5VkmJRxvht/u335jUJ7o23YTbNbnpmXif3VKQGCtnjSh+CZaqm6N3CPG8KO3zwyZ1Q==",
             "cpu": [
                 "arm64"
             ],
@@ -5146,9 +4940,9 @@
             ]
         },
         "node_modules/@lmdb/lmdb-linux-x64": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.12.tgz",
-            "integrity": "sha512-c+noT9IofktxktFllKHFmci8ka2SYGSLN17pj/KSl1hg7mmfAiGp4xxFxEwMLTb+SX95vP1DFiR++1I3WLVxvA==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-3.0.13.tgz",
+            "integrity": "sha512-vOtxu0xC0SLdQ2WRXg8Qgd8T32ak4SPqk5zjItRszrJk2BdeXqfGxBJbP7o4aOvSPSmSSv46Lr1EP4HXU8v7Kg==",
             "cpu": [
                 "x64"
             ],
@@ -5160,9 +4954,9 @@
             ]
         },
         "node_modules/@lmdb/lmdb-win32-x64": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.12.tgz",
-            "integrity": "sha512-CO3MFV8gUx16NU/CyyuumAKblESwvoGVA2XhQKZ976OTOxaTbb8F8D3f0iiZ4MYqsN74jIrFuCmXpPnpjbhfOQ==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-3.0.13.tgz",
+            "integrity": "sha512-UCrMJQY/gJnOl3XgbWRZZUvGGBuKy6i0YNSptgMzHBjs+QYDYR1Mt/RLTOPy4fzzves65O1EDmlL//OzEqoLlA==",
             "cpu": [
                 "x64"
             ],
@@ -5218,6 +5012,93 @@
                 "uuid": "dist/bin/uuid"
             }
         },
+        "node_modules/@mapbox/node-pre-gyp": {
+            "version": "1.0.11",
+            "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
+            "integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
+            "license": "BSD-3-Clause",
+            "optional": true,
+            "dependencies": {
+                "detect-libc": "^2.0.0",
+                "https-proxy-agent": "^5.0.0",
+                "make-dir": "^3.1.0",
+                "node-fetch": "^2.6.7",
+                "nopt": "^5.0.0",
+                "npmlog": "^5.0.1",
+                "rimraf": "^3.0.2",
+                "semver": "^7.3.5",
+                "tar": "^6.1.11"
+            },
+            "bin": {
+                "node-pre-gyp": "bin/node-pre-gyp"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/abbrev": {
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+            "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+            "license": "ISC",
+            "optional": true
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/make-dir": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+            "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "semver": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/@mapbox/node-pre-gyp/node_modules/nopt": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
+            "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==",
+            "license": "ISC",
+            "optional": true,
+            "dependencies": {
+                "abbrev": "1"
+            },
+            "bin": {
+                "nopt": "bin/nopt.js"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/@msgpackr-extract/msgpackr-extract-darwin-arm64": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.3.tgz",
@@ -5302,22 +5183,10 @@
                 "win32"
             ]
         },
-        "node_modules/@napi-rs/wasm-runtime": {
-            "version": "0.2.4",
-            "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz",
-            "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@emnapi/core": "^1.1.0",
-                "@emnapi/runtime": "^1.1.0",
-                "@tybys/wasm-util": "^0.9.0"
-            }
-        },
         "node_modules/@ng-bootstrap/ng-bootstrap": {
-            "version": "17.0.0",
-            "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.0.tgz",
-            "integrity": "sha512-hTbBtozJlpevF1RO6J2adCoXiAkMTPV3wmXIyK05dVha4VsKjHibgaL6YldToKoh6ElQnIYkPEIJHX9z5EtyMw==",
+            "version": "17.0.1",
+            "resolved": "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-17.0.1.tgz",
+            "integrity": "sha512-utbm8OXIoqVVYGVzQkOS773ymbjc+UMkXv8lyi7hTqLhCQs0rZ0yA74peqVZRuOGXLHgcSTA7fnJhA80iQOblw==",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.3.0"
@@ -5332,9 +5201,9 @@
             }
         },
         "node_modules/@ngtools/webpack": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.1.4.tgz",
-            "integrity": "sha512-suoeZjd+7qd3ivzbNGGSzHtY/WMxTKU6ZD1gIIya0Un8Ve1eVxfq6Si6ReKqhygO8zN3paJMATn8sMmAV7qVrw==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-18.2.3.tgz",
+            "integrity": "sha512-DDuBHcu23qckt43SexBJaPEIeMc/HKaFOidILZM9D4gU4C9VroMActdR218dvQ802QfL0S46t5Ykz8ENprIfjA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5570,22 +5439,6 @@
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "node_modules/@npmcli/package-json/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/@npmcli/promise-spawn": {
             "version": "7.0.2",
             "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz",
@@ -5679,89 +5532,143 @@
                 "node": "^16.13.0 || >=18.0.0"
             }
         },
-        "node_modules/@nrwl/devkit": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.5.7.tgz",
-            "integrity": "sha512-sTEwqsAT6bMturU14o/0O6v509OkwGOglxpbiL/zIYO/fDkMoNgnhlHBIT87i4YVuofMz2Z+hTfjDskzDPRSYw==",
+        "node_modules/@pkgjs/parseargs": {
+            "version": "0.11.0",
+            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "@nx/devkit": "19.5.7"
+            "optional": true,
+            "engines": {
+                "node": ">=14"
             }
         },
-        "node_modules/@nrwl/tao": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-19.5.7.tgz",
-            "integrity": "sha512-c1rN6HY97+cEwoM5Q9412399Ac1rw7pI/3IS5iJSYkeI5TTGOobIpdCavJPZVcfqo4+wegXPA3F/OmulgbOUJA==",
+        "node_modules/@pkgr/core": {
+            "version": "0.1.1",
+            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
+            "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "nx": "19.5.7",
-                "tslib": "^2.3.0"
+            "engines": {
+                "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
             },
-            "bin": {
-                "tao": "index.js"
+            "funding": {
+                "url": "https://opencollective.com/unts"
             }
         },
-        "node_modules/@nx/devkit": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-19.5.7.tgz",
-            "integrity": "sha512-mUtZQcdqbF0Q9HfyG14jmpPCtZ1GnVaLNIADZv5SLpFyfh4ZjaBw6wdjPj7Sp3imLoyqMrcd9nCRNO2hlem8bw==",
-            "dev": true,
+        "node_modules/@popperjs/core": {
+            "version": "2.11.8",
+            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+            "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+            "license": "MIT",
+            "peer": true,
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/popperjs"
+            }
+        },
+        "node_modules/@redux-saga/core": {
+            "version": "1.3.0",
+            "resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.3.0.tgz",
+            "integrity": "sha512-L+i+qIGuyWn7CIg7k1MteHGfttKPmxwZR5E7OsGikCL2LzYA0RERlaUY00Y3P3ZV2EYgrsYlBrGs6cJP5OKKqA==",
             "license": "MIT",
             "dependencies": {
-                "@nrwl/devkit": "19.5.7",
-                "ejs": "^3.1.7",
-                "enquirer": "~2.3.6",
-                "ignore": "^5.0.4",
-                "minimatch": "9.0.3",
-                "semver": "^7.5.3",
-                "tmp": "~0.2.1",
-                "tslib": "^2.3.0",
-                "yargs-parser": "21.1.1"
+                "@babel/runtime": "^7.6.3",
+                "@redux-saga/deferred": "^1.2.1",
+                "@redux-saga/delay-p": "^1.2.1",
+                "@redux-saga/is": "^1.1.3",
+                "@redux-saga/symbols": "^1.1.3",
+                "@redux-saga/types": "^1.2.1",
+                "typescript-tuple": "^2.2.1"
             },
-            "peerDependencies": {
-                "nx": ">= 17 <= 20"
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/redux-saga"
+            }
+        },
+        "node_modules/@redux-saga/deferred": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@redux-saga/deferred/-/deferred-1.2.1.tgz",
+            "integrity": "sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g==",
+            "license": "MIT"
+        },
+        "node_modules/@redux-saga/delay-p": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@redux-saga/delay-p/-/delay-p-1.2.1.tgz",
+            "integrity": "sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w==",
+            "license": "MIT",
+            "dependencies": {
+                "@redux-saga/symbols": "^1.1.3"
+            }
+        },
+        "node_modules/@redux-saga/is": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@redux-saga/is/-/is-1.1.3.tgz",
+            "integrity": "sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q==",
+            "license": "MIT",
+            "dependencies": {
+                "@redux-saga/symbols": "^1.1.3",
+                "@redux-saga/types": "^1.2.1"
             }
         },
-        "node_modules/@nx/nx-darwin-arm64": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-19.5.7.tgz",
-            "integrity": "sha512-5jFAZSfV8QVNoxOXayZw4/jNJbxMMctNOYZW8Qj4eU8Ti+OmhsLgouxz/9enCh5SDITriOMZ7IHZ9rhrlGQoig==",
+        "node_modules/@redux-saga/symbols": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@redux-saga/symbols/-/symbols-1.1.3.tgz",
+            "integrity": "sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg==",
+            "license": "MIT"
+        },
+        "node_modules/@redux-saga/types": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/@redux-saga/types/-/types-1.2.1.tgz",
+            "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==",
+            "license": "MIT"
+        },
+        "node_modules/@rollup/rollup-android-arm-eabi": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.20.0.tgz",
+            "integrity": "sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==",
             "cpu": [
-                "arm64"
+                "arm"
             ],
             "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
-                "darwin"
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-android-arm64": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.20.0.tgz",
+            "integrity": "sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==",
+            "cpu": [
+                "arm64"
             ],
-            "engines": {
-                "node": ">= 10"
-            }
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
         },
-        "node_modules/@nx/nx-darwin-x64": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-19.5.7.tgz",
-            "integrity": "sha512-Ss+rF2+MQxyKrNnSYAeEGhtdE9hUHiTqyjJo4n1lvIWJ++TairOCtk5QRHrYLgAxE1XTf0OabcsDzegxv7yk3Q==",
+        "node_modules/@rollup/rollup-darwin-arm64": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz",
+            "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==",
             "cpu": [
-                "x64"
+                "arm64"
             ],
             "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
                 "darwin"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
+            ]
         },
-        "node_modules/@nx/nx-freebsd-x64": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-19.5.7.tgz",
-            "integrity": "sha512-FMLXcUr3mw/v4LvmNqHMAXy2k+T/hp2YpdBUq9ExteMfRywFsnKNlm39n/quniFsgKthEMdvvzxSQppRKaVwIw==",
+        "node_modules/@rollup/rollup-darwin-x64": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.20.0.tgz",
+            "integrity": "sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==",
             "cpu": [
                 "x64"
             ],
@@ -5769,16 +5676,13 @@
             "license": "MIT",
             "optional": true,
             "os": [
-                "freebsd"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
+                "darwin"
+            ]
         },
-        "node_modules/@nx/nx-linux-arm-gnueabihf": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-19.5.7.tgz",
-            "integrity": "sha512-LhJ342HutpR258lBLVTkXd6x2Uj4ZPJ6xKdfEm+FYQvG1byPr2L0TlNXcfSBkYtd7wRn0qg9eQZoCV/5+w415Q==",
+        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.20.0.tgz",
+            "integrity": "sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==",
             "cpu": [
                 "arm"
             ],
@@ -5787,292 +5691,26 @@
             "optional": true,
             "os": [
                 "linux"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
+            ]
         },
-        "node_modules/@nx/nx-linux-arm64-gnu": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-19.5.7.tgz",
-            "integrity": "sha512-Q6gN+VNLisg7mYPTXC5JuGCP/s9tLjJFclKdH6FoP5K1Hgy88KK1uUoivDIfI8xaEgyLqphD1AAqokiFWZNWsg==",
+        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.20.0.tgz",
+            "integrity": "sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==",
             "cpu": [
-                "arm64"
+                "arm"
             ],
             "dev": true,
             "license": "MIT",
             "optional": true,
             "os": [
                 "linux"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
+            ]
         },
-        "node_modules/@nx/nx-linux-arm64-musl": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-19.5.7.tgz",
-            "integrity": "sha512-BsYNcYujNKb+uE7PrJp4PrX8a3G9oy+THaUr0t5+L435HjuZDBiK+tK9JzYGvM0bR5FOYm5K99I1DVD/Hv0snw==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@nx/nx-linux-x64-gnu": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-19.5.7.tgz",
-            "integrity": "sha512-ILaLU8b5lUokYVF3vxAVj62qFok1hexiNzBdLGJPI1OkPGELtLyb8RymI3939iJoNMk1DS3/6dqK7NHXvHX8Mw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@nx/nx-linux-x64-musl": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-19.5.7.tgz",
-            "integrity": "sha512-LfTnO4JZebLugioMk+GTptv3N38Wj2i2Pko0bdRZaKba+INGSlUgFqoRuO0KqZEmVIUGrxfkfqIN3HghVQ4D/Q==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@nx/nx-win32-arm64-msvc": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-19.5.7.tgz",
-            "integrity": "sha512-cCTttdbf1AKuDU8j108SpIMWs53A/0mOVDPOPpa+oKkvBaI8ruZkxOceMjWZjWULd2gi1nS+5nJePpbrdQ8mkg==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@nx/nx-win32-x64-msvc": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-19.5.7.tgz",
-            "integrity": "sha512-EqSnjpq1PNR/C8/YkL+Gn79dDfQ+HwJM8VJOt4qoCOQ9gQZqNJphjW2hg0H8WxLYezMScx3fbL99mvJO7ab2Cw==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "win32"
-            ],
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@pkgjs/parseargs": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "engines": {
-                "node": ">=14"
-            }
-        },
-        "node_modules/@pkgr/core": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@pkgr/core/-/core-0.1.1.tgz",
-            "integrity": "sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^12.20.0 || ^14.18.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://opencollective.com/unts"
-            }
-        },
-        "node_modules/@popperjs/core": {
-            "version": "2.11.8",
-            "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
-            "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
-            "license": "MIT",
-            "peer": true,
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/popperjs"
-            }
-        },
-        "node_modules/@redux-saga/core": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@redux-saga/core/-/core-1.3.0.tgz",
-            "integrity": "sha512-L+i+qIGuyWn7CIg7k1MteHGfttKPmxwZR5E7OsGikCL2LzYA0RERlaUY00Y3P3ZV2EYgrsYlBrGs6cJP5OKKqA==",
-            "license": "MIT",
-            "dependencies": {
-                "@babel/runtime": "^7.6.3",
-                "@redux-saga/deferred": "^1.2.1",
-                "@redux-saga/delay-p": "^1.2.1",
-                "@redux-saga/is": "^1.1.3",
-                "@redux-saga/symbols": "^1.1.3",
-                "@redux-saga/types": "^1.2.1",
-                "typescript-tuple": "^2.2.1"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/redux-saga"
-            }
-        },
-        "node_modules/@redux-saga/deferred": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@redux-saga/deferred/-/deferred-1.2.1.tgz",
-            "integrity": "sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g==",
-            "license": "MIT"
-        },
-        "node_modules/@redux-saga/delay-p": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@redux-saga/delay-p/-/delay-p-1.2.1.tgz",
-            "integrity": "sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w==",
-            "license": "MIT",
-            "dependencies": {
-                "@redux-saga/symbols": "^1.1.3"
-            }
-        },
-        "node_modules/@redux-saga/is": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@redux-saga/is/-/is-1.1.3.tgz",
-            "integrity": "sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q==",
-            "license": "MIT",
-            "dependencies": {
-                "@redux-saga/symbols": "^1.1.3",
-                "@redux-saga/types": "^1.2.1"
-            }
-        },
-        "node_modules/@redux-saga/symbols": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@redux-saga/symbols/-/symbols-1.1.3.tgz",
-            "integrity": "sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg==",
-            "license": "MIT"
-        },
-        "node_modules/@redux-saga/types": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/@redux-saga/types/-/types-1.2.1.tgz",
-            "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==",
-            "license": "MIT"
-        },
-        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz",
-            "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz",
-            "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "android"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz",
-            "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==",
-            "cpu": [
-                "arm64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz",
-            "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==",
-            "cpu": [
-                "x64"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "darwin"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz",
-            "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz",
-            "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==",
-            "cpu": [
-                "arm"
-            ],
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "os": [
-                "linux"
-            ]
-        },
-        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz",
-            "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==",
+        "node_modules/@rollup/rollup-linux-arm64-gnu": {
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.20.0.tgz",
+            "integrity": "sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==",
             "cpu": [
                 "arm64"
             ],
@@ -6084,9 +5722,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz",
-            "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.20.0.tgz",
+            "integrity": "sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==",
             "cpu": [
                 "arm64"
             ],
@@ -6098,9 +5736,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz",
-            "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.20.0.tgz",
+            "integrity": "sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==",
             "cpu": [
                 "ppc64"
             ],
@@ -6112,9 +5750,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz",
-            "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.20.0.tgz",
+            "integrity": "sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==",
             "cpu": [
                 "riscv64"
             ],
@@ -6126,9 +5764,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz",
-            "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.20.0.tgz",
+            "integrity": "sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==",
             "cpu": [
                 "s390x"
             ],
@@ -6140,9 +5778,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz",
-            "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.20.0.tgz",
+            "integrity": "sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==",
             "cpu": [
                 "x64"
             ],
@@ -6154,9 +5792,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz",
-            "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.20.0.tgz",
+            "integrity": "sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==",
             "cpu": [
                 "x64"
             ],
@@ -6168,9 +5806,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz",
-            "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.20.0.tgz",
+            "integrity": "sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==",
             "cpu": [
                 "arm64"
             ],
@@ -6182,9 +5820,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz",
-            "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.20.0.tgz",
+            "integrity": "sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==",
             "cpu": [
                 "ia32"
             ],
@@ -6196,9 +5834,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz",
-            "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz",
+            "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==",
             "cpu": [
                 "x64"
             ],
@@ -6210,14 +5848,14 @@
             ]
         },
         "node_modules/@schematics/angular": {
-            "version": "18.1.4",
-            "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.1.4.tgz",
-            "integrity": "sha512-M3edVYKiAGWAAKs7XDLpz1OKUy4STVMT+46Y44ydYz06hI8m/dJfS8ZHTvXPl7JhkrIrSDEMed+WidZtGPIxMg==",
+            "version": "18.2.3",
+            "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-18.2.3.tgz",
+            "integrity": "sha512-whSON70z9HYb4WboVXmPFE/RLKJJQLWNzNcUyi8OSDZkQbJnYgPp0///n738m26Y/XeJDv11q1gESy+Zl2AdUw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "18.1.4",
-                "@angular-devkit/schematics": "18.1.4",
+                "@angular-devkit/core": "18.2.3",
+                "@angular-devkit/schematics": "18.2.3",
                 "jsonc-parser": "3.3.1"
             },
             "engines": {
@@ -6227,73 +5865,73 @@
             }
         },
         "node_modules/@sentry-internal/browser-utils": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.25.0.tgz",
-            "integrity": "sha512-nlWgp1lVhNQOTUplW85G3qm0fOIgAhJ/sl/31OIuScVrITYhYDF2bO+Zv/jQ8YsdUBAUXqY1tPT9wwPJklnPhw==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-8.28.0.tgz",
+            "integrity": "sha512-tE9++KEy8SlqibTmYymuxFVAnutsXBqrwQ936WJbjaMfkqXiro7C1El0ybkprskd0rKS7kln20Q6nQlNlMEoTA==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/feedback": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.25.0.tgz",
-            "integrity": "sha512-327I5XJAFrsgjc5qUKxZ9rff3WNCfGvf1fIii70LQ2YQhQgG4XHZILmkD06ETEyXb+H1tkrNQQEJ1/d4ai+q5g==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-8.28.0.tgz",
+            "integrity": "sha512-5vYunPCDBLCJ8QNnhepacdYheiN+UtYxpGAIaC/zjBC1nDuBgWs+TfKPo1UlO/1sesfgs9ibpxtShOweucL61g==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/replay": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.25.0.tgz",
-            "integrity": "sha512-3f7x8EYthyj157uV9V8vBjun+1gJnHhh2+i0qxYLhMGx7N2Fq0J3Bvvo1rosSg+fYh5HzPNZDufwIRdg5C/MQw==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-8.28.0.tgz",
+            "integrity": "sha512-70jvzzOL5O74gahgXKyRkZgiYN93yly5gq+bbj4/6NRQ+EtPd285+ccy0laExdfyK0ugvvwD4v+1MQit52OAsg==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/browser-utils": "8.25.0",
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry-internal/browser-utils": "8.28.0",
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry-internal/replay-canvas": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.25.0.tgz",
-            "integrity": "sha512-dPXlkAbkFL1DBum8rGTaHS+apJKaXEZJF9gLcBBKTruhTCizrugFLxajzIfVSiFVuwNKuJWa2fzhzbeQM0ee7w==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-8.28.0.tgz",
+            "integrity": "sha512-RfpYHDHMUKGeEdx41QtHITjEn6P3tGaDPHvatqdrD3yv4j+wbJ6laX1PrIxCpGFUtjdzkqi/KUcvUd2kzbH/FA==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/replay": "8.25.0",
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry-internal/replay": "8.28.0",
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/angular": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.25.0.tgz",
-            "integrity": "sha512-sOHQrmD9B0adZxKTKs7CS0PaEShOBYRoCKOGjNx0iCEpPiswHHi9DzpniRYk1vNIL3Z0O7/eWoudnBojZNs8/g==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry/angular/-/angular-8.28.0.tgz",
+            "integrity": "sha512-zHl0OSgBsHnQCINepRxYDsosvKnwJPc9tdRJyIgQ6JCG1kWZf0lHncXRnJBkBSrJk2wJQ0acondhwHRyAptRGg==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/browser": "8.25.0",
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0",
+                "@sentry/browser": "8.28.0",
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0",
                 "tslib": "^2.4.1"
             },
             "engines": {
@@ -6307,52 +5945,52 @@
             }
         },
         "node_modules/@sentry/browser": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.25.0.tgz",
-            "integrity": "sha512-51bdVGXjyooqVGzaSGsnExqRTt9NvZ1zGFsxbbCSXi5UoEFN6zdMUz6jKYsL2K80eeELP2VKOVlobHlEzeJQfw==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-8.28.0.tgz",
+            "integrity": "sha512-i/gjMYzIGQiPFH1pCbdnTwH9xs9mTAqzN+goP3GWX5a58frc7h8vxyA/5z0yMd0aCW6U8mVxnoAT72vGbKbx0g==",
             "license": "MIT",
             "dependencies": {
-                "@sentry-internal/browser-utils": "8.25.0",
-                "@sentry-internal/feedback": "8.25.0",
-                "@sentry-internal/replay": "8.25.0",
-                "@sentry-internal/replay-canvas": "8.25.0",
-                "@sentry/core": "8.25.0",
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry-internal/browser-utils": "8.28.0",
+                "@sentry-internal/feedback": "8.28.0",
+                "@sentry-internal/replay": "8.28.0",
+                "@sentry-internal/replay-canvas": "8.28.0",
+                "@sentry/core": "8.28.0",
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/core": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.25.0.tgz",
-            "integrity": "sha512-7KtglbrW1eX4DOHkf6i4rRIExEf2CgtQ99qZ8gn5FUaAmNMg0rK7bb1yZMx0RZtp5G1TSz/S0jQQgxHWebaEig==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry/core/-/core-8.28.0.tgz",
+            "integrity": "sha512-+If9uubvpZpvaQQw4HLiKPhrSS9/KcoA/AcdQkNm+5CVwAoOmDPtyYfkPBgfo2hLZnZQqR1bwkz/PrNoOm+gqA==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/types": "8.25.0",
-                "@sentry/utils": "8.25.0"
+                "@sentry/types": "8.28.0",
+                "@sentry/utils": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/types": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.25.0.tgz",
-            "integrity": "sha512-ojim0gDcRhGJPguYrtms4FsprX4xZz3LGNk9Z0hwTbSVEdlhQIInsQ7CYcdM3sjUs+qT7kfpxTRZGUeZNRRJcA==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry/types/-/types-8.28.0.tgz",
+            "integrity": "sha512-hOfqfd92/AzBrEdMgmmV1VfOXJbIfleFTnerRl0mg/+CcNgP/6+Fdonp354TD56ouWNF2WkOM6sEKSXMWp6SEQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.18"
             }
         },
         "node_modules/@sentry/utils": {
-            "version": "8.25.0",
-            "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.25.0.tgz",
-            "integrity": "sha512-mVlkV7S62ZZ2jM38/kOwWx2xoW8fUv2cjw2IwFKoAIPyLBh3mo1WJtvfdtN/rXGjQWZJBKW53EWaWnD00rkjyA==",
+            "version": "8.28.0",
+            "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-8.28.0.tgz",
+            "integrity": "sha512-smhk7PJpvDMQ2DB5p2qn9UeoUHdU41IgjMmS2xklZpa8tjzBTxDeWpGvrX2fuH67D9bAJuLC/XyZjJCHLoEW5g==",
             "license": "MIT",
             "dependencies": {
-                "@sentry/types": "8.25.0"
+                "@sentry/types": "8.28.0"
             },
             "engines": {
                 "node": ">=14.18"
@@ -6654,32 +6292,6 @@
                 "node": "^16.14.0 || >=18.0.0"
             }
         },
-        "node_modules/@tufjs/models/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/@tybys/wasm-util": {
-            "version": "0.9.0",
-            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz",
-            "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.4.0"
-            }
-        },
         "node_modules/@types/babel__core": {
             "version": "7.20.5",
             "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -6797,28 +6409,6 @@
                 "@types/trusted-types": "*"
             }
         },
-        "node_modules/@types/eslint": {
-            "version": "9.6.0",
-            "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz",
-            "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/estree": "*",
-                "@types/json-schema": "*"
-            }
-        },
-        "node_modules/@types/eslint-scope": {
-            "version": "3.7.7",
-            "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
-            "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/eslint": "*",
-                "@types/estree": "*"
-            }
-        },
         "node_modules/@types/estree": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -6981,13 +6571,13 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "22.2.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz",
-            "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==",
+            "version": "22.5.4",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
+            "integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.13.0"
+                "undici-types": "~6.19.2"
             }
         },
         "node_modules/@types/node-forge": {
@@ -7031,9 +6621,9 @@
             "license": "MIT"
         },
         "node_modules/@types/react": {
-            "version": "18.3.3",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
-            "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
+            "version": "18.3.5",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.5.tgz",
+            "integrity": "sha512-WeqMfGJLGuLCqHGYRGHxnKrXcTitc6L/nBUWfWPcTarG3t9PsquqUMuVeXZeca+mglY4Vo5GZjCi0A3Or2lnxA==",
             "license": "MIT",
             "dependencies": {
                 "@types/prop-types": "*",
@@ -7187,17 +6777,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz",
-            "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.4.0.tgz",
+            "integrity": "sha512-rg8LGdv7ri3oAlenMACk9e+AR4wUV0yrrG+XKsGKOK0EVgeEDqurkXMPILG2836fW4ibokTB5v4b6Z9+GYQDEw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.1.0",
-                "@typescript-eslint/type-utils": "8.1.0",
-                "@typescript-eslint/utils": "8.1.0",
-                "@typescript-eslint/visitor-keys": "8.1.0",
+                "@typescript-eslint/scope-manager": "8.4.0",
+                "@typescript-eslint/type-utils": "8.4.0",
+                "@typescript-eslint/utils": "8.4.0",
+                "@typescript-eslint/visitor-keys": "8.4.0",
                 "graphemer": "^1.4.0",
                 "ignore": "^5.3.1",
                 "natural-compare": "^1.4.0",
@@ -7221,16 +6811,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz",
-            "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.4.0.tgz",
+            "integrity": "sha512-NHgWmKSgJk5K9N16GIhQ4jSobBoJwrmURaLErad0qlLjrpP5bECYg+wxVTGlGZmJbU03jj/dfnb6V9bw+5icsA==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.1.0",
-                "@typescript-eslint/types": "8.1.0",
-                "@typescript-eslint/typescript-estree": "8.1.0",
-                "@typescript-eslint/visitor-keys": "8.1.0",
+                "@typescript-eslint/scope-manager": "8.4.0",
+                "@typescript-eslint/types": "8.4.0",
+                "@typescript-eslint/typescript-estree": "8.4.0",
+                "@typescript-eslint/visitor-keys": "8.4.0",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -7250,14 +6840,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz",
-            "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.4.0.tgz",
+            "integrity": "sha512-n2jFxLeY0JmKfUqy3P70rs6vdoPjHK8P/w+zJcV3fk0b0BwRXC/zxRTEnAsgYT7MwdQDt/ZEbtdzdVC+hcpF0A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.1.0",
-                "@typescript-eslint/visitor-keys": "8.1.0"
+                "@typescript-eslint/types": "8.4.0",
+                "@typescript-eslint/visitor-keys": "8.4.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7268,14 +6858,14 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz",
-            "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.4.0.tgz",
+            "integrity": "sha512-pu2PAmNrl9KX6TtirVOrbLPLwDmASpZhK/XU7WvoKoCUkdtq9zF7qQ7gna0GBZFN0hci0vHaSusiL2WpsQk37A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/typescript-estree": "8.1.0",
-                "@typescript-eslint/utils": "8.1.0",
+                "@typescript-eslint/typescript-estree": "8.4.0",
+                "@typescript-eslint/utils": "8.4.0",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^1.3.0"
             },
@@ -7293,9 +6883,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz",
-            "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.4.0.tgz",
+            "integrity": "sha512-T1RB3KQdskh9t3v/qv7niK6P8yvn7ja1mS7QK7XfRVL6wtZ8/mFs/FHf4fKvTA0rKnqnYxl/uHFNbnEt0phgbw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -7307,16 +6897,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz",
-            "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.4.0.tgz",
+            "integrity": "sha512-kJ2OIP4dQw5gdI4uXsaxUZHRwWAGpREJ9Zq6D5L0BweyOrWsL6Sz0YcAZGWhvKnH7fm1J5YFE1JrQL0c9dd53A==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "@typescript-eslint/types": "8.1.0",
-                "@typescript-eslint/visitor-keys": "8.1.0",
+                "@typescript-eslint/types": "8.4.0",
+                "@typescript-eslint/visitor-keys": "8.4.0",
                 "debug": "^4.3.4",
-                "globby": "^11.1.0",
+                "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
                 "minimatch": "^9.0.4",
                 "semver": "^7.6.0",
@@ -7335,33 +6925,17 @@
                 }
             }
         },
-        "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz",
-            "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.4.0.tgz",
+            "integrity": "sha512-swULW8n1IKLjRAgciCkTCafyTHHfwVQFt8DovmaF69sKbOxTSFMmIZaSHjqO9i/RV0wIblaawhzvtva8Nmm7lQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.4.0",
-                "@typescript-eslint/scope-manager": "8.1.0",
-                "@typescript-eslint/types": "8.1.0",
-                "@typescript-eslint/typescript-estree": "8.1.0"
+                "@typescript-eslint/scope-manager": "8.4.0",
+                "@typescript-eslint/types": "8.4.0",
+                "@typescript-eslint/typescript-estree": "8.4.0"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -7375,13 +6949,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz",
-            "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==",
+            "version": "8.4.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.4.0.tgz",
+            "integrity": "sha512-zTQD6WLNTre1hj5wp09nBIDiOc2U5r/qmzo7wxPn4ZgAjHql09EofqhF9WF+fZHzL5aCyaIpPcT2hyxl73kr9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.1.0",
+                "@typescript-eslint/types": "8.4.0",
                 "eslint-visitor-keys": "^3.4.3"
             },
             "engines": {
@@ -7593,64 +7167,6 @@
             "dev": true,
             "license": "BSD-2-Clause"
         },
-        "node_modules/@yarnpkg/parsers": {
-            "version": "3.0.0-rc.46",
-            "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz",
-            "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "js-yaml": "^3.10.0",
-                "tslib": "^2.4.0"
-            },
-            "engines": {
-                "node": ">=14.15.0"
-            }
-        },
-        "node_modules/@yarnpkg/parsers/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/@yarnpkg/parsers/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/@yarnpkg/parsers/node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/@zkochan/js-yaml": {
-            "version": "0.0.7",
-            "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz",
-            "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
         "node_modules/abbrev": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz",
@@ -7675,12 +7191,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/ace-builds": {
-            "version": "1.35.4",
-            "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.35.4.tgz",
-            "integrity": "sha512-r0KQclhZ/uk5a4zOqRYQkJuQuu4vFMiA6VTj54Tk4nI1TUR3iEMMppZkWbNoWEgWwv4ciDloObb9Rf4V55Qgjw==",
-            "license": "BSD-3-Clause"
-        },
         "node_modules/acorn": {
             "version": "8.12.1",
             "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
@@ -7784,16 +7294,16 @@
             }
         },
         "node_modules/ajv": {
-            "version": "8.16.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz",
-            "integrity": "sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==",
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
                 "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.4.1"
+                "require-from-string": "^2.0.2"
             },
             "funding": {
                 "type": "github",
@@ -7916,6 +7426,43 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
+        "node_modules/aproba": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+            "license": "ISC",
+            "optional": true
+        },
+        "node_modules/are-we-there-yet": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz",
+            "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "optional": true,
+            "dependencies": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^3.6.0"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/are-we-there-yet/node_modules/readable-stream": {
+            "version": "3.6.2",
+            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "inherits": "^2.0.3",
+                "string_decoder": "^1.1.1",
+                "util-deprecate": "^1.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/arg": {
             "version": "4.1.3",
             "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
@@ -7958,9 +7505,9 @@
             }
         },
         "node_modules/async": {
-            "version": "3.2.5",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
-            "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+            "version": "3.2.6",
+            "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
+            "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
             "dev": true,
             "license": "MIT"
         },
@@ -7972,9 +7519,9 @@
             "license": "MIT"
         },
         "node_modules/autoprefixer": {
-            "version": "10.4.19",
-            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.19.tgz",
-            "integrity": "sha512-BaENR2+zBZ8xXhM4pUaKUxlVdxZ0EZhjvbopwnXmxRUfqDmwSpC2lAi/QXvx7NRdPCo1WKEcEF6mV64si1z4Ew==",
+            "version": "10.4.20",
+            "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+            "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
             "dev": true,
             "funding": [
                 {
@@ -7992,11 +7539,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "browserslist": "^4.23.0",
-                "caniuse-lite": "^1.0.30001599",
+                "browserslist": "^4.23.3",
+                "caniuse-lite": "^1.0.30001646",
                 "fraction.js": "^4.3.7",
                 "normalize-range": "^0.1.2",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.0.1",
                 "postcss-value-parser": "^4.2.0"
             },
             "bin": {
@@ -8009,18 +7556,6 @@
                 "postcss": "^8.1.0"
             }
         },
-        "node_modules/axios": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
-            "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "follow-redirects": "^1.15.6",
-                "form-data": "^4.0.0",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
         "node_modules/axobject-query": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz",
@@ -8116,6 +7651,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/babel-jest/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/babel-jest/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -8268,24 +7813,27 @@
             }
         },
         "node_modules/babel-preset-current-node-syntax": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-            "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+            "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/plugin-syntax-async-generators": "^7.8.4",
                 "@babel/plugin-syntax-bigint": "^7.8.3",
-                "@babel/plugin-syntax-class-properties": "^7.8.3",
-                "@babel/plugin-syntax-import-meta": "^7.8.3",
+                "@babel/plugin-syntax-class-properties": "^7.12.13",
+                "@babel/plugin-syntax-class-static-block": "^7.14.5",
+                "@babel/plugin-syntax-import-attributes": "^7.24.7",
+                "@babel/plugin-syntax-import-meta": "^7.10.4",
                 "@babel/plugin-syntax-json-strings": "^7.8.3",
-                "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+                "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
                 "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-                "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+                "@babel/plugin-syntax-numeric-separator": "^7.10.4",
                 "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
                 "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
                 "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-                "@babel/plugin-syntax-top-level-await": "^7.8.3"
+                "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+                "@babel/plugin-syntax-top-level-await": "^7.14.5"
             },
             "peerDependencies": {
                 "@babel/core": "^7.0.0"
@@ -8312,7 +7860,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/base64-js": {
@@ -8464,12 +8012,6 @@
                 "@popperjs/core": "^2.11.8"
             }
         },
-        "node_modules/brace": {
-            "version": "0.11.1",
-            "resolved": "https://registry.npmjs.org/brace/-/brace-0.11.1.tgz",
-            "integrity": "sha512-Fc8Ne62jJlKHiG/ajlonC4Sd66Pq68fFwK4ihJGNZpGqboc324SQk+lRvMzpPRuJOmfrJefdG8/7JdWX4bzJ2Q==",
-            "license": "MIT"
-        },
         "node_modules/brace-expansion": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
@@ -8657,22 +8199,6 @@
             "dev": true,
             "license": "ISC"
         },
-        "node_modules/cacache/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/call-bind": {
             "version": "1.0.7",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
@@ -8723,9 +8249,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001651",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
-            "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
+            "version": "1.0.30001657",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001657.tgz",
+            "integrity": "sha512-DPbJAlP8/BAXy3IgiWmZKItubb3TYGP0WscQQlVGIfT4s/YlFYVuJgyOsQNP7rJRChx/qdMeLJQJP0Sgg2yjNA==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -8742,6 +8268,22 @@
             ],
             "license": "CC-BY-4.0"
         },
+        "node_modules/canvas": {
+            "version": "2.11.2",
+            "resolved": "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz",
+            "integrity": "sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@mapbox/node-pre-gyp": "^1.0.0",
+                "nan": "^2.17.0",
+                "simple-get": "^3.0.3"
+            },
+            "engines": {
+                "node": ">=6"
+            }
+        },
         "node_modules/chalk": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -8801,7 +8343,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
             "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "engines": {
                 "node": ">=10"
@@ -8834,9 +8376,9 @@
             }
         },
         "node_modules/cjs-module-lexer": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-            "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.0.tgz",
+            "integrity": "sha512-N1NGmowPlGBLsOZLPvm48StN04V4YvQRL0i6b7ctrVY3epjP/ct7hFLOItz6pDIvRjwpfPxi52a2UWV2ziir8g==",
             "dev": true,
             "license": "MIT"
         },
@@ -9067,6 +8609,16 @@
             "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
             "license": "MIT"
         },
+        "node_modules/color-support": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "license": "ISC",
+            "optional": true,
+            "bin": {
+                "color-support": "bin.js"
+            }
+        },
         "node_modules/colorette": {
             "version": "2.0.20",
             "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
@@ -9146,7 +8698,7 @@
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
             "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT"
         },
         "node_modules/connect-history-api-fallback": {
@@ -9159,6 +8711,13 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/console-control-strings": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+            "license": "ISC",
+            "optional": true
+        },
         "node_modules/content-disposition": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -9277,57 +8836,10 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/copy-webpack-plugin/node_modules/globby": {
-            "version": "14.0.2",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
-            "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@sindresorhus/merge-streams": "^2.1.0",
-                "fast-glob": "^3.3.2",
-                "ignore": "^5.2.4",
-                "path-type": "^5.0.0",
-                "slash": "^5.1.0",
-                "unicorn-magic": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/copy-webpack-plugin/node_modules/path-type": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
-            "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/copy-webpack-plugin/node_modules/slash": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-            "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=14.16"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/core-js": {
-            "version": "3.38.0",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.0.tgz",
-            "integrity": "sha512-XPpwqEodRljce9KswjZShh95qJ1URisBeKCjUdq27YdenkslVe7OO0ZJhlYXAChW7OhXaRLl8AAba7IBfoIHug==",
+            "version": "3.38.1",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.38.1.tgz",
+            "integrity": "sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==",
             "hasInstallScript": true,
             "license": "MIT",
             "funding": {
@@ -9336,9 +8848,9 @@
             }
         },
         "node_modules/core-js-compat": {
-            "version": "3.38.0",
-            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.0.tgz",
-            "integrity": "sha512-75LAicdLa4OJVwFxFbQR3NdnZjNgX6ILpVcVzcC4T2smerB5lELMrJQQQoWV6TiuC/vlaFqgU2tKQx9w5s0e0A==",
+            "version": "3.38.1",
+            "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.38.1.tgz",
+            "integrity": "sha512-JRH6gfXxGmrzF3tZ57lFx97YARxCXPaMzPo6jELZhv88pBH5VXpQ+y0znKGlFnzuaihqhLbefxSJxWJMPtfDzw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10032,9 +9544,9 @@
             }
         },
         "node_modules/dayjs": {
-            "version": "1.11.12",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz",
-            "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==",
+            "version": "1.11.13",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
+            "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
             "license": "MIT"
         },
         "node_modules/debug": {
@@ -10061,6 +9573,19 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/decompress-response": {
+            "version": "4.2.1",
+            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
+            "integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "mimic-response": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/dedent": {
             "version": "1.5.3",
             "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
@@ -10190,6 +9715,13 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/delegates": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+            "license": "MIT",
+            "optional": true
+        },
         "node_modules/depd": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -10225,7 +9757,7 @@
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.3.tgz",
             "integrity": "sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==",
-            "dev": true,
+            "devOptional": true,
             "license": "Apache-2.0",
             "engines": {
                 "node": ">=8"
@@ -10259,9 +9791,9 @@
             }
         },
         "node_modules/diff-match-patch-typescript": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/diff-match-patch-typescript/-/diff-match-patch-typescript-1.0.8.tgz",
-            "integrity": "sha512-UPvsAUDje0DUOhx5V5jrXPe/5GHyBwZzS4myPFDM3Tbd/xJQyXbMkklc6aFqKBYzyhtdSMPD1CHHTDye/7cgow==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/diff-match-patch-typescript/-/diff-match-patch-typescript-1.1.0.tgz",
+            "integrity": "sha512-7WFVb3bRj5o+xRJtd1mLpbB9o19GE1FpY/v7z4GgMurmyaxZnuYdsEwn/K93ugn3nB+ce7KMn9hYjfAtXmUkVQ==",
             "license": "Apache-2.0"
         },
         "node_modules/diff-sequences": {
@@ -10287,6 +9819,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/dir-glob/node_modules/path-type": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/dns-packet": {
             "version": "5.6.1",
             "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
@@ -10365,48 +9907,12 @@
                 "url": "https://github.com/fb55/domutils?sponsor=1"
             }
         },
-        "node_modules/dotenv": {
-            "version": "16.4.5",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz",
-            "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==",
+        "node_modules/eastasianwidth": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
             "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://dotenvx.com"
-            }
-        },
-        "node_modules/dotenv-expand": {
-            "version": "11.0.6",
-            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz",
-            "integrity": "sha512-8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "dotenv": "^16.4.4"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://dotenvx.com"
-            }
-        },
-        "node_modules/duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/eastasianwidth": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-            "dev": true,
-            "license": "MIT"
+            "license": "MIT"
         },
         "node_modules/ee-first": {
             "version": "1.1.1",
@@ -10432,9 +9938,9 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.5",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz",
-            "integrity": "sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==",
+            "version": "1.5.15",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.15.tgz",
+            "integrity": "sha512-Z4rIDoImwEJW+YYKnPul4DzqsWVqYetYVN3XqDmRpgV0mjz0hYTaeeh+8/9CL1bk3AHYmF4freW/NTiVoXA2gA==",
             "license": "ISC"
         },
         "node_modules/emittery": {
@@ -10451,9 +9957,9 @@
             }
         },
         "node_modules/emoji-regex": {
-            "version": "10.3.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
-            "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==",
+            "version": "10.4.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
+            "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
             "dev": true,
             "license": "MIT"
         },
@@ -10502,16 +10008,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
         "node_modules/enhanced-resolve": {
             "version": "5.17.1",
             "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz",
@@ -10526,19 +10022,6 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/enquirer": {
-            "version": "2.3.6",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz",
-            "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-colors": "^4.1.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
         "node_modules/entities": {
             "version": "4.5.0",
             "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
@@ -10637,9 +10120,9 @@
             "license": "MIT"
         },
         "node_modules/esbuild": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
-            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.23.0.tgz",
+            "integrity": "sha512-1lvV17H2bMYda/WaFb2jLPeHU3zml2k4/yagNMG8Q/YtfMjCwEUZa2eXXMgZTVSL5q1n4H7sQ0X6CdJDqqeCFA==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -10647,51 +10130,52 @@
                 "esbuild": "bin/esbuild"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.21.5",
-                "@esbuild/android-arm": "0.21.5",
-                "@esbuild/android-arm64": "0.21.5",
-                "@esbuild/android-x64": "0.21.5",
-                "@esbuild/darwin-arm64": "0.21.5",
-                "@esbuild/darwin-x64": "0.21.5",
-                "@esbuild/freebsd-arm64": "0.21.5",
-                "@esbuild/freebsd-x64": "0.21.5",
-                "@esbuild/linux-arm": "0.21.5",
-                "@esbuild/linux-arm64": "0.21.5",
-                "@esbuild/linux-ia32": "0.21.5",
-                "@esbuild/linux-loong64": "0.21.5",
-                "@esbuild/linux-mips64el": "0.21.5",
-                "@esbuild/linux-ppc64": "0.21.5",
-                "@esbuild/linux-riscv64": "0.21.5",
-                "@esbuild/linux-s390x": "0.21.5",
-                "@esbuild/linux-x64": "0.21.5",
-                "@esbuild/netbsd-x64": "0.21.5",
-                "@esbuild/openbsd-x64": "0.21.5",
-                "@esbuild/sunos-x64": "0.21.5",
-                "@esbuild/win32-arm64": "0.21.5",
-                "@esbuild/win32-ia32": "0.21.5",
-                "@esbuild/win32-x64": "0.21.5"
+                "@esbuild/aix-ppc64": "0.23.0",
+                "@esbuild/android-arm": "0.23.0",
+                "@esbuild/android-arm64": "0.23.0",
+                "@esbuild/android-x64": "0.23.0",
+                "@esbuild/darwin-arm64": "0.23.0",
+                "@esbuild/darwin-x64": "0.23.0",
+                "@esbuild/freebsd-arm64": "0.23.0",
+                "@esbuild/freebsd-x64": "0.23.0",
+                "@esbuild/linux-arm": "0.23.0",
+                "@esbuild/linux-arm64": "0.23.0",
+                "@esbuild/linux-ia32": "0.23.0",
+                "@esbuild/linux-loong64": "0.23.0",
+                "@esbuild/linux-mips64el": "0.23.0",
+                "@esbuild/linux-ppc64": "0.23.0",
+                "@esbuild/linux-riscv64": "0.23.0",
+                "@esbuild/linux-s390x": "0.23.0",
+                "@esbuild/linux-x64": "0.23.0",
+                "@esbuild/netbsd-x64": "0.23.0",
+                "@esbuild/openbsd-arm64": "0.23.0",
+                "@esbuild/openbsd-x64": "0.23.0",
+                "@esbuild/sunos-x64": "0.23.0",
+                "@esbuild/win32-arm64": "0.23.0",
+                "@esbuild/win32-ia32": "0.23.0",
+                "@esbuild/win32-x64": "0.23.0"
             }
         },
         "node_modules/esbuild-wasm": {
-            "version": "0.21.5",
-            "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.21.5.tgz",
-            "integrity": "sha512-L/FlOPMMFtw+6qPAbuPvJXdrOYOp9yx/PEwSrIZW0qghY4vgV003evdYDwqQ/9ENMQI0B6RMod9xT4FHtto6OQ==",
+            "version": "0.23.0",
+            "resolved": "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.23.0.tgz",
+            "integrity": "sha512-6jP8UmWy6R6TUUV8bMuC3ZyZ6lZKI56x0tkxyCIqWwRRJ/DgeQKneh/Oid5EoGoPFLrGNkz47ZEtWAYuiY/u9g==",
             "dev": true,
             "license": "MIT",
             "bin": {
                 "esbuild": "bin/esbuild"
             },
             "engines": {
-                "node": ">=12"
+                "node": ">=18"
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
             "license": "MIT",
             "engines": {
                 "node": ">=6"
@@ -10714,17 +10198,17 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.9.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz",
-            "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==",
+            "version": "9.9.1",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.1.tgz",
+            "integrity": "sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.11.0",
-                "@eslint/config-array": "^0.17.1",
+                "@eslint/config-array": "^0.18.0",
                 "@eslint/eslintrc": "^3.1.0",
-                "@eslint/js": "9.9.0",
+                "@eslint/js": "9.9.1",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.3.0",
                 "@nodelib/fs.walk": "^1.2.8",
@@ -10904,26 +10388,41 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "node_modules/eslint-plugin-deprecation/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+        "node_modules/eslint-plugin-deprecation/node_modules/globby": {
+            "version": "11.1.0",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
             "dev": true,
-            "license": "ISC",
+            "license": "MIT",
             "dependencies": {
-                "brace-expansion": "^2.0.1"
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.9",
+                "ignore": "^5.2.0",
+                "merge2": "^1.4.1",
+                "slash": "^3.0.0"
             },
             "engines": {
-                "node": ">=16 || 14 >=14.17"
+                "node": ">=10"
             },
             "funding": {
-                "url": "https://github.com/sponsors/isaacs"
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint-plugin-deprecation/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
             }
         },
         "node_modules/eslint-plugin-jest": {
-            "version": "28.8.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.0.tgz",
-            "integrity": "sha512-Tubj1hooFxCl52G4qQu0edzV/+EZzPUeN8p2NnW5uu4fbDs+Yo7+qDVDc4/oG3FbCqEBmu/OC3LSsyiU22oghw==",
+            "version": "28.8.3",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-28.8.3.tgz",
+            "integrity": "sha512-HIQ3t9hASLKm2IhIOqnu+ifw7uLZkIlR7RYNv7fMcEi/p0CIiJmfriStQS2LDkgtY4nyLbIZAD+JL347Yc2ETQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11091,6 +10590,37 @@
                 "node": ">=4.0"
             }
         },
+        "node_modules/eslint-plugin-jest-extended/node_modules/globby": {
+            "version": "11.1.0",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-union": "^2.1.0",
+                "dir-glob": "^3.0.1",
+                "fast-glob": "^3.2.9",
+                "ignore": "^5.2.0",
+                "merge2": "^1.4.1",
+                "slash": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
+        "node_modules/eslint-plugin-jest-extended/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/eslint-plugin-prettier": {
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.1.tgz",
@@ -11507,9 +11037,9 @@
             "license": "Apache-2.0"
         },
         "node_modules/export-to-csv": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-1.3.0.tgz",
-            "integrity": "sha512-msPjbfozZdYzDghAEKmCVH5veMeKHNacplE6noXvGiA8AeV1qa/SOxp6JXDjF9R8Kf6v3ypI6jskiY19dkhZeA==",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/export-to-csv/-/export-to-csv-1.4.0.tgz",
+            "integrity": "sha512-6CX17Cu+rC2Fi2CyZ4CkgVG3hLl6BFsdAxfXiZkmDFIDY4mRx2y2spdeH6dqPHI9rP+AsHEfGeKz84Uuw7+Pmg==",
             "license": "MIT",
             "engines": {
                 "node": "^v12.20.0 || >=v14.13.0"
@@ -11594,19 +11124,6 @@
                 "node": ">=4"
             }
         },
-        "node_modules/external-editor/node_modules/tmp": {
-            "version": "0.0.33",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "os-tmpdir": "~1.0.2"
-            },
-            "engines": {
-                "node": ">=0.6.0"
-            }
-        },
         "node_modules/fast-deep-equal": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -11657,6 +11174,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/fast-uri": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz",
+            "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/fastq": {
             "version": "1.17.1",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
@@ -11694,22 +11218,6 @@
             "integrity": "sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==",
             "license": "MIT"
         },
-        "node_modules/figures": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-            "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "escape-string-regexp": "^1.0.5"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/file-entry-cache": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
@@ -11873,9 +11381,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.6",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+            "version": "1.15.8",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.8.tgz",
+            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
             "dev": true,
             "funding": [
                 {
@@ -11972,69 +11480,6 @@
                 "node": ">= 0.6"
             }
         },
-        "node_modules/front-matter": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz",
-            "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "js-yaml": "^3.13.1"
-            }
-        },
-        "node_modules/front-matter/node_modules/argparse": {
-            "version": "1.0.10",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-            "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "~1.0.2"
-            }
-        },
-        "node_modules/front-matter/node_modules/js-yaml": {
-            "version": "3.14.1",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-            "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "argparse": "^1.0.7",
-                "esprima": "^4.0.0"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/front-matter/node_modules/sprintf-js": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-            "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-            "dev": true,
-            "license": "BSD-3-Clause"
-        },
-        "node_modules/fs-constants": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-            "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/fs-extra": {
-            "version": "11.2.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
-            "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=14.14"
-            }
-        },
         "node_modules/fs-minipass": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
@@ -12052,7 +11497,7 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
             "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/fsevents": {
@@ -12079,6 +11524,67 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/gauge": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/gauge/-/gauge-3.0.2.tgz",
+            "integrity": "sha512-+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "optional": true,
+            "dependencies": {
+                "aproba": "^1.0.3 || ^2.0.0",
+                "color-support": "^1.1.2",
+                "console-control-strings": "^1.0.0",
+                "has-unicode": "^2.0.1",
+                "object-assign": "^4.1.1",
+                "signal-exit": "^3.0.0",
+                "string-width": "^4.2.3",
+                "strip-ansi": "^6.0.1",
+                "wide-align": "^1.1.2"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
+        "node_modules/gauge/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/gauge/node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/gauge/node_modules/signal-exit": {
+            "version": "3.0.7",
+            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+            "license": "ISC",
+            "optional": true
+        },
+        "node_modules/gauge/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -12175,7 +11681,7 @@
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
             "deprecated": "Glob versions prior to v9 are no longer supported",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "fs.realpath": "^1.0.0",
@@ -12215,7 +11721,7 @@
             "version": "1.1.11",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
             "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0",
@@ -12226,7 +11732,7 @@
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
             "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^1.1.7"
@@ -12245,21 +11751,21 @@
             }
         },
         "node_modules/globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+            "version": "14.0.2",
+            "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+            "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
+                "@sindresorhus/merge-streams": "^2.1.0",
+                "fast-glob": "^3.3.2",
+                "ignore": "^5.2.4",
+                "path-type": "^5.0.0",
+                "slash": "^5.1.0",
+                "unicorn-magic": "^0.1.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -12356,6 +11862,13 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/has-unicode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+            "license": "ISC",
+            "optional": true
+        },
         "node_modules/hasown": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -12618,9 +12131,9 @@
             }
         },
         "node_modules/husky": {
-            "version": "9.1.4",
-            "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.4.tgz",
-            "integrity": "sha512-bho94YyReb4JV7LYWRWxZ/xr6TtOTt8cMfmQ39MQYJ7f/YE268s3GdghGwi+y4zAeqewE5zYLvuhV0M0ijsDEA==",
+            "version": "9.1.5",
+            "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.5.tgz",
+            "integrity": "sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -12691,9 +12204,9 @@
             "license": "BSD-3-Clause"
         },
         "node_modules/ignore": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz",
-            "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==",
+            "version": "5.3.2",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+            "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -12871,7 +12384,7 @@
             "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
             "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
             "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "once": "^1.3.0",
@@ -12956,9 +12469,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.15.0",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz",
-            "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==",
+            "version": "2.15.1",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -13227,9 +12740,9 @@
             }
         },
         "node_modules/istanbul-lib-instrument": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.2.tgz",
-            "integrity": "sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+            "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
             "dev": true,
             "license": "BSD-3-Clause",
             "dependencies": {
@@ -13609,6 +13122,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-circus/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jest-circus/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13841,6 +13364,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-config/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jest-config/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14386,6 +13919,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-message-util/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jest-message-util/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14569,6 +14112,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-resolve/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jest-resolve/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -14809,6 +14362,16 @@
                 "node": ">=8"
             }
         },
+        "node_modules/jest-runtime/node_modules/slash": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/jest-runtime/node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -15427,19 +14990,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
         "node_modules/jsonparse": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -15528,9 +15078,9 @@
             }
         },
         "node_modules/launch-editor": {
-            "version": "2.8.1",
-            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.1.tgz",
-            "integrity": "sha512-elBx2l/tp9z99X5H/qev8uyDywVh0VXAwEbjk8kJhnc5grOFkGh7aW6q55me9xnYbss261XtnUrysZ+XvGbhQA==",
+            "version": "2.9.1",
+            "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.9.1.tgz",
+            "integrity": "sha512-Gcnl4Bd+hRO9P9icCP/RVVT2o8SFlPXofuCxvA2SaZuH45whSvf5p8x5oih5ftLiVhEI4sp5xDY+R+b3zJBh5w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -15683,19 +15233,16 @@
             }
         },
         "node_modules/lines-and-columns": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz",
-            "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==",
+            "version": "1.2.4",
+            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
             "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-            }
+            "license": "MIT"
         },
         "node_modules/lint-staged": {
-            "version": "15.2.8",
-            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.8.tgz",
-            "integrity": "sha512-PUWFf2zQzsd9EFU+kM1d7UP+AZDbKFKuj+9JNVTBkhUFhbg4MAt6WfyMMwBfM4lYqd4D2Jwac5iuTu9rVj4zCQ==",
+            "version": "15.2.10",
+            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-15.2.10.tgz",
+            "integrity": "sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -15705,7 +15252,7 @@
                 "execa": "~8.0.1",
                 "lilconfig": "~3.1.2",
                 "listr2": "~8.2.4",
-                "micromatch": "~4.0.7",
+                "micromatch": "~4.0.8",
                 "pidtree": "~0.6.0",
                 "string-argv": "~0.3.2",
                 "yaml": "~2.5.0"
@@ -15720,32 +15267,6 @@
                 "url": "https://opencollective.com/lint-staged"
             }
         },
-        "node_modules/lint-staged/node_modules/ansi-regex": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
-            "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
-            }
-        },
-        "node_modules/lint-staged/node_modules/ansi-styles": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/lint-staged/node_modules/chalk": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
@@ -15759,13 +15280,6 @@
                 "url": "https://github.com/chalk/chalk?sponsor=1"
             }
         },
-        "node_modules/lint-staged/node_modules/eventemitter3": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
-            "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/lint-staged/node_modules/execa": {
             "version": "8.0.1",
             "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz",
@@ -15826,24 +15340,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/lint-staged/node_modules/listr2": {
-            "version": "8.2.4",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
-            "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "cli-truncate": "^4.0.0",
-                "colorette": "^2.0.20",
-                "eventemitter3": "^5.0.1",
-                "log-update": "^6.1.0",
-                "rfdc": "^1.4.1",
-                "wrap-ansi": "^9.0.0"
-            },
-            "engines": {
-                "node": ">=18.0.0"
-            }
-        },
         "node_modules/lint-staged/node_modules/mimic-fn": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
@@ -15902,22 +15398,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/lint-staged/node_modules/strip-ansi": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-            }
-        },
         "node_modules/lint-staged/node_modules/strip-final-newline": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
@@ -15931,35 +15411,17 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/lint-staged/node_modules/wrap-ansi": {
-            "version": "9.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.0.tgz",
-            "integrity": "sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^6.2.1",
-                "string-width": "^7.0.0",
-                "strip-ansi": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=18"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
         "node_modules/listr2": {
-            "version": "8.2.3",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.3.tgz",
-            "integrity": "sha512-Lllokma2mtoniUOS94CcOErHWAug5iu7HOmDrvWgpw8jyQH2fomgB+7lZS4HWZxytUuQwkGOwe49FvwVaA85Xw==",
+            "version": "8.2.4",
+            "resolved": "https://registry.npmjs.org/listr2/-/listr2-8.2.4.tgz",
+            "integrity": "sha512-opevsywziHd3zHCVQGAj8zu+Z3yHNkkoYhWIGnq54RrCVwLz0MozotJEDnKsIBLvkfLGN6BLOyAeRrYI0pKA4g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "cli-truncate": "^4.0.0",
                 "colorette": "^2.0.20",
                 "eventemitter3": "^5.0.1",
-                "log-update": "^6.0.0",
+                "log-update": "^6.1.0",
                 "rfdc": "^1.4.1",
                 "wrap-ansi": "^9.0.0"
             },
@@ -16035,9 +15497,9 @@
             }
         },
         "node_modules/lmdb": {
-            "version": "3.0.12",
-            "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.12.tgz",
-            "integrity": "sha512-JnoEulTgveoC64vlYJ9sufGLuNkk6TcxSYpKxSC9aM42I61jIv3pQH0fgb6qW7HV0+FNqA3g1WCQQYfhfawGoQ==",
+            "version": "3.0.13",
+            "resolved": "https://registry.npmjs.org/lmdb/-/lmdb-3.0.13.tgz",
+            "integrity": "sha512-UGe+BbaSUQtAMZobTb4nHvFMrmvuAQKSeaqAX2meTEQjfsbpl5sxdHD8T72OnwD4GU9uwNhYXIVe4QGs8N9Zyw==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -16052,12 +15514,12 @@
                 "download-lmdb-prebuilds": "bin/download-prebuilds.js"
             },
             "optionalDependencies": {
-                "@lmdb/lmdb-darwin-arm64": "3.0.12",
-                "@lmdb/lmdb-darwin-x64": "3.0.12",
-                "@lmdb/lmdb-linux-arm": "3.0.12",
-                "@lmdb/lmdb-linux-arm64": "3.0.12",
-                "@lmdb/lmdb-linux-x64": "3.0.12",
-                "@lmdb/lmdb-win32-x64": "3.0.12"
+                "@lmdb/lmdb-darwin-arm64": "3.0.13",
+                "@lmdb/lmdb-darwin-x64": "3.0.13",
+                "@lmdb/lmdb-linux-arm": "3.0.13",
+                "@lmdb/lmdb-linux-arm64": "3.0.13",
+                "@lmdb/lmdb-linux-x64": "3.0.13",
+                "@lmdb/lmdb-win32-x64": "3.0.13"
             }
         },
         "node_modules/loader-runner": {
@@ -16373,13 +15835,13 @@
             }
         },
         "node_modules/magic-string": {
-            "version": "0.30.10",
-            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
-            "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
+            "version": "0.30.11",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz",
+            "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@jridgewell/sourcemap-codec": "^1.4.15"
+                "@jridgewell/sourcemap-codec": "^1.5.0"
             }
         },
         "node_modules/make-dir": {
@@ -16509,9 +15971,9 @@
             }
         },
         "node_modules/micromatch": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
-            "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
+            "version": "4.0.8",
+            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+            "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
             "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
@@ -16592,6 +16054,19 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/mimic-response": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
+            "integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=8"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
+        },
         "node_modules/mini-css-extract-plugin": {
             "version": "2.9.0",
             "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.0.tgz",
@@ -16621,9 +16096,9 @@
             "license": "ISC"
         },
         "node_modules/minimatch": {
-            "version": "9.0.3",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
-            "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -16790,7 +16265,7 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
             "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "minipass": "^3.0.0",
@@ -16804,7 +16279,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
@@ -16817,14 +16292,14 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/mkdirp": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
             "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "bin": {
                 "mkdirp": "bin/cmd.js"
@@ -16840,9 +16315,9 @@
             "license": "MIT"
         },
         "node_modules/monaco-editor": {
-            "version": "0.50.0",
-            "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz",
-            "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==",
+            "version": "0.51.0",
+            "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.51.0.tgz",
+            "integrity": "sha512-xaGwVV1fq343cM7aOYB6lVE4Ugf0UyimdD/x5PWcWBMKENwectaEu77FAN7c5sFiyumqeJdX1RPTh1ocioyDjw==",
             "license": "MIT"
         },
         "node_modules/moo-color": {
@@ -16945,6 +16420,13 @@
                 "url": "https://github.com/sponsors/wooorm"
             }
         },
+        "node_modules/nan": {
+            "version": "2.20.0",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
+            "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+            "license": "MIT",
+            "optional": true
+        },
         "node_modules/nanoid": {
             "version": "3.3.7",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
@@ -17021,9 +16503,9 @@
             "license": "MIT"
         },
         "node_modules/ng-mocks": {
-            "version": "14.13.0",
-            "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.0.tgz",
-            "integrity": "sha512-cQ6nUj/P+v7X52gYU6bAj/03iDKl2pzbPy2V0tx/d5lxME063Vxc190p6UPlJkbRIxcB+OqSALPgQvy83efzjw==",
+            "version": "14.13.1",
+            "resolved": "https://registry.npmjs.org/ng-mocks/-/ng-mocks-14.13.1.tgz",
+            "integrity": "sha512-eyfnjXeC108SqVD09i/cBwCpKkK0JjBoAg8jp7oQS2HS081K3WJTttFpgLGeLDYKmZsZ6nYpI+HHNQ3OksaJ7A==",
             "dev": true,
             "license": "MIT",
             "funding": {
@@ -17093,6 +16575,52 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/node-fetch": {
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+            "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "whatwg-url": "^5.0.0"
+            },
+            "engines": {
+                "node": "4.x || >=6.0.0"
+            },
+            "peerDependencies": {
+                "encoding": "^0.1.0"
+            },
+            "peerDependenciesMeta": {
+                "encoding": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/node-fetch/node_modules/tr46": {
+            "version": "0.0.3",
+            "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+            "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/node-fetch/node_modules/webidl-conversions": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+            "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+            "license": "BSD-2-Clause",
+            "optional": true
+        },
+        "node_modules/node-fetch/node_modules/whatwg-url": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+            "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tr46": "~0.0.3",
+                "webidl-conversions": "^3.0.0"
+            }
+        },
         "node_modules/node-forge": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
@@ -17129,9 +16657,9 @@
             }
         },
         "node_modules/node-gyp-build": {
-            "version": "4.8.1",
-            "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.1.tgz",
-            "integrity": "sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==",
+            "version": "4.8.2",
+            "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.2.tgz",
+            "integrity": "sha512-IRUxE4BVsHWXkV/SFOut4qTlagw2aM8T5/vnTsmrHJvVoKueJHRc/JaFND7QDDc61kLYUJ6qlZM3sqTSyx2dTw==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -17186,22 +16714,6 @@
                 "node": ">=16"
             }
         },
-        "node_modules/node-gyp/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/node-gyp/node_modules/which": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz",
@@ -17225,13 +16737,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/node-machine-id": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz",
-            "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/node-releases": {
             "version": "2.0.18",
             "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
@@ -17325,9 +16830,9 @@
             }
         },
         "node_modules/npm-package-arg": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.2.tgz",
-            "integrity": "sha512-IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==",
+            "version": "11.0.3",
+            "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
+            "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -17354,9 +16859,9 @@
             }
         },
         "node_modules/npm-pick-manifest": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.0.1.tgz",
-            "integrity": "sha512-Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw==",
+            "version": "9.1.0",
+            "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz",
+            "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
@@ -17402,6 +16907,20 @@
                 "node": ">=8"
             }
         },
+        "node_modules/npmlog": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-5.0.1.tgz",
+            "integrity": "sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==",
+            "deprecated": "This package is no longer supported.",
+            "license": "ISC",
+            "optional": true,
+            "dependencies": {
+                "are-we-there-yet": "^2.0.0",
+                "console-control-strings": "^1.1.0",
+                "gauge": "^3.0.0",
+                "set-blocking": "^2.0.0"
+            }
+        },
         "node_modules/nth-check": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
@@ -17422,321 +16941,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/nx": {
-            "version": "19.5.7",
-            "resolved": "https://registry.npmjs.org/nx/-/nx-19.5.7.tgz",
-            "integrity": "sha512-AUmGgE19NB4m/7oHYQVdzZHtclVevD8w0/nNzzjDJE823T8oeoNhmc9MfCLz+/2l2KOp+Wqm+8LiG9/xWpXk0g==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "dependencies": {
-                "@napi-rs/wasm-runtime": "0.2.4",
-                "@nrwl/tao": "19.5.7",
-                "@yarnpkg/lockfile": "^1.1.0",
-                "@yarnpkg/parsers": "3.0.0-rc.46",
-                "@zkochan/js-yaml": "0.0.7",
-                "axios": "^1.7.2",
-                "chalk": "^4.1.0",
-                "cli-cursor": "3.1.0",
-                "cli-spinners": "2.6.1",
-                "cliui": "^8.0.1",
-                "dotenv": "~16.4.5",
-                "dotenv-expand": "~11.0.6",
-                "enquirer": "~2.3.6",
-                "figures": "3.2.0",
-                "flat": "^5.0.2",
-                "front-matter": "^4.0.2",
-                "fs-extra": "^11.1.0",
-                "ignore": "^5.0.4",
-                "jest-diff": "^29.4.1",
-                "jsonc-parser": "3.2.0",
-                "lines-and-columns": "~2.0.3",
-                "minimatch": "9.0.3",
-                "node-machine-id": "1.1.12",
-                "npm-run-path": "^4.0.1",
-                "open": "^8.4.0",
-                "ora": "5.3.0",
-                "semver": "^7.5.3",
-                "string-width": "^4.2.3",
-                "strong-log-transformer": "^2.1.0",
-                "tar-stream": "~2.2.0",
-                "tmp": "~0.2.1",
-                "tsconfig-paths": "^4.1.2",
-                "tslib": "^2.3.0",
-                "yargs": "^17.6.2",
-                "yargs-parser": "21.1.1"
-            },
-            "bin": {
-                "nx": "bin/nx.js",
-                "nx-cloud": "bin/nx-cloud.js"
-            },
-            "optionalDependencies": {
-                "@nx/nx-darwin-arm64": "19.5.7",
-                "@nx/nx-darwin-x64": "19.5.7",
-                "@nx/nx-freebsd-x64": "19.5.7",
-                "@nx/nx-linux-arm-gnueabihf": "19.5.7",
-                "@nx/nx-linux-arm64-gnu": "19.5.7",
-                "@nx/nx-linux-arm64-musl": "19.5.7",
-                "@nx/nx-linux-x64-gnu": "19.5.7",
-                "@nx/nx-linux-x64-musl": "19.5.7",
-                "@nx/nx-win32-arm64-msvc": "19.5.7",
-                "@nx/nx-win32-x64-msvc": "19.5.7"
-            },
-            "peerDependencies": {
-                "@swc-node/register": "^1.8.0",
-                "@swc/core": "^1.3.85"
-            },
-            "peerDependenciesMeta": {
-                "@swc-node/register": {
-                    "optional": true
-                },
-                "@swc/core": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/nx/node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/nx/node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/nx/node_modules/cli-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "restore-cursor": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/cli-spinners": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz",
-            "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/nx/node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/nx/node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/nx/node_modules/define-lazy-prop": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-            "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/nx/node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/is-docker": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-            "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "is-docker": "cli.js"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/nx/node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/is-wsl": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-            "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "is-docker": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/jsonc-parser": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-            "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/nx/node_modules/open": {
-            "version": "8.4.2",
-            "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-            "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "define-lazy-prop": "^2.0.0",
-                "is-docker": "^2.1.1",
-                "is-wsl": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/nx/node_modules/ora": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz",
-            "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "bl": "^4.0.3",
-                "chalk": "^4.1.0",
-                "cli-cursor": "^3.1.0",
-                "cli-spinners": "^2.5.0",
-                "is-interactive": "^1.0.0",
-                "log-symbols": "^4.0.0",
-                "strip-ansi": "^6.0.0",
-                "wcwidth": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/nx/node_modules/restore-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true,
-            "license": "ISC"
-        },
-        "node_modules/nx/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/nx/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/object-assign": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -17793,7 +16997,7 @@
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
             "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "wrappy": "1"
@@ -18179,13 +17383,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/parse-json/node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/parse-node-version": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
@@ -18261,7 +17458,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
             "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-            "dev": true,
+            "devOptional": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
@@ -18316,25 +17513,51 @@
             "license": "MIT"
         },
         "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+            "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=8"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/pepjs": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.5.3.tgz",
-            "integrity": "sha512-5yHVB9OHqKd9fr/OIsn8ss0NgThQ9buaqrEuwr9Or5YjPp6h+WTDKWZI+xZLaBGZCtODTnFtlSHNmhFsq67THg==",
-            "license": "MIT"
+        "node_modules/path2d": {
+            "version": "0.2.1",
+            "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.1.tgz",
+            "integrity": "sha512-Fl2z/BHvkTNvkuBzYTpTuirHZg6wW9z8+4SND/3mDTEcYbbNKWAy21dz9D3ePNNwrrK8pqZO5vLPZ1hLF6T7XA==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "node_modules/picocolors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+        "node_modules/pdfjs-dist": {
+            "version": "4.6.82",
+            "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.6.82.tgz",
+            "integrity": "sha512-BUOryeRFwvbLe0lOU6NhkJNuVQUp06WxlJVVCsxdmJ4y5cU3O3s3/0DunVdK1PMm7v2MUw52qKYaidhDH1Z9+w==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18"
+            },
+            "optionalDependencies": {
+                "canvas": "^2.11.2",
+                "path2d": "^0.2.1"
+            }
+        },
+        "node_modules/pepjs": {
+            "version": "0.5.3",
+            "resolved": "https://registry.npmjs.org/pepjs/-/pepjs-0.5.3.tgz",
+            "integrity": "sha512-5yHVB9OHqKd9fr/OIsn8ss0NgThQ9buaqrEuwr9Or5YjPp6h+WTDKWZI+xZLaBGZCtODTnFtlSHNmhFsq67THg==",
+            "license": "MIT"
+        },
+        "node_modules/picocolors": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
             "license": "ISC"
         },
         "node_modules/picomatch": {
@@ -18499,9 +17722,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.40",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
-            "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+            "version": "8.4.41",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+            "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
             "dev": true,
             "funding": [
                 {
@@ -18630,9 +17853,9 @@
             }
         },
         "node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -18650,9 +17873,9 @@
             "license": "MIT"
         },
         "node_modules/posthog-js": {
-            "version": "1.155.0",
-            "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.155.0.tgz",
-            "integrity": "sha512-gxi72Qcp7Vnq6efe5gNxsq84zyEFd33NUmoLSgcbMPhxU30qgc89Aw/N2mRB4mGrD3Mq0rCnDJUzGFdN59nR0g==",
+            "version": "1.160.3",
+            "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.160.3.tgz",
+            "integrity": "sha512-mGvxOIlWPtdPx8EI0MQ81wNKlnH2K0n4RqwQOl044b34BCKiFVzZ7Hc7geMuZNaRAvCi5/5zyGeWHcAYZQxiMQ==",
             "license": "MIT",
             "dependencies": {
                 "fflate": "^0.4.8",
@@ -18661,9 +17884,9 @@
             }
         },
         "node_modules/preact": {
-            "version": "10.23.1",
-            "resolved": "https://registry.npmjs.org/preact/-/preact-10.23.1.tgz",
-            "integrity": "sha512-O5UdRsNh4vdZaTieWe3XOgSpdMAmkIYBCT3VhQDlKrzyCm8lUYsk0fmVEvoQQifoOjFRTaHZO69ylrzTW2BH+A==",
+            "version": "10.23.2",
+            "resolved": "https://registry.npmjs.org/preact/-/preact-10.23.2.tgz",
+            "integrity": "sha512-kKYfePf9rzKnxOAKDpsWhg/ysrHPqT+yQ7UW4JjdnqjFIeNUnNcEJvhuA8fDenxAGWzUqtd51DfVg7xp/8T9NA==",
             "license": "MIT",
             "funding": {
                 "type": "opencollective",
@@ -18829,13 +18052,6 @@
                 "node": ">= 0.10"
             }
         },
-        "node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -19438,62 +18654,115 @@
             "license": "MIT"
         },
         "node_modules/rimraf": {
-            "version": "5.0.10",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz",
-            "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
+            "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
-                "glob": "^10.3.7"
+                "glob": "^11.0.0",
+                "package-json-from-dist": "^1.0.0"
             },
             "bin": {
                 "rimraf": "dist/esm/bin.mjs"
             },
+            "engines": {
+                "node": "20 || >=22"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/rimraf/node_modules/glob": {
-            "version": "10.4.5",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+            "version": "11.0.0",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz",
+            "integrity": "sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
                 "foreground-child": "^3.1.0",
-                "jackspeak": "^3.1.2",
-                "minimatch": "^9.0.4",
+                "jackspeak": "^4.0.1",
+                "minimatch": "^10.0.0",
                 "minipass": "^7.1.2",
                 "package-json-from-dist": "^1.0.0",
-                "path-scurry": "^1.11.1"
+                "path-scurry": "^2.0.0"
             },
             "bin": {
                 "glob": "dist/esm/bin.mjs"
             },
+            "engines": {
+                "node": "20 || >=22"
+            },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
+        "node_modules/rimraf/node_modules/jackspeak": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz",
+            "integrity": "sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "@isaacs/cliui": "^8.0.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            },
+            "optionalDependencies": {
+                "@pkgjs/parseargs": "^0.11.0"
+            }
+        },
+        "node_modules/rimraf/node_modules/lru-cache": {
+            "version": "11.0.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz",
+            "integrity": "sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "20 || >=22"
+            }
+        },
         "node_modules/rimraf/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+            "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
             "engines": {
-                "node": ">=16 || 14 >=14.17"
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/rimraf/node_modules/path-scurry": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
+            "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
+            "dev": true,
+            "license": "BlueOak-1.0.0",
+            "dependencies": {
+                "lru-cache": "^11.0.0",
+                "minipass": "^7.1.2"
+            },
+            "engines": {
+                "node": "20 || >=22"
             },
             "funding": {
                 "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/rollup": {
-            "version": "4.18.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz",
-            "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==",
+            "version": "4.20.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz",
+            "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -19507,22 +18776,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.18.0",
-                "@rollup/rollup-android-arm64": "4.18.0",
-                "@rollup/rollup-darwin-arm64": "4.18.0",
-                "@rollup/rollup-darwin-x64": "4.18.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.18.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.18.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.18.0",
-                "@rollup/rollup-linux-arm64-musl": "4.18.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.18.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.18.0",
-                "@rollup/rollup-linux-x64-gnu": "4.18.0",
-                "@rollup/rollup-linux-x64-musl": "4.18.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.18.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.18.0",
-                "@rollup/rollup-win32-x64-msvc": "4.18.0",
+                "@rollup/rollup-android-arm-eabi": "4.20.0",
+                "@rollup/rollup-android-arm64": "4.20.0",
+                "@rollup/rollup-darwin-arm64": "4.20.0",
+                "@rollup/rollup-darwin-x64": "4.20.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.20.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.20.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.20.0",
+                "@rollup/rollup-linux-arm64-musl": "4.20.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.20.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.20.0",
+                "@rollup/rollup-linux-x64-gnu": "4.20.0",
+                "@rollup/rollup-linux-x64-musl": "4.20.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.20.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.20.0",
+                "@rollup/rollup-win32-x64-msvc": "4.20.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -19592,9 +18861,9 @@
             "license": "MIT"
         },
         "node_modules/sass": {
-            "version": "1.77.8",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz",
-            "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==",
+            "version": "1.78.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.78.0.tgz",
+            "integrity": "sha512-AaIqGSrjo5lA2Yg7RvFZrlXDBCp3nV4XP73GrLGvdRWWwk+8H3l0SDvq/5bA4eF+0RFPLuWUk3E+P1U/YqnpsQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -19610,9 +18879,9 @@
             }
         },
         "node_modules/sass-loader": {
-            "version": "14.2.1",
-            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-14.2.1.tgz",
-            "integrity": "sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==",
+            "version": "16.0.0",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz",
+            "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -19878,6 +19147,13 @@
                 "node": ">= 0.8.0"
             }
         },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "license": "ISC",
+            "optional": true
+        },
         "node_modules/set-function-length": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
@@ -20073,10 +19349,43 @@
                 "node": "^16.14.0 || >=18.0.0"
             }
         },
+        "node_modules/simple-concat": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
+            "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/simple-get": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.1.tgz",
+            "integrity": "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "decompress-response": "^4.2.0",
+                "once": "^1.3.1",
+                "simple-concat": "^1.0.0"
+            }
+        },
         "node_modules/simple-statistics": {
-            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-7.8.3.tgz",
-            "integrity": "sha512-JFvMY00t6SBGtwMuJ+nqgsx9ylkMiJ5JlK9bkj8AdvniIe5615wWQYkKHXe84XtSuc40G/tlrPu0A5/NlJvv8A==",
+            "version": "7.8.5",
+            "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-7.8.5.tgz",
+            "integrity": "sha512-yw4aOnkvPLbL80zamrEKznAnk5cIIkjEcx/z0aQl+m/YKMmVufrnWgWJWRspqZtwh+ElZXRhJ0MtnUjFUQV5Ow==",
             "license": "ISC",
             "engines": {
                 "node": "*"
@@ -20090,13 +19399,16 @@
             "license": "MIT"
         },
         "node_modules/slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+            "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=8"
+                "node": ">=14.16"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/slice-ansi": {
@@ -20322,9 +19634,9 @@
             }
         },
         "node_modules/spdx-license-ids": {
-            "version": "3.0.18",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz",
-            "integrity": "sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==",
+            "version": "3.0.20",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
+            "integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
             "dev": true,
             "license": "CC0-1.0"
         },
@@ -20606,24 +19918,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/strong-log-transformer": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz",
-            "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "duplexer": "^0.1.1",
-                "minimist": "^1.2.0",
-                "through": "^2.3.4"
-            },
-            "bin": {
-                "sl-log-transformer": "bin/sl-log-transformer.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/styled-components": {
             "version": "5.3.11",
             "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz",
@@ -20727,7 +20021,7 @@
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
             "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "chownr": "^2.0.0",
@@ -20741,43 +20035,11 @@
                 "node": ">=10"
             }
         },
-        "node_modules/tar-stream": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz",
-            "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "bl": "^4.0.3",
-                "end-of-stream": "^1.4.1",
-                "fs-constants": "^1.0.0",
-                "inherits": "^2.0.3",
-                "readable-stream": "^3.1.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/tar-stream/node_modules/readable-stream": {
-            "version": "3.6.2",
-            "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-            "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "inherits": "^2.0.3",
-                "string_decoder": "^1.1.1",
-                "util-deprecate": "^1.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/tar/node_modules/fs-minipass": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
             "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "minipass": "^3.0.0"
@@ -20790,7 +20052,7 @@
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
             "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "dependencies": {
                 "yallist": "^4.0.0"
@@ -20803,7 +20065,7 @@
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
             "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC",
             "engines": {
                 "node": ">=8"
@@ -20813,13 +20075,13 @@
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
             "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/terser": {
-            "version": "5.29.2",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.29.2.tgz",
-            "integrity": "sha512-ZiGkhUBIM+7LwkNjXYJq8svgkd+QK3UUr0wJqY4MieaezBSAIPgbSPZyIx0idM6XWK5CMzSWa8MJIzmRcB8Caw==",
+            "version": "5.31.6",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz",
+            "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -21030,13 +20292,6 @@
                 "tslib": "^2"
             }
         },
-        "node_modules/through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/thunky": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
@@ -21051,13 +20306,16 @@
             "license": "MIT"
         },
         "node_modules/tmp": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
-            "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==",
+            "version": "0.0.33",
+            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+            "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "os-tmpdir": "~1.0.2"
+            },
             "engines": {
-                "node": ">=14.14"
+                "node": ">=0.6.0"
             }
         },
         "node_modules/tmpl": {
@@ -21114,16 +20372,6 @@
                 "node": ">=6"
             }
         },
-        "node_modules/tough-cookie/node_modules/universalify": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
         "node_modules/tr46": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz",
@@ -21207,21 +20455,21 @@
             }
         },
         "node_modules/ts-jest": {
-            "version": "29.2.4",
-            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.4.tgz",
-            "integrity": "sha512-3d6tgDyhCI29HlpwIq87sNuI+3Q6GLTTCeYRHCs7vDz+/3GCMwEtV9jezLyl4ZtnBgx00I7hm8PCP8cTksMGrw==",
+            "version": "29.2.5",
+            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.2.5.tgz",
+            "integrity": "sha512-KD8zB2aAZrcKIdGk4OwpJggeLcH1FgrICqDSROWqlnJXGCXK4Mn6FcdK2B6670Xr73lHMG1kHw8R87A0ecZ+vA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "bs-logger": "0.x",
+                "bs-logger": "^0.2.6",
                 "ejs": "^3.1.10",
-                "fast-json-stable-stringify": "2.x",
+                "fast-json-stable-stringify": "^2.1.0",
                 "jest-util": "^29.0.0",
                 "json5": "^2.2.3",
-                "lodash.memoize": "4.x",
-                "make-error": "1.x",
-                "semver": "^7.5.3",
-                "yargs-parser": "^21.0.1"
+                "lodash.memoize": "^4.1.2",
+                "make-error": "^1.3.6",
+                "semver": "^7.6.3",
+                "yargs-parser": "^21.1.1"
             },
             "bin": {
                 "ts-jest": "cli.js"
@@ -21325,9 +20573,9 @@
             }
         },
         "node_modules/tslib": {
-            "version": "2.6.3",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-            "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz",
+            "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==",
             "license": "0BSD"
         },
         "node_modules/tsutils": {
@@ -21462,20 +20710,10 @@
                 "typescript-compare": "^0.0.2"
             }
         },
-        "node_modules/undici": {
-            "version": "6.19.5",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.19.5.tgz",
-            "integrity": "sha512-LryC15SWzqQsREHIOUybavaIHF5IoL0dJ9aWWxL/PgT1KfqAW5225FZpDUFlt9xiDMS2/S7DOKhFWA7RLksWdg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.17"
-            }
-        },
         "node_modules/undici-types": {
-            "version": "6.13.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz",
-            "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==",
+            "version": "6.19.8",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+            "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
             "dev": true,
             "license": "MIT"
         },
@@ -21563,13 +20801,13 @@
             }
         },
         "node_modules/universalify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">= 10.0.0"
+                "node": ">= 4.0.0"
             }
         },
         "node_modules/unpipe": {
@@ -21654,136 +20892,570 @@
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">= 0.4.0"
+                "node": ">= 0.4.0"
+            }
+        },
+        "node_modules/uuid": {
+            "version": "10.0.0",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+            "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
+            "funding": [
+                "https://github.com/sponsors/broofa",
+                "https://github.com/sponsors/ctavan"
+            ],
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
+        },
+        "node_modules/v8-compile-cache-lib": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/v8-to-istanbul": {
+            "version": "9.3.0",
+            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
+            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "@jridgewell/trace-mapping": "^0.3.12",
+                "@types/istanbul-lib-coverage": "^2.0.1",
+                "convert-source-map": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.12.0"
+            }
+        },
+        "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/validate-npm-package-license": {
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "spdx-correct": "^3.0.0",
+                "spdx-expression-parse": "^3.0.0"
+            }
+        },
+        "node_modules/validate-npm-package-name": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
+            "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+            }
+        },
+        "node_modules/vary": {
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
+        },
+        "node_modules/vite": {
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
+            "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "esbuild": "^0.21.3",
+                "postcss": "^8.4.40",
+                "rollup": "^4.13.0"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^18.0.0 || >=20.0.0",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "sass-embedded": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.4.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "aix"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz",
+            "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz",
+            "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/android-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz",
+            "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz",
+            "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz",
+            "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz",
+            "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz",
+            "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-arm": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz",
+            "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz",
+            "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz",
+            "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz",
+            "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz",
+            "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==",
+            "cpu": [
+                "mips64el"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz",
+            "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz",
+            "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz",
+            "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "node_modules/uuid": {
-            "version": "10.0.0",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-            "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-            "funding": [
-                "https://github.com/sponsors/broofa",
-                "https://github.com/sponsors/ctavan"
+        "node_modules/vite/node_modules/@esbuild/linux-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz",
+            "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==",
+            "cpu": [
+                "x64"
             ],
+            "dev": true,
             "license": "MIT",
-            "bin": {
-                "uuid": "dist/bin/uuid"
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "node_modules/v8-compile-cache-lib": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+        "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "netbsd"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "node_modules/v8-to-istanbul": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
-            "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
+        "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz",
+            "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "@jridgewell/trace-mapping": "^0.3.12",
-                "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^2.0.0"
-            },
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openbsd"
+            ],
             "engines": {
-                "node": ">=10.12.0"
+                "node": ">=12"
             }
         },
-        "node_modules/v8-to-istanbul/node_modules/convert-source-map": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+        "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz",
+            "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "sunos"
+            ],
+            "engines": {
+                "node": ">=12"
+            }
         },
-        "node_modules/validate-npm-package-license": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+        "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz",
+            "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==",
+            "cpu": [
+                "arm64"
+            ],
             "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "spdx-correct": "^3.0.0",
-                "spdx-expression-parse": "^3.0.0"
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=12"
             }
         },
-        "node_modules/validate-npm-package-name": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
-            "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==",
+        "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz",
+            "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==",
+            "cpu": [
+                "ia32"
+            ],
             "dev": true,
-            "license": "ISC",
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
             "engines": {
-                "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+                "node": ">=12"
             }
         },
-        "node_modules/vary": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+        "node_modules/vite/node_modules/@esbuild/win32-x64": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz",
+            "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==",
+            "cpu": [
+                "x64"
+            ],
             "dev": true,
             "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
             "engines": {
-                "node": ">= 0.8"
+                "node": ">=12"
             }
         },
-        "node_modules/vite": {
-            "version": "5.3.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
-            "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
+        "node_modules/vite/node_modules/esbuild": {
+            "version": "0.21.5",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz",
+            "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==",
             "dev": true,
+            "hasInstallScript": true,
             "license": "MIT",
-            "dependencies": {
-                "esbuild": "^0.21.3",
-                "postcss": "^8.4.39",
-                "rollup": "^4.13.0"
-            },
             "bin": {
-                "vite": "bin/vite.js"
+                "esbuild": "bin/esbuild"
             },
             "engines": {
-                "node": "^18.0.0 || >=20.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/vitejs/vite?sponsor=1"
+                "node": ">=12"
             },
             "optionalDependencies": {
-                "fsevents": "~2.3.3"
-            },
-            "peerDependencies": {
-                "@types/node": "^18.0.0 || >=20.0.0",
-                "less": "*",
-                "lightningcss": "^1.21.0",
-                "sass": "*",
-                "stylus": "*",
-                "sugarss": "*",
-                "terser": "^5.4.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/node": {
-                    "optional": true
-                },
-                "less": {
-                    "optional": true
-                },
-                "lightningcss": {
-                    "optional": true
-                },
-                "sass": {
-                    "optional": true
-                },
-                "stylus": {
-                    "optional": true
-                },
-                "sugarss": {
-                    "optional": true
-                },
-                "terser": {
-                    "optional": true
-                }
+                "@esbuild/aix-ppc64": "0.21.5",
+                "@esbuild/android-arm": "0.21.5",
+                "@esbuild/android-arm64": "0.21.5",
+                "@esbuild/android-x64": "0.21.5",
+                "@esbuild/darwin-arm64": "0.21.5",
+                "@esbuild/darwin-x64": "0.21.5",
+                "@esbuild/freebsd-arm64": "0.21.5",
+                "@esbuild/freebsd-x64": "0.21.5",
+                "@esbuild/linux-arm": "0.21.5",
+                "@esbuild/linux-arm64": "0.21.5",
+                "@esbuild/linux-ia32": "0.21.5",
+                "@esbuild/linux-loong64": "0.21.5",
+                "@esbuild/linux-mips64el": "0.21.5",
+                "@esbuild/linux-ppc64": "0.21.5",
+                "@esbuild/linux-riscv64": "0.21.5",
+                "@esbuild/linux-s390x": "0.21.5",
+                "@esbuild/linux-x64": "0.21.5",
+                "@esbuild/netbsd-x64": "0.21.5",
+                "@esbuild/openbsd-x64": "0.21.5",
+                "@esbuild/sunos-x64": "0.21.5",
+                "@esbuild/win32-arm64": "0.21.5",
+                "@esbuild/win32-ia32": "0.21.5",
+                "@esbuild/win32-x64": "0.21.5"
             }
         },
         "node_modules/w3c-xmlserializer": {
@@ -21924,13 +21596,12 @@
             }
         },
         "node_modules/webpack": {
-            "version": "5.92.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
-            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
+            "version": "5.94.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz",
+            "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/eslint-scope": "^3.7.3",
                 "@types/estree": "^1.0.5",
                 "@webassemblyjs/ast": "^1.12.1",
                 "@webassemblyjs/wasm-edit": "^1.12.1",
@@ -21939,7 +21610,7 @@
                 "acorn-import-attributes": "^1.9.5",
                 "browserslist": "^4.21.10",
                 "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.17.0",
+                "enhanced-resolve": "^5.17.1",
                 "es-module-lexer": "^1.2.1",
                 "eslint-scope": "5.1.1",
                 "events": "^3.2.0",
@@ -21972,9 +21643,9 @@
             }
         },
         "node_modules/webpack-dev-middleware": {
-            "version": "7.3.0",
-            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz",
-            "integrity": "sha512-xD2qnNew+F6KwOGZR7kWdbIou/ud7cVqLEXeK1q0nHcNsX/u7ul/fSdlOTX4ntSL5FNFy7ZJJXbf0piF591JYw==",
+            "version": "7.4.2",
+            "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.4.2.tgz",
+            "integrity": "sha512-xOO8n6eggxnwYpy1NlzUKpvrjfJTvae5/D6WOK0S2LSo7vjmo5gCM1DbLUmFqrMTJP+W/0YZNctm7jasWvLuBA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -22087,18 +21758,18 @@
             }
         },
         "node_modules/webpack-merge": {
-            "version": "5.10.0",
-            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
-            "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
+            "version": "6.0.1",
+            "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-6.0.1.tgz",
+            "integrity": "sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "clone-deep": "^4.0.1",
                 "flat": "^5.0.2",
-                "wildcard": "^2.0.0"
+                "wildcard": "^2.0.1"
             },
             "engines": {
-                "node": ">=10.0.0"
+                "node": ">=18.0.0"
             }
         },
         "node_modules/webpack-sources": {
@@ -22312,6 +21983,48 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/wide-align": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+            "license": "ISC",
+            "optional": true,
+            "dependencies": {
+                "string-width": "^1.0.2 || 2 || 3 || 4"
+            }
+        },
+        "node_modules/wide-align/node_modules/emoji-regex": {
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "license": "MIT",
+            "optional": true
+        },
+        "node_modules/wide-align/node_modules/is-fullwidth-code-point": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "license": "MIT",
+            "optional": true,
+            "engines": {
+                "node": ">=8"
+            }
+        },
+        "node_modules/wide-align/node_modules/string-width": {
+            "version": "4.2.3",
+            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "emoji-regex": "^8.0.0",
+                "is-fullwidth-code-point": "^3.0.0",
+                "strip-ansi": "^6.0.1"
+            },
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/wildcard": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
@@ -22503,7 +22216,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true,
+            "devOptional": true,
             "license": "ISC"
         },
         "node_modules/write-file-atomic": {
@@ -22601,9 +22314,9 @@
             "license": "ISC"
         },
         "node_modules/yaml": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-            "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+            "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
             "dev": true,
             "license": "ISC",
             "bin": {
diff --git a/package.json b/package.json
index 614ce711c400..ab806fb582e0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "artemis",
-    "version": "7.5.1",
+    "version": "7.5.2",
     "description": "Interactive Learning with Individual Feedback",
     "private": true,
     "license": "MIT",
@@ -13,18 +13,18 @@
         "node_modules"
     ],
     "dependencies": {
-        "@angular/animations": "18.1.4",
-        "@angular/cdk": "18.1.4",
-        "@angular/common": "18.1.4",
-        "@angular/compiler": "18.1.4",
-        "@angular/core": "18.1.4",
-        "@angular/forms": "18.1.4",
-        "@angular/localize": "18.1.4",
-        "@angular/material": "18.1.4",
-        "@angular/platform-browser": "18.1.4",
-        "@angular/platform-browser-dynamic": "18.1.4",
-        "@angular/router": "18.1.4",
-        "@angular/service-worker": "18.1.4",
+        "@angular/animations": "18.2.3",
+        "@angular/cdk": "18.2.3",
+        "@angular/common": "18.2.3",
+        "@angular/compiler": "18.2.3",
+        "@angular/core": "18.2.3",
+        "@angular/forms": "18.2.3",
+        "@angular/localize": "18.2.3",
+        "@angular/material": "18.2.3",
+        "@angular/platform-browser": "18.2.3",
+        "@angular/platform-browser-dynamic": "18.2.3",
+        "@angular/router": "18.2.3",
+        "@angular/service-worker": "18.2.3",
         "@ctrl/ngx-emoji-mart": "9.2.0",
         "@danielmoncada/angular-datetime-picker": "18.1.0",
         "@fingerprintjs/fingerprintjs": "4.4.3",
@@ -34,23 +34,21 @@
         "@fortawesome/free-regular-svg-icons": "6.6.0",
         "@fortawesome/free-solid-svg-icons": "6.6.0",
         "@ls1intum/apollon": "3.3.14",
-        "@ng-bootstrap/ng-bootstrap": "17.0.0",
+        "@ng-bootstrap/ng-bootstrap": "17.0.1",
         "@ngx-translate/core": "15.0.0",
         "@ngx-translate/http-loader": "8.0.0",
-        "@sentry/angular": "8.25.0",
+        "@sentry/angular": "8.28.0",
         "@swimlane/ngx-charts": "20.5.0",
         "@swimlane/ngx-graph": "8.4.0",
         "@vscode/codicons": "0.0.36",
-        "ace-builds": "1.35.4",
         "bootstrap": "5.3.3",
-        "brace": "0.11.1",
         "compare-versions": "6.1.1",
-        "core-js": "3.38.0",
+        "core-js": "3.38.1",
         "crypto-js": "4.2.0",
-        "dayjs": "1.11.12",
-        "diff-match-patch-typescript": "1.0.8",
+        "dayjs": "1.11.13",
+        "diff-match-patch-typescript": "1.1.0",
         "dompurify": "3.1.6",
-        "export-to-csv": "1.3.0",
+        "export-to-csv": "1.4.0",
         "fast-json-patch": "3.1.1",
         "franc-min": "6.2.0",
         "html-diff-ts": "1.4.2",
@@ -60,21 +58,22 @@
         "jszip": "3.10.1",
         "lodash-es": "4.17.21",
         "mobile-drag-drop": "3.0.0-rc.0",
-        "monaco-editor": "0.50.0",
+        "monaco-editor": "0.51.0",
         "ngx-infinite-scroll": "18.0.0",
         "ngx-webstorage": "18.0.0",
         "papaparse": "5.4.1",
-        "posthog-js": "1.155.0",
+        "pdfjs-dist": "4.6.82",
+        "posthog-js": "1.160.3",
         "rxjs": "7.8.1",
         "showdown": "2.1.0",
         "showdown-highlight": "3.1.0",
         "showdown-katex": "0.6.0",
-        "simple-statistics": "7.8.3",
+        "simple-statistics": "7.8.5",
         "smoothscroll-polyfill": "0.4.4",
         "sockjs-client": "1.6.1",
         "split.js": "1.6.5",
         "ts-cacheable": "1.0.10",
-        "tslib": "2.6.3",
+        "tslib": "2.7.0",
         "uuid": "10.0.0",
         "webstomp-client": "1.2.6",
         "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz",
@@ -91,7 +90,6 @@
         "@typescript-eslint/utils": {
             "eslint": "^9.9.0"
         },
-        "axios": "1.7.4",
         "braces": "3.0.3",
         "critters": "0.0.24",
         "debug": "4.3.6",
@@ -99,56 +97,55 @@
             "eslint": "^9.9.0"
         },
         "eslint-plugin-jest": {
-            "@typescript-eslint/eslint-plugin": "^8.1.0"
+            "@typescript-eslint/eslint-plugin": "^8.4.0"
         },
         "jsdom": "24.1.1",
         "katex": "0.16.11",
-        "postcss": "8.4.40",
+        "postcss": "8.4.41",
+        "rimraf": "6.0.1",
         "semver": "7.6.3",
         "showdown-katex": {
             "showdown": "2.1.0"
         },
         "tough-cookie": "4.1.4",
-        "undici": "6.19.5",
-        "vite": "5.3.5",
-        "webpack-dev-middleware": "7.3.0",
+        "webpack-dev-middleware": "7.4.2",
         "word-wrap": "1.2.5",
         "ws": "8.18.0",
         "yargs-parser": "21.1.1"
     },
     "devDependencies": {
         "@angular-builders/jest": "18.0.0",
-        "@angular-devkit/build-angular": "18.1.4",
-        "@angular-eslint/builder": "18.2.0",
-        "@angular-eslint/eslint-plugin": "18.2.0",
-        "@angular-eslint/eslint-plugin-template": "18.2.0",
-        "@angular-eslint/schematics": "18.2.0",
-        "@angular-eslint/template-parser": "18.2.0",
-        "@angular/cli": "18.1.4",
-        "@angular/compiler-cli": "18.1.4",
-        "@angular/language-service": "18.1.4",
-        "@sentry/types": "8.25.0",
+        "@angular-devkit/build-angular": "18.2.3",
+        "@angular-eslint/builder": "18.3.0",
+        "@angular-eslint/eslint-plugin": "18.3.0",
+        "@angular-eslint/eslint-plugin-template": "18.3.0",
+        "@angular-eslint/schematics": "18.3.0",
+        "@angular-eslint/template-parser": "18.3.0",
+        "@angular/cli": "18.2.3",
+        "@angular/compiler-cli": "18.2.3",
+        "@angular/language-service": "18.2.3",
+        "@sentry/types": "8.28.0",
         "@types/crypto-js": "4.2.2",
         "@types/d3-shape": "3.1.6",
         "@types/dompurify": "3.0.5",
         "@types/jest": "29.5.12",
         "@types/lodash-es": "4.17.12",
-        "@types/node": "22.2.0",
+        "@types/node": "22.5.4",
         "@types/papaparse": "5.3.14",
         "@types/showdown": "2.0.6",
         "@types/smoothscroll-polyfill": "0.3.4",
         "@types/sockjs-client": "1.5.4",
         "@types/uuid": "10.0.0",
-        "@typescript-eslint/eslint-plugin": "8.1.0",
-        "@typescript-eslint/parser": "8.1.0",
-        "eslint": "9.9.0",
+        "@typescript-eslint/eslint-plugin": "8.4.0",
+        "@typescript-eslint/parser": "8.4.0",
+        "eslint": "9.9.1",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-deprecation": "3.0.0",
-        "eslint-plugin-jest": "28.8.0",
+        "eslint-plugin-jest": "28.8.3",
         "eslint-plugin-jest-extended": "2.4.0",
         "eslint-plugin-prettier": "5.2.1",
         "folder-hash": "4.0.4",
-        "husky": "9.1.4",
+        "husky": "9.1.5",
         "jest": "29.7.0",
         "jest-canvas-mock": "2.5.2",
         "jest-date-mock": "1.0.10",
@@ -156,11 +153,12 @@
         "jest-fail-on-console": "3.3.0",
         "jest-junit": "16.0.0",
         "jest-preset-angular": "14.2.2",
-        "lint-staged": "15.2.8",
-        "ng-mocks": "14.13.0",
+        "lint-staged": "15.2.10",
+        "ng-mocks": "14.13.1",
         "prettier": "3.3.3",
-        "sass": "1.77.8",
-        "ts-jest": "29.2.4",
+        "rimraf": "6.0.1",
+        "sass": "1.78.0",
+        "ts-jest": "29.2.5",
         "typescript": "5.5.4",
         "weak-napi": "2.0.2"
     },
diff --git a/settings.gradle b/settings.gradle
index b9f9d365979c..c99752089fcd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,6 +14,7 @@ pluginManagement {
 
 rootProject.name = 'Artemis'
 
+// needed for rest call and endpoint analysis
 include 'supporting_scripts:analysis-of-endpoint-connections'
 
 // needed for programming exercise templates
diff --git a/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java b/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java
index e64bb62fccbb..674012737006 100644
--- a/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java
+++ b/src/main/java/de/tum/in/www1/artemis/ArtemisApp.java
@@ -19,11 +19,12 @@
 import org.springframework.core.env.Environment;
 
 import de.tum.in.www1.artemis.config.ProgrammingLanguageConfiguration;
+import de.tum.in.www1.artemis.config.TheiaConfiguration;
 import tech.jhipster.config.DefaultProfileUtil;
 import tech.jhipster.config.JHipsterConstants;
 
 @SpringBootApplication
-@EnableConfigurationProperties({ LiquibaseProperties.class, ProgrammingLanguageConfiguration.class })
+@EnableConfigurationProperties({ LiquibaseProperties.class, ProgrammingLanguageConfiguration.class, TheiaConfiguration.class })
 public class ArtemisApp {
 
     private static final Logger log = LoggerFactory.getLogger(ArtemisApp.class);
diff --git a/src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java b/src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java
new file mode 100644
index 000000000000..898bf2d78c38
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/config/PropertiesConfigurationGuard.java
@@ -0,0 +1,31 @@
+package de.tum.in.www1.artemis.config;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+@Component
+@Profile(PROFILE_SCHEDULING)
+public class PropertiesConfigurationGuard implements InitializingBean {
+
+    private static final Logger log = LoggerFactory.getLogger(PropertiesConfigurationGuard.class);
+
+    @Value("${info.operatorName:#{null}}")
+    private String operatorName;
+
+    /**
+     * Checks if the info.operatorName value is set in the configuration ymls, and exits the application if not.
+     */
+    public void afterPropertiesSet() {
+        if (this.operatorName == null || this.operatorName.isEmpty()) {
+            log.error(
+                    "The name of the operator (University) is not configured in the application-prod.yml! It is needed to be displayed in the /about page, and for the telemetry service.");
+            throw new IllegalArgumentException("The name of the operator (university) must be configured, but is not!");
+        }
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java
new file mode 100644
index 000000000000..02a50a5201ed
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/config/TheiaConfiguration.java
@@ -0,0 +1,43 @@
+package de.tum.in.www1.artemis.config;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA;
+
+import java.util.Map;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
+
+@Profile(PROFILE_THEIA)
+@Configuration
+@ConfigurationProperties(prefix = "theia")
+public class TheiaConfiguration {
+
+    private Map<ProgrammingLanguage, Map<String, String>> images;
+
+    public void setImages(final Map<ProgrammingLanguage, Map<String, String>> images) {
+        this.images = images;
+    }
+
+    /**
+     * Get the images for all languages
+     *
+     * @return a map of language -> [flavor/name -> image-link]
+     */
+    public Map<ProgrammingLanguage, Map<String, String>> getImagesForAllLanguages() {
+        return images;
+    }
+
+    /**
+     * Get the images for a specific language
+     *
+     * @param language the language for which the images should be retrieved
+     * @return a map of flavor/name -> image-link
+     */
+    public Map<String, String> getImagesForLanguage(ProgrammingLanguage language) {
+        return images.get(language);
+    }
+
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java
index 45bfdaf4a97b..f88d93656d1b 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/connector/GitLabApiConfiguration.java
@@ -8,6 +8,9 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Configuration
 @Profile("gitlab | gitlabci")
 public class GitLabApiConfiguration {
diff --git a/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java b/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java
index 73d81028276b..41662e7c3be6 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/lti/CustomLti13Configurer.java
@@ -5,9 +5,9 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.web.authentication.logout.LogoutFilter;
-import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
 import org.springframework.stereotype.Component;
 
+import de.tum.in.www1.artemis.security.jwt.JWTFilter;
 import de.tum.in.www1.artemis.service.OnlineCourseConfigurationService;
 import de.tum.in.www1.artemis.service.connectors.lti.Lti13Service;
 import de.tum.in.www1.artemis.web.filter.Lti13LaunchFilter;
@@ -74,7 +74,7 @@ public void configure(HttpSecurity http) {
         // https://www.imsglobal.org/spec/security/v1p0/#step-3-authentication-response
         OAuth2LoginAuthenticationFilter defaultLoginFilter = configureLoginFilter(clientRegistrationRepository(http), oidcLaunchFlowAuthenticationProvider,
                 authorizationRequestRepository);
-        http.addFilterAfter(new Lti13LaunchFilter(defaultLoginFilter, "/" + LTI13_LOGIN_PATH, lti13Service(http)), AbstractPreAuthenticatedProcessingFilter.class);
+        http.addFilterAfter(new Lti13LaunchFilter(defaultLoginFilter, "/" + LTI13_LOGIN_PATH, lti13Service(http)), JWTFilter.class);
     }
 
     protected Lti13Service lti13Service(HttpSecurity http) {
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java b/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java
index b44ce90a2e67..ccb797194f8d 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/ProgrammingExercise.java
@@ -732,8 +732,9 @@ public String toString() {
     public void validateProgrammingSettings() {
 
         // Check if a participation mode was selected
-        if (!Boolean.TRUE.equals(isAllowOnlineEditor()) && !Boolean.TRUE.equals(isAllowOfflineIde())) {
-            throw new BadRequestAlertException("You need to allow at least one participation mode, the online editor or the offline IDE", "Exercise", "noParticipationModeAllowed");
+        if (!Boolean.TRUE.equals(isAllowOnlineEditor()) && !Boolean.TRUE.equals(isAllowOfflineIde()) && !isAllowOnlineIde()) {
+            throw new BadRequestAlertException("You need to allow at least one participation mode, the online editor, the offline IDE, or the online IDE", "Exercise",
+                    "noParticipationModeAllowed");
         }
 
         // Check if Xcode has no online code editor enabled
@@ -745,6 +746,11 @@ public void validateProgrammingSettings() {
         if (getProgrammingLanguage() == null) {
             throw new BadRequestAlertException("No programming language was specified", "Exercise", "programmingLanguageNotSet");
         }
+
+        // Check if theia image was selected if the online IDE is enabled
+        if (isAllowOnlineIde() && buildConfig.getTheiaImage() == null) {
+            throw new BadRequestAlertException("The Theia image must be selected if the online IDE is enabled", "Exercise", "theiaImageNotSet");
+        }
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java b/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java
index 3d43ae71fc93..60da52e071f2 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/enumeration/ProgrammingLanguage.java
@@ -47,7 +47,8 @@ public enum ProgrammingLanguage {
         VHDL,
         ASSEMBLER,
         SWIFT,
-        OCAML
+        OCAML,
+        RUST
     );
     // @formatter:on
 
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java b/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java
deleted file mode 100644
index 4353f30a63c1..000000000000
--- a/src/main/java/de/tum/in/www1/artemis/domain/iris/session/IrisCompetencyGenerationSession.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package de.tum.in.www1.artemis.domain.iris.session;
-
-import jakarta.persistence.DiscriminatorValue;
-import jakarta.persistence.Entity;
-import jakarta.persistence.ManyToOne;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-import de.tum.in.www1.artemis.domain.Course;
-import de.tum.in.www1.artemis.domain.User;
-
-/**
- * A IrisCompetencyGenerationSession is a session specific to a course and user.
- * This is used for course editors to generate competency recommendations.
- */
-@Entity
-@DiscriminatorValue("COMPETENCY_GENERATION")
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class IrisCompetencyGenerationSession extends IrisSession {
-
-    @ManyToOne
-    @JsonIgnore
-    private Course course;
-
-    @ManyToOne
-    @JsonIgnore
-    private User user;
-
-    public Course getCourse() {
-        return course;
-    }
-
-    public void setCourse(Course course) {
-        this.course = course;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    @Override
-    public String toString() {
-        return "IrisCompetencyGenerationSession{" + "id=" + getId() + ", course=" + (course == null ? "null" : course.getId()) + ", user="
-                + (user == null ? "null" : user.getName()) + '}';
-    }
-}
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java
index 16800e0021c7..816d18157234 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lti/Lti13ClientRegistration.java
@@ -37,6 +37,9 @@ public class Lti13ClientRegistration {
     @JsonProperty("jwks_uri")
     private String jwksUri;
 
+    @JsonProperty("logo_uri")
+    private String logoUri;
+
     @JsonProperty("token_endpoint_auth_method")
     private String tokenEndpointAuthMethod;
 
@@ -67,6 +70,7 @@ public Lti13ClientRegistration(String serverUrl, String clientRegistrationId) {
         this.setRedirectUris(List.of(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_REDIRECT_PROXY_PATH));
         this.setInitiateLoginUri(serverUrl + "/" + CustomLti13Configurer.LTI13_LOGIN_INITIATION_PATH + "/" + clientRegistrationId);
         this.setJwksUri(serverUrl + "/.well-known/jwks.json");
+        this.setLogoUri(serverUrl + "/public/images/logo.png");
 
         Lti13ToolConfiguration toolConfiguration = getLti13ToolConfiguration(serverUrl);
         this.setLti13ToolConfiguration(toolConfiguration);
@@ -83,6 +87,7 @@ private static Lti13ToolConfiguration getLti13ToolConfiguration(String serverUrl
         }
         toolConfiguration.setDomain(domain);
         toolConfiguration.setTargetLinkUri(serverUrl + "/courses");
+        toolConfiguration.setDescription("Artemis: Interactive Learning with Individual Feedback");
         toolConfiguration.setClaims(Arrays.asList("iss", "email", "sub", "name", "given_name", "family_name"));
         Message deepLinkingMessage = new Message(CustomLti13Configurer.LTI13_DEEPLINK_MESSAGE_REQUEST, serverUrl + "/" + CustomLti13Configurer.LTI13_DEEPLINK_REDIRECT_PATH);
         toolConfiguration.setMessages(List.of(deepLinkingMessage));
@@ -145,6 +150,14 @@ public void setJwksUri(String jwksUri) {
         this.jwksUri = jwksUri;
     }
 
+    public String getLogoUri() {
+        return logoUri;
+    }
+
+    public void setLogoUri(String logoUri) {
+        this.logoUri = logoUri;
+    }
+
     public String getTokenEndpointAuthMethod() {
         return tokenEndpointAuthMethod;
     }
@@ -179,6 +192,8 @@ public static class Lti13ToolConfiguration {
         @JsonProperty("target_link_uri")
         private String targetLinkUri;
 
+        private String description;
+
         private List<Message> messages;
 
         private List<String> claims;
@@ -199,6 +214,14 @@ public void setTargetLinkUri(String targetLinkUri) {
             this.targetLinkUri = targetLinkUri;
         }
 
+        public String getDescription() {
+            return description;
+        }
+
+        public void setDescription(String description) {
+            this.description = description;
+        }
+
         public List<Message> getMessages() {
             return messages;
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java b/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java
index 86a856dffce2..76f24a8456c4 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/notification/NotificationTargetFactory.java
@@ -339,11 +339,11 @@ public static String extractNotificationUrl(Notification notification, String ba
      * If the post is not associated with a conversation or messaging is disabled in the course, the URL leads to the communication page.
      *
      * @param post    which information will be needed to create the URL
-     * @param baseUrl the prefix (depends on current set up (e.g. "http://localhost:9000/courses"))
+     * @param baseUrl the prefix (depends on current set up (e.g. "http://localhost:9000"))
      * @return viable URL to the notification related page
      */
     public static String extractNotificationUrl(Post post, String baseUrl) {
-        // e.g. http://localhost:8080/courses/1/messages?conversationId=123
-        return baseUrl + "/courses/" + post.getConversation().getCourse().getId() + "/messages?conversationId=" + post.getConversation().getId();
+        // e.g. http://localhost:8080/courses/1/communication?conversationId=123
+        return baseUrl + "/courses/" + post.getConversation().getCourse().getId() + "/communication?conversationId=" + post.getConversation().getId();
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java
index 44f21ed0bf25..77279e2a6593 100644
--- a/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java
+++ b/src/main/java/de/tum/in/www1/artemis/exception/GitLabCIException.java
@@ -1,5 +1,8 @@
 package de.tum.in.www1.artemis.exception;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 public class GitLabCIException extends ContinuousIntegrationException {
 
     public GitLabCIException(String message) {
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java
index 470e789cdb27..1187d8c0e11d 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/CourseRepository.java
@@ -222,8 +222,6 @@ SELECT COUNT(c) > 0
 
     List<Course> findAllByShortName(String shortName);
 
-    Optional<Course> findById(long courseId);
-
     /**
      * Returns the title of the course with the given id.
      *
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java
index 127e51c9efab..afac757c9ccd 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamRepository.java
@@ -58,7 +58,7 @@ public interface ExamRepository extends ArtemisJpaRepository<Exam, Long> {
     /**
      * Find all exams for multiple courses that are already visible to the user (either registered, at least tutor or the exam is a test exam)
      *
-     * @param courseIds  set of courseIds that the exams should be retreived
+     * @param courseIds  set of courseIds that the exams should be retrieved
      * @param userId     the id of the user requesting the exams
      * @param groupNames the groups of the user requesting the exams
      * @param now        the current date, typically ZonedDateTime.now()
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java
index b86b9ea3abc3..3924394b81ee 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/ExamSessionRepository.java
@@ -39,9 +39,9 @@ Set<ExamSession> findAllExamSessionsWithTheSameIpAddressAndBrowserFingerprintByE
             @Param("studentExamId") Long studentExamId, @Param("ipAddress") String ipAddress, @Param("browserFingerprintHash") String browserFingerprintHash);
 
     @Query("""
-                SELECT es
-                FROM ExamSession es
-                WHERE es.studentExam.exam.id = :examId
+            SELECT es
+            FROM ExamSession es
+            WHERE es.studentExam.exam.id = :examId
             """)
     Set<ExamSession> findAllExamSessionsByExamId(@Param("examId") long examId);
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java
index 815b57746081..172de00d1839 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/PersistenceAuditEventRepository.java
@@ -3,6 +3,7 @@
 import static org.springframework.data.jpa.repository.EntityGraph.EntityGraphType.LOAD;
 
 import java.time.Instant;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 
@@ -52,6 +53,7 @@ default Page<PersistentAuditEvent> findAllWithDataByAuditEventDateBetween(Instan
             return Page.empty(pageable);
         }
         List<PersistentAuditEvent> result = findWithDataByIdIn(ids);
+        result.sort(Comparator.comparing(event -> ids.indexOf(event.getId())));
         return new PageImpl<>(result, pageable, countByAuditEventDateBetween(fromDate, toDate));
     }
 
@@ -73,6 +75,7 @@ default Page<PersistentAuditEvent> findAllWithData(@NotNull Pageable pageable) {
             return Page.empty(pageable);
         }
         List<PersistentAuditEvent> result = findWithDataByIdIn(ids);
+        result.sort(Comparator.comparing(event -> ids.indexOf(event.getId())));
         return new PageImpl<>(result, pageable, count());
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java
index 8cd15a15b573..83c8b716db94 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/StudentParticipationRepository.java
@@ -39,6 +39,7 @@
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.domain.quiz.QuizSubmittedAnswerCount;
 import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository;
+import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO;
 
 /**
  * Spring Data JPA repository for the Participation entity.
@@ -703,18 +704,38 @@ default Page<StudentParticipation> findAllWithEagerSubmissionsAndResultsByExerci
             """)
     List<StudentParticipation> findAllWithEagerLegalSubmissionsAndEagerResultsByExerciseId(@Param("exerciseId") long exerciseId);
 
+    /**
+     * Retrieves all distinct `StudentParticipation` entities for a specific exercise,
+     * including their latest non-illegal submission and the latest rated result for each submission.
+     * The method fetches related submissions, results, student, and team data to avoid the N+1 select problem.
+     *
+     * <p>
+     * The method ensures that:
+     * <ul>
+     * <li>Only participations belonging to the specified exercise are retrieved.</li>
+     * <li>Participations marked as a test run are excluded.</li>
+     * <li>Only the latest non-illegal submission for each participation is considered.</li>
+     * <li>Only the latest rated result for each submission is considered.</li>
+     * </ul>
+     *
+     * @param exerciseId the ID of the exercise for which to retrieve participations.
+     * @return a list of distinct `StudentParticipation` entities matching the criteria.
+     */
     @Query("""
             SELECT DISTINCT p
             FROM StudentParticipation p
-                LEFT JOIN FETCH p.results r
-                LEFT JOIN FETCH r.submission rs
                 LEFT JOIN FETCH p.submissions s
-                LEFT JOIN FETCH s.results sr
+                LEFT JOIN FETCH s.results r
+                LEFT JOIN FETCH p.student
+                LEFT JOIN FETCH p.team
             WHERE p.exercise.id = :exerciseId
                 AND p.testRun = FALSE
-                AND p.submissions IS NOT EMPTY
-                AND (s.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s.type IS NULL)
-                AND (rs.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR rs.type IS NULL)
+                AND s.id = (SELECT MAX(s2.id)
+                            FROM p.submissions s2
+                            WHERE s2.type <> de.tum.in.www1.artemis.domain.enumeration.SubmissionType.ILLEGAL OR s2.type IS NULL)
+                AND r.id = (SELECT MAX(r2.id)
+                            FROM s.results r2
+                            WHERE r2.rated = TRUE)
             """)
     List<StudentParticipation> findAllForPlagiarism(@Param("exerciseId") long exerciseId);
 
@@ -1210,4 +1231,53 @@ SELECT COALESCE(AVG(p.presentationScore), 0)
                 AND p.presentationScore IS NOT NULL
             """)
     double getAvgPresentationScoreByCourseId(@Param("courseId") long courseId);
+
+    /**
+     * Retrieves aggregated feedback details for a given exercise, including the count of each unique feedback detail text and test case name.
+     * <br>
+     * The relative count and task number are initially set to 0 and are calculated in a separate step in the service layer.
+     *
+     * @param exerciseId Exercise ID.
+     * @return a list of {@link FeedbackDetailDTO} objects, with the relative count and task number set to 0.
+     */
+    @Query("""
+            SELECT new de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO(
+                COUNT(f.id),
+                0,
+                f.detailText,
+                f.testCase.testName,
+                0
+                )
+            FROM StudentParticipation p
+                 JOIN p.results r
+                 JOIN r.feedbacks f
+                    WHERE p.exercise.id = :exerciseId
+                        AND p.testRun = FALSE
+                        AND r.id = (
+                            SELECT MAX(pr.id)
+                            FROM p.results pr
+                            )
+                        AND f.positive = FALSE
+                        GROUP BY f.detailText, f.testCase.testName
+            """)
+    List<FeedbackDetailDTO> findAggregatedFeedbackByExerciseId(@Param("exerciseId") long exerciseId);
+
+    /**
+     * Counts the distinct number of latest results for a given exercise, excluding those in practice mode.
+     *
+     * @param exerciseId Exercise ID.
+     * @return The count of distinct latest results for the exercise.
+     */
+    @Query("""
+                SELECT COUNT(DISTINCT r.id)
+                FROM StudentParticipation p
+                    JOIN p.results r
+                WHERE p.exercise.id = :exerciseId
+                      AND p.testRun = FALSE
+                      AND r.id = (
+                          SELECT MAX(pr.id)
+                          FROM p.results pr
+                      )
+            """)
+    long countDistinctResultsByExerciseId(@Param("exerciseId") long exerciseId);
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java
index e659f82db28d..04dd3b8732f2 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/UserRepository.java
@@ -765,6 +765,17 @@ default Page<User> findAllWithGroupsByIsDeletedIsFalse(Pageable pageable) {
             """)
     void updateUserSshPublicKeyHash(@Param("userId") long userId, @Param("sshPublicKeyHash") String sshPublicKeyHash, @Param("sshPublicKey") String sshPublicKey);
 
+    @Modifying
+    @Transactional // ok because of modifying query
+    @Query("""
+            UPDATE User user
+            SET user.vcsAccessToken = :vcsAccessToken,
+                user.vcsAccessTokenExpiryDate = :vcsAccessTokenExpiryDate
+            WHERE user.id = :userId
+            """)
+    void updateUserVcsAccessToken(@Param("userId") long userId, @Param("vcsAccessToken") String vcsAccessToken,
+            @Param("vcsAccessTokenExpiryDate") ZonedDateTime vcsAccessTokenExpiryDate);
+
     @Modifying
     @Transactional // ok because of modifying query
     @Query("""
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java
deleted file mode 100644
index 978749785907..000000000000
--- a/src/main/java/de/tum/in/www1/artemis/repository/iris/IrisCompetencyGenerationSessionRepository.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.tum.in.www1.artemis.repository.iris;
-
-import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession;
-import de.tum.in.www1.artemis.repository.base.ArtemisJpaRepository;
-
-/**
- * Repository interface for managing {@link IrisCompetencyGenerationSession} entities.
- */
-public interface IrisCompetencyGenerationSessionRepository extends ArtemisJpaRepository<IrisCompetencyGenerationSession, Long> {
-
-    /**
-     * Finds the latest {@link IrisCompetencyGenerationSession} based on its course and user.
-     *
-     * @param courseId The ID of the course.
-     * @param userId   The ID of the user.
-     *
-     * @return The latest competency generation session
-     */
-    IrisCompetencyGenerationSession findFirstByCourseIdAndUserIdOrderByCreationDateDesc(long courseId, long userId);
-}
diff --git a/src/main/java/de/tum/in/www1/artemis/security/jwt/JWTCookieService.java b/src/main/java/de/tum/in/www1/artemis/security/jwt/JWTCookieService.java
index 6fb44f9e1bec..3fd9d62c03e1 100644
--- a/src/main/java/de/tum/in/www1/artemis/security/jwt/JWTCookieService.java
+++ b/src/main/java/de/tum/in/www1/artemis/security/jwt/JWTCookieService.java
@@ -18,8 +18,6 @@
 @Service
 public class JWTCookieService {
 
-    private static final String CYPRESS_PROFILE = "cypress";
-
     private static final String DEVELOPMENT_PROFILE = "dev";
 
     private final TokenProvider tokenProvider;
@@ -61,9 +59,8 @@ public ResponseCookie buildLogoutCookie() {
      */
     private ResponseCookie buildJWTCookie(String jwt, Duration duration) {
 
-        // TODO - Remove cypress workaround once cypress uses https and find a better solution for testing locally in Safari
         Collection<String> activeProfiles = Arrays.asList(environment.getActiveProfiles());
-        boolean isSecure = !activeProfiles.contains(CYPRESS_PROFILE) && !activeProfiles.contains(DEVELOPMENT_PROFILE);
+        boolean isSecure = !activeProfiles.contains(DEVELOPMENT_PROFILE);
 
         return ResponseCookie.from(JWT_COOKIE_NAME, jwt).httpOnly(true) // Must be httpOnly
                 .sameSite("Lax") // Must be Lax to allow navigation links to Artemis to work
diff --git a/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java b/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java
index 4143a0e00bbe..724a8f98e347 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/AuthorizationCheckService.java
@@ -10,8 +10,6 @@
 import jakarta.annotation.Nullable;
 import jakarta.validation.constraints.NotNull;
 
-import javax.annotation.CheckReturnValue;
-
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
@@ -19,6 +17,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
+import com.google.errorprone.annotations.CheckReturnValue;
+
 import de.tum.in.www1.artemis.domain.Authority;
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.Exercise;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ResultService.java b/src/main/java/de/tum/in/www1/artemis/service/ResultService.java
index 3ec13cb3d5e0..139a3b01b01c 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ResultService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ResultService.java
@@ -34,6 +34,7 @@
 import de.tum.in.www1.artemis.domain.enumeration.BuildPlanType;
 import de.tum.in.www1.artemis.domain.enumeration.FeedbackType;
 import de.tum.in.www1.artemis.domain.exam.Exam;
+import de.tum.in.www1.artemis.domain.hestia.ProgrammingExerciseTask;
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseParticipation;
 import de.tum.in.www1.artemis.domain.participation.ProgrammingExerciseStudentParticipation;
@@ -49,11 +50,15 @@
 import de.tum.in.www1.artemis.repository.ResultRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
 import de.tum.in.www1.artemis.repository.StudentExamRepository;
+import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
 import de.tum.in.www1.artemis.repository.TemplateProgrammingExerciseParticipationRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
+import de.tum.in.www1.artemis.repository.hestia.ProgrammingExerciseTaskRepository;
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.service.connectors.localci.dto.ResultBuildJob;
 import de.tum.in.www1.artemis.service.connectors.lti.LtiNewResultService;
+import de.tum.in.www1.artemis.service.hestia.ProgrammingExerciseTaskService;
+import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.websocket.ResultWebsocketService;
 
@@ -99,6 +104,10 @@ public class ResultService {
 
     private final BuildLogEntryService buildLogEntryService;
 
+    private final StudentParticipationRepository studentParticipationRepository;
+
+    private final ProgrammingExerciseTaskService programmingExerciseTaskService;
+
     public ResultService(UserRepository userRepository, ResultRepository resultRepository, Optional<LtiNewResultService> ltiNewResultService,
             ResultWebsocketService resultWebsocketService, ComplaintResponseRepository complaintResponseRepository, RatingRepository ratingRepository,
             FeedbackRepository feedbackRepository, LongFeedbackTextRepository longFeedbackTextRepository, ComplaintRepository complaintRepository,
@@ -106,7 +115,8 @@ public ResultService(UserRepository userRepository, ResultRepository resultRepos
             TemplateProgrammingExerciseParticipationRepository templateProgrammingExerciseParticipationRepository,
             SolutionProgrammingExerciseParticipationRepository solutionProgrammingExerciseParticipationRepository,
             ProgrammingExerciseStudentParticipationRepository programmingExerciseStudentParticipationRepository, StudentExamRepository studentExamRepository,
-            BuildJobRepository buildJobRepository, BuildLogEntryService buildLogEntryService) {
+            BuildJobRepository buildJobRepository, BuildLogEntryService buildLogEntryService, StudentParticipationRepository studentParticipationRepository,
+            ProgrammingExerciseTaskRepository programmingExerciseTaskRepository, ProgrammingExerciseTaskService programmingExerciseTaskService) {
         this.userRepository = userRepository;
         this.resultRepository = resultRepository;
         this.ltiNewResultService = ltiNewResultService;
@@ -125,6 +135,8 @@ public ResultService(UserRepository userRepository, ResultRepository resultRepos
         this.studentExamRepository = studentExamRepository;
         this.buildJobRepository = buildJobRepository;
         this.buildLogEntryService = buildLogEntryService;
+        this.studentParticipationRepository = studentParticipationRepository;
+        this.programmingExerciseTaskService = programmingExerciseTaskService;
     }
 
     /**
@@ -513,4 +525,33 @@ private Result shouldSaveResult(@NotNull Result result, boolean shouldSave) {
             return result;
         }
     }
+
+    /**
+     * Retrieves aggregated feedback details for a given exercise, calculating relative counts based on the total number of distinct results.
+     * The task numbers are assigned based on the associated test case names, using the set of tasks fetched from the database.
+     * <br>
+     * For each feedback detail:
+     * 1. The relative count is calculated as a percentage of the total number of distinct results for the exercise.
+     * 2. The task number is determined by matching the test case name with the tasks.
+     *
+     * @param exerciseId The ID of the exercise for which feedback details should be retrieved.
+     * @return A list of FeedbackDetailDTO objects, each containing:
+     *         - feedback count,
+     *         - relative count (as a percentage of distinct results),
+     *         - detail text,
+     *         - test case name,
+     *         - determined task number (based on the test case name).
+     */
+    public List<FeedbackDetailDTO> findAggregatedFeedbackByExerciseId(long exerciseId) {
+        long distinctResultCount = studentParticipationRepository.countDistinctResultsByExerciseId(exerciseId);
+        Set<ProgrammingExerciseTask> tasks = programmingExerciseTaskService.getTasksWithUnassignedTestCases(exerciseId);
+        List<FeedbackDetailDTO> feedbackDetails = studentParticipationRepository.findAggregatedFeedbackByExerciseId(exerciseId);
+
+        return feedbackDetails.stream().map(detail -> {
+            double relativeCount = (detail.count() * 100.0) / distinctResultCount;
+            int taskNumber = tasks.stream().filter(task -> task.getTestCases().stream().anyMatch(tc -> tc.getTestName().equals(detail.testCaseName()))).findFirst()
+                    .map(task -> tasks.stream().toList().indexOf(task) + 1).orElse(0);
+            return new FeedbackDetailDTO(detail.count(), relativeCount, detail.detailText(), detail.testCaseName(), taskNumber);
+        }).toList();
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java
index f22eebc954bf..2cb70653b3d4 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/ci/ContinuousIntegrationService.java
@@ -219,8 +219,8 @@ enum RepositoryCheckoutPath implements CustomizableCheckoutPath {
             @Override
             public String forProgrammingLanguage(ProgrammingLanguage language) {
                 return switch (language) {
-                    case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY -> "assignment";
-                    case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
+                    case JAVA, PYTHON, C, HASKELL, KOTLIN, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST -> "assignment";
+                    case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
                         throw new UnsupportedOperationException("Unsupported programming language: " + language);
                 };
             }
@@ -230,9 +230,9 @@ public String forProgrammingLanguage(ProgrammingLanguage language) {
             @Override
             public String forProgrammingLanguage(ProgrammingLanguage language) {
                 return switch (language) {
-                    case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY -> "";
+                    case JAVA, PYTHON, HASKELL, KOTLIN, SWIFT, EMPTY, RUST -> "";
                     case C, VHDL, ASSEMBLER, OCAML -> "tests";
-                    case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
+                    case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
                         throw new UnsupportedOperationException("Unsupported programming language: " + language);
                 };
             }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java
index 4bf736963136..1b27d35bd3dd 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/AbstractGitLabAuthorizationInterceptor.java
@@ -10,6 +10,9 @@
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 public abstract class AbstractGitLabAuthorizationInterceptor implements ClientHttpRequestInterceptor {
 
     private static final String GITLAB_AUTHORIZATION_HEADER_NAME = "Private-Token";
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java
index 9a78a348d9d8..2e461a5e1106 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabAuthorizationInterceptor.java
@@ -3,6 +3,9 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlab")
 @Component
 public class GitLabAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java
index b34cd9c61dba..f217ef874422 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabException.java
@@ -2,6 +2,9 @@
 
 import de.tum.in.www1.artemis.exception.VersionControlException;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 public class GitLabException extends VersionControlException {
 
     public GitLabException() {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java
index e5d5fb7b3c4e..e903ffe004f5 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabPersonalAccessTokenManagementService.java
@@ -31,6 +31,9 @@
 /**
  * Provides VCS access token services for GitLab via means of personal access tokens.
  */
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Service
 @Profile("gitlab")
 public class GitLabPersonalAccessTokenManagementService extends VcsTokenManagementService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java
index 103a58652025..4cdddb4cf7a1 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabService.java
@@ -66,6 +66,9 @@
 import de.tum.in.www1.artemis.service.connectors.vcs.VersionControlRepositoryPermission;
 import de.tum.in.www1.artemis.service.util.UrlUtils;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlab")
 @Service
 public class GitLabService extends AbstractVersionControlService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java
index 298dee6f4e1b..36f65cc51902 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserDoesNotExistException.java
@@ -1,5 +1,8 @@
 package de.tum.in.www1.artemis.service.connectors.gitlab;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 public class GitLabUserDoesNotExistException extends GitLabException {
 
     public GitLabUserDoesNotExistException(String login) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java
index 9733c7a131c0..0f8f67198b55 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitLabUserManagementService.java
@@ -28,6 +28,9 @@
 import de.tum.in.www1.artemis.service.connectors.vcs.VcsTokenManagementService;
 import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Service
 @Profile("gitlab")
 public class GitLabUserManagementService implements VcsUserManagementService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java
index b24a6013dc93..951aafa36d8d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/GitlabInfoContributor.java
@@ -11,6 +11,9 @@
 
 import de.tum.in.www1.artemis.config.Constants;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Component
 @Profile("gitlab")
 public class GitlabInfoContributor implements InfoContributor {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java
index 6942e2da6343..d937d570bb45 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabCommitDTO.java
@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabCommitDTO(@JsonProperty("id") String hash, String message, ZonedDateTime timestamp, @JsonProperty("url") String commitUrl, Author author, List<String> added,
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java
index 2662aef4d7d7..0ceec1bc02dc 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenListResponseDTO.java
@@ -9,6 +9,9 @@
  *
  * @param id The id of the personal access token.
  */
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabPersonalAccessTokenListResponseDTO(@JsonProperty Long id) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java
index 263b15057000..154830c818b3 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenRequestDTO.java
@@ -6,6 +6,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabPersonalAccessTokenRequestDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java
index e8f4333975f7..6920d3db2bee 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPersonalAccessTokenResponseDTO.java
@@ -6,6 +6,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabPersonalAccessTokenResponseDTO(String name, @JsonProperty("user_id") Long userId, String[] scopes, @JsonProperty("expires_at") Date expiresAt, String token) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java
index 605679d176bf..71353195ac21 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabProjectDTO.java
@@ -6,6 +6,9 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabProjectDTO(int id, String name, String description, @JsonProperty("web_url") URL webUrl, @JsonProperty("git_ssh_url") String sshUrl,
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java
index 23858285deda..917628db09e8 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabPushNotificationDTO.java
@@ -8,6 +8,9 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabPushNotificationDTO(@JsonProperty("object_kind") String triggerType, @JsonProperty("event_name") String eventName, @JsonProperty("before") String previousHash,
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java
index f4e84034af8c..245eefed4498 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlab/dto/GitLabRepositoryDTO.java
@@ -5,6 +5,9 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record GitLabRepositoryDTO(String name, String url, String description, URL homepage) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java
index 79de2d27aa42..258aa2df4269 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIAuthorizationInterceptor.java
@@ -5,6 +5,9 @@
 
 import de.tum.in.www1.artemis.service.connectors.gitlab.AbstractGitLabAuthorizationInterceptor;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlabci")
 @Component
 public class GitLabCIAuthorizationInterceptor extends AbstractGitLabAuthorizationInterceptor {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java
index 80e9dab30be0..23500df008f1 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIBuildPlanService.java
@@ -19,6 +19,9 @@
 import de.tum.in.www1.artemis.service.ResourceLoaderService;
 import de.tum.in.www1.artemis.service.connectors.ci.AbstractBuildPlanCreator;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Service
 @Profile("gitlabci")
 public class GitLabCIBuildPlanService extends AbstractBuildPlanCreator {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java
index 832d100a7585..ee088f9d901a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIInfoContributor.java
@@ -10,6 +10,9 @@
 
 import de.tum.in.www1.artemis.config.Constants;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Component
 @Profile("gitlabci")
 public class GitLabCIInfoContributor implements InfoContributor {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java
index 55ecbb0e447c..661824ea06d8 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIProgrammingLanguageFeatureService.java
@@ -2,6 +2,7 @@
 
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.EMPTY;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA;
+import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST;
 import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.MAVEN_MAVEN;
 import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.PLAIN_MAVEN;
 
@@ -13,6 +14,9 @@
 import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature;
 import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Service
 @Profile("gitlabci")
 public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLanguageFeatureService {
@@ -20,5 +24,6 @@ public class GitLabCIProgrammingLanguageFeatureService extends ProgrammingLangua
     public GitLabCIProgrammingLanguageFeatureService() {
         programmingLanguageFeatures.put(EMPTY, new ProgrammingLanguageFeature(EMPTY, false, false, false, false, false, List.of(), false, false));
         programmingLanguageFeatures.put(JAVA, new ProgrammingLanguageFeature(JAVA, false, false, false, true, false, List.of(PLAIN_MAVEN, MAVEN_MAVEN), false, false));
+        programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false));
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java
index 620e22e09a55..f71e0fe8253b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIResultService.java
@@ -25,6 +25,9 @@
 import de.tum.in.www1.artemis.service.hestia.TestwiseCoverageService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingExerciseFeedbackCreationService;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlabci")
 @Service
 public class GitLabCIResultService extends AbstractContinuousIntegrationResultService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java
index 2c78eb608c4e..45d66cf19272 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIService.java
@@ -42,6 +42,9 @@
 import de.tum.in.www1.artemis.service.connectors.ci.notification.dto.TestResultsDTO;
 import de.tum.in.www1.artemis.web.rest.dto.CheckoutDirectoriesDTO;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlabci")
 @Service
 public class GitLabCIService extends AbstractContinuousIntegrationService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java
index 72c4fcb6150b..d2fe1c62525f 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCITriggerService.java
@@ -15,6 +15,9 @@
 import de.tum.in.www1.artemis.service.UriService;
 import de.tum.in.www1.artemis.service.connectors.ci.ContinuousIntegrationTriggerService;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Profile("gitlabci")
 @Service
 public class GitLabCITriggerService implements ContinuousIntegrationTriggerService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java
index f70dd7a82ffa..e15e0dd7038f 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/gitlabci/GitLabCIUserManagementService.java
@@ -12,6 +12,9 @@
 import de.tum.in.www1.artemis.exception.ContinuousIntegrationException;
 import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService;
 
+// Gitlab support will be removed in 8.0.0. Please migrate to LocalVC using e.g. the PR https://github.com/ls1intum/Artemis/pull/8972
+@Deprecated(since = "7.5.0", forRemoval = true)
+
 @Service
 @Profile("gitlabci")
 public class GitLabCIUserManagementService implements CIUserManagementService {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java
index 533e4c709005..d8a4abd0fea3 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/JenkinsProgrammingLanguageFeatureService.java
@@ -6,6 +6,7 @@
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.JAVA;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON;
+import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT;
 import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT;
 import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.GCC;
@@ -39,5 +40,6 @@ public JenkinsProgrammingLanguageFeatureService() {
         programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, true, true, true, false, List.of(PLAIN), false, false));
         programmingLanguageFeatures.put(C, new ProgrammingLanguageFeature(C, false, false, true, false, false, List.of(FACT, GCC), false, false));
         programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, false, false, false, false, true, List.of(), false, false));
+        programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, false));
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java
index a97f293e1b53..929a9e1e5750 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/jenkins/build_plan/JenkinsBuildPlanService.java
@@ -184,8 +184,8 @@ private JenkinsXmlConfigBuilder builderFor(ProgrammingLanguage programmingLangua
             throw new UnsupportedOperationException("Xcode templates are not available for Jenkins.");
         }
         return switch (programmingLanguage) {
-            case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY -> jenkinsBuildPlanCreator;
-            case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
+            case JAVA, KOTLIN, PYTHON, C, HASKELL, SWIFT, EMPTY, RUST -> jenkinsBuildPlanCreator;
+            case VHDL, ASSEMBLER, OCAML, JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
                 throw new UnsupportedOperationException(programmingLanguage + " templates are not available for Jenkins.");
         };
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java
index 276ab23671fa..101e0540521f 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIProgrammingLanguageFeatureService.java
@@ -8,6 +8,7 @@
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.KOTLIN;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.OCAML;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.PYTHON;
+import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.RUST;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.SWIFT;
 import static de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage.VHDL;
 import static de.tum.in.www1.artemis.domain.enumeration.ProjectType.FACT;
@@ -46,5 +47,6 @@ public LocalCIProgrammingLanguageFeatureService() {
         programmingLanguageFeatures.put(HASKELL, new ProgrammingLanguageFeature(HASKELL, true, false, false, false, true, List.of(), false, true));
         programmingLanguageFeatures.put(OCAML, new ProgrammingLanguageFeature(OCAML, false, false, false, false, true, List.of(), false, true));
         programmingLanguageFeatures.put(SWIFT, new ProgrammingLanguageFeature(SWIFT, false, false, true, true, false, List.of(PLAIN), false, true));
+        programmingLanguageFeatures.put(RUST, new ProgrammingLanguageFeature(RUST, false, false, false, false, false, List.of(), false, true));
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
index fd7e0cc0dc89..dfc7dcf776c2 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIResultProcessingService.java
@@ -20,7 +20,6 @@
 import com.hazelcast.collection.ItemEvent;
 import com.hazelcast.collection.ItemListener;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.cp.lock.FencedLock;
 import com.hazelcast.map.IMap;
 
 import de.tum.in.www1.artemis.domain.BuildJob;
@@ -73,8 +72,6 @@ public class LocalCIResultProcessingService {
 
     private IMap<String, BuildAgentInformation> buildAgentInformation;
 
-    private FencedLock resultQueueLock;
-
     private UUID listenerId;
 
     public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastInstance hazelcastInstance, ProgrammingExerciseGradingService programmingExerciseGradingService,
@@ -97,7 +94,6 @@ public LocalCIResultProcessingService(@Qualifier("hazelcastInstance") HazelcastI
     public void init() {
         this.resultQueue = this.hazelcastInstance.getQueue("buildResultQueue");
         this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation");
-        this.resultQueueLock = this.hazelcastInstance.getCPSubsystem().getLock("resultQueueLock");
         this.listenerId = resultQueue.addItemListener(new ResultQueueListener(), true);
     }
 
@@ -112,9 +108,7 @@ public void removeListener() {
     public void processResult() {
 
         // set lock to prevent multiple nodes from processing the same build job
-        resultQueueLock.lock();
         ResultQueueItem resultQueueItem = resultQueue.poll();
-        resultQueueLock.unlock();
 
         if (resultQueueItem == null) {
             return;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java
index bdaea1f46fd5..939fa41cee19 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/SharedQueueManagementService.java
@@ -27,7 +27,6 @@
 
 import com.hazelcast.collection.IQueue;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.cp.lock.FencedLock;
 import com.hazelcast.map.IMap;
 import com.hazelcast.topic.ITopic;
 
@@ -66,11 +65,6 @@ public class SharedQueueManagementService {
 
     private IMap<String, ZonedDateTime> dockerImageCleanupInfo;
 
-    /**
-     * Lock to prevent multiple nodes from processing the same build job.
-     */
-    private FencedLock sharedLock;
-
     private ITopic<String> canceledBuildJobsTopic;
 
     public SharedQueueManagementService(BuildJobRepository buildJobRepository, @Qualifier("hazelcastInstance") HazelcastInstance hazelcastInstance, ProfileService profileService) {
@@ -86,7 +80,6 @@ public SharedQueueManagementService(BuildJobRepository buildJobRepository, @Qual
     public void init() {
         this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation");
         this.processingJobs = this.hazelcastInstance.getMap("processingJobs");
-        this.sharedLock = this.hazelcastInstance.getCPSubsystem().getLock("buildJobQueueLock");
         this.queue = this.hazelcastInstance.getQueue("buildJobQueue");
         this.canceledBuildJobsTopic = hazelcastInstance.getTopic("canceledBuildJobsTopic");
         this.dockerImageCleanupInfo = this.hazelcastInstance.getMap("dockerImageCleanupInfo");
@@ -148,28 +141,22 @@ public List<BuildAgentInformation> getBuildAgentInformationWithoutRecentBuildJob
      * @param buildJobId id of the build job to cancel
      */
     public void cancelBuildJob(String buildJobId) {
-        sharedLock.lock();
-        try {
-            // Remove build job if it is queued
-            if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
-                List<BuildJobQueueItem> toRemove = new ArrayList<>();
-                for (BuildJobQueueItem job : queue) {
-                    if (Objects.equals(job.id(), buildJobId)) {
-                        toRemove.add(job);
-                    }
-                }
-                queue.removeAll(toRemove);
-            }
-            else {
-                // Cancel build job if it is currently being processed
-                BuildJobQueueItem buildJob = processingJobs.remove(buildJobId);
-                if (buildJob != null) {
-                    triggerBuildJobCancellation(buildJobId);
+        // Remove build job if it is queued
+        if (queue.stream().anyMatch(job -> Objects.equals(job.id(), buildJobId))) {
+            List<BuildJobQueueItem> toRemove = new ArrayList<>();
+            for (BuildJobQueueItem job : queue) {
+                if (Objects.equals(job.id(), buildJobId)) {
+                    toRemove.add(job);
                 }
             }
+            queue.removeAll(toRemove);
         }
-        finally {
-            sharedLock.unlock();
+        else {
+            // Cancel build job if it is currently being processed
+            BuildJobQueueItem buildJob = processingJobs.remove(buildJobId);
+            if (buildJob != null) {
+                triggerBuildJobCancellation(buildJobId);
+            }
         }
     }
 
@@ -188,30 +175,17 @@ private void triggerBuildJobCancellation(String buildJobId) {
      * Cancel all queued build jobs.
      */
     public void cancelAllQueuedBuildJobs() {
-        sharedLock.lock();
-        try {
-            log.debug("Cancelling all queued build jobs");
-            queue.clear();
-        }
-        finally {
-            sharedLock.unlock();
-        }
+        log.debug("Cancelling all queued build jobs");
+        queue.clear();
     }
 
     /**
      * Cancel all running build jobs.
      */
     public void cancelAllRunningBuildJobs() {
-        sharedLock.lock();
-        try {
-            for (BuildJobQueueItem buildJob : processingJobs.values()) {
-                cancelBuildJob(buildJob.id());
-            }
-        }
-        finally {
-            sharedLock.unlock();
+        for (BuildJobQueueItem buildJob : processingJobs.values()) {
+            cancelBuildJob(buildJob.id());
         }
-
     }
 
     /**
@@ -220,13 +194,7 @@ public void cancelAllRunningBuildJobs() {
      * @param agentName name of the agent
      */
     public void cancelAllRunningBuildJobsForAgent(String agentName) {
-        sharedLock.lock();
-        try {
-            processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgentAddress(), agentName)).forEach(job -> cancelBuildJob(job.id()));
-        }
-        finally {
-            sharedLock.unlock();
-        }
+        processingJobs.values().stream().filter(job -> Objects.equals(job.buildAgentAddress(), agentName)).forEach(job -> cancelBuildJob(job.id()));
     }
 
     /**
@@ -235,19 +203,13 @@ public void cancelAllRunningBuildJobsForAgent(String agentName) {
      * @param courseId id of the course
      */
     public void cancelAllQueuedBuildJobsForCourse(long courseId) {
-        sharedLock.lock();
-        try {
-            List<BuildJobQueueItem> toRemove = new ArrayList<>();
-            for (BuildJobQueueItem job : queue) {
-                if (job.courseId() == courseId) {
-                    toRemove.add(job);
-                }
+        List<BuildJobQueueItem> toRemove = new ArrayList<>();
+        for (BuildJobQueueItem job : queue) {
+            if (job.courseId() == courseId) {
+                toRemove.add(job);
             }
-            queue.removeAll(toRemove);
-        }
-        finally {
-            sharedLock.unlock();
         }
+        queue.removeAll(toRemove);
     }
 
     /**
@@ -269,25 +231,19 @@ public void cancelAllRunningBuildJobsForCourse(long courseId) {
      * @param participationId id of the participation
      */
     public void cancelAllJobsForParticipation(long participationId) {
-        sharedLock.lock();
-        try {
-            List<BuildJobQueueItem> toRemove = new ArrayList<>();
-            for (BuildJobQueueItem queuedJob : queue) {
-                if (queuedJob.participationId() == participationId) {
-                    toRemove.add(queuedJob);
-                }
+        List<BuildJobQueueItem> toRemove = new ArrayList<>();
+        for (BuildJobQueueItem queuedJob : queue) {
+            if (queuedJob.participationId() == participationId) {
+                toRemove.add(queuedJob);
             }
-            queue.removeAll(toRemove);
+        }
+        queue.removeAll(toRemove);
 
-            for (BuildJobQueueItem runningJob : processingJobs.values()) {
-                if (runningJob.participationId() == participationId) {
-                    cancelBuildJob(runningJob.id());
-                }
+        for (BuildJobQueueItem runningJob : processingJobs.values()) {
+            if (runningJob.participationId() == participationId) {
+                cancelBuildJob(runningJob.id());
             }
         }
-        finally {
-            sharedLock.unlock();
-        }
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
index fcfc9357ce21..305c68a46c9b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/BuildJobExecutionService.java
@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.UUID;
 
 import jakarta.annotation.Nullable;
 
@@ -36,6 +37,7 @@
 import de.tum.in.www1.artemis.domain.VcsRepositoryUri;
 import de.tum.in.www1.artemis.domain.enumeration.RepositoryType;
 import de.tum.in.www1.artemis.domain.enumeration.StaticCodeAnalysisTool;
+import de.tum.in.www1.artemis.exception.GitException;
 import de.tum.in.www1.artemis.exception.LocalCIException;
 import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildJobQueueItem;
 import de.tum.in.www1.artemis.service.connectors.localci.dto.BuildResult;
@@ -64,6 +66,8 @@ public class BuildJobExecutionService {
 
     private final BuildLogsMap buildLogsMap;
 
+    private static final int MAX_CLONE_RETRIES = 3;
+
     @Value("${artemis.version-control.default-branch:main}")
     private String defaultBranch;
 
@@ -275,18 +279,19 @@ private BuildResult runScriptAndParseResults(BuildJobQueueItem buildJob, String
             buildJobContainerService.stopContainer(containerName);
 
             // Delete the cloned repositories
-            deleteCloneRepo(assignmentRepositoryUri, assignmentRepoCommitHash, buildJob.id());
-            deleteCloneRepo(testRepositoryUri, assignmentRepoCommitHash, buildJob.id());
+            deleteCloneRepo(assignmentRepositoryUri, assignmentRepoCommitHash, buildJob.id(), assignmentRepositoryPath);
+            deleteCloneRepo(testRepositoryUri, assignmentRepoCommitHash, buildJob.id(), testsRepositoryPath);
             // do not try to delete the temp repository if it does not exist or is the same as the assignment reposity
             if (solutionRepositoryUri != null && !Objects.equals(assignmentRepositoryUri.repositorySlug(), solutionRepositoryUri.repositorySlug())) {
-                deleteCloneRepo(solutionRepositoryUri, assignmentRepoCommitHash, buildJob.id());
+                deleteCloneRepo(solutionRepositoryUri, assignmentRepoCommitHash, buildJob.id(), solutionRepositoryPath);
             }
-            for (VcsRepositoryUri auxiliaryRepositoryUri : auxiliaryRepositoriesUris) {
-                deleteCloneRepo(auxiliaryRepositoryUri, assignmentRepoCommitHash, buildJob.id());
+
+            for (int i = 0; i < auxiliaryRepositoriesUris.length; i++) {
+                deleteCloneRepo(auxiliaryRepositoriesUris[i], assignmentRepoCommitHash, buildJob.id(), auxiliaryRepositoriesPaths[i]);
             }
 
             try {
-                FileUtils.deleteDirectory(Path.of(CHECKED_OUT_REPOS_TEMP_DIR, assignmentRepoCommitHash).toFile());
+                deleteRepoParentFolder(assignmentRepoCommitHash, assignmentRepositoryPath, testRepoCommitHash, testsRepositoryPath);
             }
             catch (IOException e) {
                 msg = "Could not delete " + CHECKED_OUT_REPOS_TEMP_DIR + " directory";
@@ -453,32 +458,52 @@ private BuildResult constructBuildResult(List<BuildResult.LocalCITestJobDTO> fai
     }
 
     private Path cloneRepository(VcsRepositoryUri repositoryUri, @Nullable String commitHash, boolean checkout, String buildJobId) {
+        Repository repository = null;
+
+        for (int attempt = 1; attempt <= MAX_CLONE_RETRIES; attempt++) {
+            try {
+                // Generate a random folder name for the repository parent folder if the commit hash is null. This is to avoid conflicts when cloning multiple repositories.
+                String repositoryParentFolder = commitHash != null ? commitHash : UUID.randomUUID().toString();
+                // Clone the assignment repository into a temporary directory
+                repository = buildJobGitService.cloneRepository(repositoryUri,
+                        Path.of(CHECKED_OUT_REPOS_TEMP_DIR, repositoryParentFolder, repositoryUri.folderNameForRepositoryUri()));
+
+                break;
+            }
+            catch (GitAPIException | IOException | URISyntaxException e) {
+                if (attempt >= MAX_CLONE_RETRIES) {
+                    String msg = "Error while cloning repository " + repositoryUri.repositorySlug() + " with uri " + repositoryUri + " after " + MAX_CLONE_RETRIES + " attempts";
+                    buildLogsMap.appendBuildLogEntry(buildJobId, msg);
+                    throw new LocalCIException(msg, e);
+                }
+                buildLogsMap.appendBuildLogEntry(buildJobId,
+                        "Attempt " + attempt + " to clone repository " + repositoryUri.repositorySlug() + " failed due to " + e.getMessage() + ". Retrying...");
+            }
+        }
+
         try {
-            // Clone the assignment repository into a temporary directory
-            // TODO: use a random value if commitHash is null
-            Repository repository = buildJobGitService.cloneRepository(repositoryUri, Path.of(CHECKED_OUT_REPOS_TEMP_DIR, commitHash, repositoryUri.folderNameForRepositoryUri()));
             if (checkout && commitHash != null) {
                 // Checkout the commit hash
                 buildJobGitService.checkoutRepositoryAtCommit(repository, commitHash);
             }
+
             // if repository is not closed, it causes weird IO issues when trying to delete the repository later on
             // java.io.IOException: Unable to delete file: ...\.git\objects\pack\...
             repository.closeBeforeDelete();
             return repository.getLocalPath();
         }
-        catch (GitAPIException | IOException | URISyntaxException e) {
-            String msg = "Error while cloning repository " + repositoryUri.repositorySlug() + " with uri " + repositoryUri;
+        catch (GitException e) {
+            String msg = "Error while checking out commit " + commitHash + " in repository " + repositoryUri.repositorySlug();
             buildLogsMap.appendBuildLogEntry(buildJobId, msg);
             throw new LocalCIException(msg, e);
         }
     }
 
-    private void deleteCloneRepo(VcsRepositoryUri repositoryUri, @Nullable String commitHash, String buildJobId) {
+    private void deleteCloneRepo(VcsRepositoryUri repositoryUri, @Nullable String commitHash, String buildJobId, Path repositoryPath) {
         String msg;
         try {
-            // TODO: handle the case when commitHash is null
-            Repository repository = buildJobGitService.getExistingCheckedOutRepositoryByLocalPath(
-                    Paths.get(CHECKED_OUT_REPOS_TEMP_DIR, commitHash, repositoryUri.folderNameForRepositoryUri()), repositoryUri, defaultBranch);
+            Path repositoryPathForDeletion = commitHash != null ? Paths.get(CHECKED_OUT_REPOS_TEMP_DIR, commitHash, repositoryUri.folderNameForRepositoryUri()) : repositoryPath;
+            Repository repository = buildJobGitService.getExistingCheckedOutRepositoryByLocalPath(repositoryPathForDeletion, repositoryUri, defaultBranch);
             if (repository == null) {
                 msg = "Repository with commit hash " + commitHash + " not found";
                 buildLogsMap.appendBuildLogEntry(buildJobId, msg);
@@ -497,4 +522,16 @@ private void deleteCloneRepo(VcsRepositoryUri repositoryUri, @Nullable String co
             throw new LocalCIException(msg, e);
         }
     }
+
+    private void deleteRepoParentFolder(String assignmentRepoCommitHash, Path assignmentRepositoryPath, String testRepoCommitHash, Path testsRepositoryPath) throws IOException {
+        Path assignmentRepo = assignmentRepoCommitHash != null ? Path.of(CHECKED_OUT_REPOS_TEMP_DIR, assignmentRepoCommitHash)
+                : getRepositoryParentFolderPath(assignmentRepositoryPath);
+        FileUtils.deleteDirectory(assignmentRepo.toFile());
+        Path testRepo = testRepoCommitHash != null ? Path.of(CHECKED_OUT_REPOS_TEMP_DIR, testRepoCommitHash) : getRepositoryParentFolderPath(testsRepositoryPath);
+        FileUtils.deleteDirectory(testRepo.toFile());
+    }
+
+    private Path getRepositoryParentFolderPath(Path repoPath) {
+        return repoPath.getParent().getParent();
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
index 853b89493827..d19d0fae96ba 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/buildagent/SharedQueueProcessingService.java
@@ -32,7 +32,6 @@
 import com.hazelcast.collection.ItemEvent;
 import com.hazelcast.collection.ItemListener;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.cp.lock.FencedLock;
 import com.hazelcast.map.IMap;
 
 import de.tum.in.www1.artemis.domain.BuildLogEntry;
@@ -65,11 +64,6 @@ public class SharedQueueProcessingService {
 
     private final BuildAgentSshKeyService buildAgentSSHKeyService;
 
-    /**
-     * Lock to prevent multiple nodes from processing the same build job.
-     */
-    private FencedLock sharedLock;
-
     private IQueue<BuildJobQueueItem> queue;
 
     private IQueue<ResultQueueItem> resultQueue;
@@ -104,7 +98,6 @@ public SharedQueueProcessingService(@Qualifier("hazelcastInstance") HazelcastIns
     public void init() {
         this.buildAgentInformation = this.hazelcastInstance.getMap("buildAgentInformation");
         this.processingJobs = this.hazelcastInstance.getMap("processingJobs");
-        this.sharedLock = this.hazelcastInstance.getCPSubsystem().getLock("buildJobQueueLock");
         this.queue = this.hazelcastInstance.getQueue("buildJobQueue");
         this.resultQueue = this.hazelcastInstance.getQueue("buildResultQueue");
         this.listenerId = this.queue.addItemListener(new QueuedBuildJobItemListener(), true);
@@ -176,14 +169,8 @@ private void checkAvailabilityAndProcessNextBuild() {
                 return;
             }
 
-            // Lock the queue to prevent multiple nodes from processing the same build job
-            sharedLock.lock();
-            try {
-                buildJob = addToProcessingJobs();
-            }
-            finally {
-                sharedLock.unlock();
-            }
+            buildJob = addToProcessingJobs();
+
             processBuild(buildJob);
         }
         catch (RejectedExecutionException e) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
index bd7b778439a9..0dd67f46a739 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/lti/LtiService.java
@@ -11,6 +11,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseCookie;
@@ -42,6 +43,9 @@
 @Profile("lti")
 public class LtiService {
 
+    @Value("${artemis.lti.trustExternalLTISystems:false}")
+    private boolean trustExternalLTISystems;
+
     public static final String LTI_GROUP_NAME = "lti";
 
     protected static final List<SimpleGrantedAuthority> SIMPLE_USER_LIST_AUTHORITY = Collections.singletonList(new SimpleGrantedAuthority(Role.STUDENT.getAuthority()));
@@ -105,6 +109,14 @@ public void authenticateLtiUser(String email, String username, String firstName,
         // 2. Case: Lookup user with the LTI email address and make sure it's not in use
         if (artemisAuthenticationProvider.getUsernameForEmail(email).isPresent() || userRepository.findOneByEmailIgnoreCase(email).isPresent()) {
             log.info("User with email {} already exists. Email is already in use.", email);
+
+            if (trustExternalLTISystems) {
+                log.info("Trusting external LTI system. Authenticating user with email: {}", email);
+                User user = userRepository.findUserWithGroupsAndAuthoritiesByEmail(email).orElseThrow();
+                SecurityContextHolder.getContext().setAuthentication(new UsernamePasswordAuthenticationToken(user.getLogin(), user.getPassword(), user.getGrantedAuthorities()));
+                return;
+            }
+
             throw new LtiEmailAlreadyInUseException();
         }
 
@@ -179,23 +191,16 @@ private void addUserToExerciseGroup(User user, Course course) {
      * @param response             the response to add the JWT cookie to
      */
     public void buildLtiResponse(UriComponentsBuilder uriComponentsBuilder, HttpServletResponse response) {
-        // TODO SK: why do we logout the user here if it was already activated?
-
         User user = userRepository.getUser();
 
         if (!user.getActivated()) {
-            log.info("User is not activated. Adding JWT cookie for activation.");
-            log.info("Add JWT cookie so the user will be logged in");
-            ResponseCookie responseCookie = jwtCookieService.buildLoginCookie(true);
-            response.addHeader(HttpHeaders.SET_COOKIE, responseCookie.toString());
-
+            log.info("User is not activated. Adding initialize parameter to query.");
             uriComponentsBuilder.queryParam("initialize", "");
         }
-        else {
-            log.info("User is activated. Adding JWT cookie for logout.");
-            prepareLogoutCookie(response);
-            uriComponentsBuilder.queryParam("ltiSuccessLoginRequired", user.getLogin());
-        }
+
+        log.info("Add/Update JWT cookie so the user will be logged in.");
+        ResponseCookie responseCookie = jwtCookieService.buildLoginCookie(true);
+        response.addHeader(HttpHeaders.SET_COOKIE, responseCookie.toString());
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java
index 1c9320aed1d0..24dc20bffa65 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisJobService.java
@@ -2,6 +2,7 @@
 
 import java.security.SecureRandom;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 
 import jakarta.annotation.PostConstruct;
 import jakarta.servlet.http.HttpServletRequest;
@@ -19,6 +20,7 @@
 import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.PyrisJob;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
+import de.tum.in.www1.artemis.web.rest.errors.ConflictException;
 
 /**
  * The PyrisJobService class is responsible for managing Pyris jobs in the Artemis system.
@@ -58,6 +60,20 @@ public void init() {
         jobMap = hazelcastInstance.getMap("pyris-job-map");
     }
 
+    /**
+     * Creates a token for an arbitrary job, runs the provided function with the token as an argument,
+     * and stores the job in the job map.
+     *
+     * @param tokenToJobFunction the function to run with the token
+     * @return the generated token
+     */
+    public String createTokenForJob(Function<String, PyrisJob> tokenToJobFunction) {
+        var token = generateJobIdToken();
+        var job = tokenToJobFunction.apply(token);
+        jobMap.put(token, job);
+        return token;
+    }
+
     public String addExerciseChatJob(Long courseId, Long exerciseId, Long sessionId) {
         var token = generateJobIdToken();
         var job = new ExerciseChatJob(token, courseId, exerciseId, sessionId);
@@ -111,13 +127,15 @@ public PyrisJob getJob(String token) {
      * 2. Retrieves the PyrisJob object associated with the provided token.
      * 3. Throws an AccessForbiddenException if the token is invalid or not provided.
      * <p>
-     * The token was previously generated via {@link #addJob(Long, Long, Long)}
+     * The token was previously generated via {@link #createTokenForJob(Function)}
      *
-     * @param request the HttpServletRequest object representing the incoming request
+     * @param request  the HttpServletRequest object representing the incoming request
+     * @param jobClass the class of the PyrisJob object to cast the retrieved job to
+     * @param <Job>    the type of the PyrisJob object
      * @return the PyrisJob object associated with the token
      * @throws AccessForbiddenException if the token is invalid or not provided
      */
-    public PyrisJob getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest request) {
+    public <Job extends PyrisJob> Job getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest request, Class<Job> jobClass) {
         var authHeader = request.getHeader("Authorization");
         if (!authHeader.startsWith("Bearer ")) {
             throw new AccessForbiddenException("No valid token provided");
@@ -127,7 +145,10 @@ public PyrisJob getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest requ
         if (job == null) {
             throw new AccessForbiddenException("No valid token provided");
         }
-        return job;
+        if (!jobClass.isInstance(job)) {
+            throw new ConflictException("Run ID is not a " + jobClass.getSimpleName(), "Job", "invalidRunId");
+        }
+        return jobClass.cast(job);
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java
index 54c8d2daf5f3..a2fc3f1c3ce4 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisPipelineService.java
@@ -6,8 +6,8 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,21 +19,19 @@
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.competency.CompetencyJol;
-import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
 import de.tum.in.www1.artemis.repository.CourseRepository;
 import de.tum.in.www1.artemis.repository.StudentParticipationRepository;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionSettingsDTO;
-import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatPipelineExecutionBaseDataDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.course.PyrisCourseChatPipelineExecutionDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisCourseDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisExtendedCourseDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.data.PyrisUserDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
-import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState;
 import de.tum.in.www1.artemis.service.iris.exception.IrisException;
 import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService;
 import de.tum.in.www1.artemis.service.metrics.LearningMetricsService;
@@ -79,69 +77,48 @@ public PyrisPipelineService(PyrisConnectorService pyrisConnectorService, PyrisJo
     }
 
     /**
-     * Executes a chat pipeline for a given chat session subtype.
-     * This method prepares the execution data, executes the specified pipeline, and handles the state updates.
+     * Executes a pipeline on Pyris, identified by the given name and variant.
+     * The pipeline execution is tracked by a unique job token, which must be provided by the caller.
+     * The caller must additionally provide a mapper function to create the concrete DTO type for this pipeline from the base DTO.
+     * The status of the pipeline execution is updated via a consumer that accepts a list of stages. This method will
+     * call the consumer with the initial stages of the pipeline execution. Later stages will be sent back from Pyris,
+     * and need to be handled in the endpoint that receives the status updates.
      * <p>
-     * The general idea of this being generic is that the pipeline execution is the same for all chat sessions,
-     * but the specific data required for the pipeline execution is different for each session / pipeline type.
-     * Therefore, the specific data is provided by a function that accepts the basic chat data and returns the more specific data.
      *
-     * @param variant              the variant of the pipeline
-     * @param session              the active chat session, must inherit from {@link IrisChatSession}
-     * @param pipelineName         the name of the pipeline to be executed
-     * @param executionDtoSupplier a function that accepts basic chat data and returns an execution DTO specific to the pipeline being executed
-     * @param jobTokenSupplier     a supplier that provides a unique job token for tracking the pipeline execution
-     * @param <T>                  the type of the chat session
-     * @param <U>                  the type of the execution DTO
+     * @param name          the name of the pipeline to be executed
+     * @param variant       the variant of the pipeline
+     * @param jobToken      a unique job token for tracking the pipeline execution
+     * @param dtoMapper     a function to create the concrete DTO type for this pipeline from the base DTO
+     * @param statusUpdater a consumer to update the status of the pipeline execution
      */
-    private <T extends IrisChatSession, U> void executeChatPipeline(String variant, T session, String pipelineName,
-            Function<PyrisChatPipelineExecutionBaseDataDTO, U> executionDtoSupplier, Supplier<String> jobTokenSupplier) {
-
-        // Retrieve the unique job token for this pipeline execution
-        var jobToken = jobTokenSupplier.get();
-
-        // Set up initial pipeline execution settings with the server base URL
-        var settingsDTO = new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl);
-
+    public void executePipeline(String name, String variant, String jobToken, Function<PyrisPipelineExecutionDTO, Object> dtoMapper, Consumer<List<PyrisStageDTO>> statusUpdater) {
         // Define the preparation stages of pipeline execution with their initial states
         // There will be more stages added in Pyris later
-        var preparingRequestStageInProgress = new PyrisStageDTO("Preparing", 10, PyrisStageState.IN_PROGRESS, null);
-        var preparingRequestStageDone = new PyrisStageDTO("Preparing", 10, PyrisStageState.DONE, null);
-        var executingPipelineStageNotStarted = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.NOT_STARTED, null);
+        var preparing = new PyrisStageDTO("Preparing", 10, null, null);
+        var executing = new PyrisStageDTO("Executing pipeline", 30, null, null);
 
         // Send initial status update indicating that the preparation stage is in progress
-        irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageInProgress, executingPipelineStageNotStarted));
+        statusUpdater.accept(List.of(preparing.inProgress(), executing.notStarted()));
 
-        try {
-            // Prepare the base execution data for the pipeline.
-            // It is shared among chat pipelines and included as field "base" in the specific execution DTOs.
-            var base = new PyrisChatPipelineExecutionBaseDataDTO(pyrisDTOService.toPyrisMessageDTOList(session.getMessages()), new PyrisUserDTO(session.getUser()), settingsDTO,
-                    List.of(preparingRequestStageDone) // The initial stage is done when the request arrives at Pyris
-            );
-
-            // Prepare the specific execution data for the pipeline
-            // This is implementation-specific and includes additional data required for the pipeline
-            // Implementations must deliver the base data, too
-            U executionDTO = executionDtoSupplier.apply(base);
+        var baseDto = new PyrisPipelineExecutionDTO(new PyrisPipelineExecutionSettingsDTO(jobToken, List.of(), artemisBaseUrl), List.of(preparing.done()));
+        var pipelineDto = dtoMapper.apply(baseDto);
 
+        try {
             // Send a status update that preparation is done and pipeline execution is starting
-            var executingPipelineStageInProgress = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.IN_PROGRESS, null);
-            irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageDone, executingPipelineStageInProgress));
+            statusUpdater.accept(List.of(preparing.done(), executing.inProgress()));
 
             try {
                 // Execute the pipeline using the connector service
-                pyrisConnectorService.executePipeline(pipelineName, variant, executionDTO);
+                pyrisConnectorService.executePipeline(name, variant, pipelineDto);
             }
             catch (PyrisConnectorException | IrisException e) {
-                log.error("Failed to execute " + pipelineName + " pipeline", e);
-                var executingPipelineStageFailed = new PyrisStageDTO("Executing pipeline", 30, PyrisStageState.ERROR, "An internal error occurred");
-                irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageDone, executingPipelineStageFailed));
+                log.error("Failed to execute {} pipeline", name, e);
+                statusUpdater.accept(List.of(preparing.done(), executing.error("An internal error occurred")));
             }
         }
         catch (Exception e) {
-            log.error("Failed to prepare " + pipelineName + " pipeline execution", e);
-            var preparingRequestStageFailed = new PyrisStageDTO("Preparing request", 10, PyrisStageState.ERROR, "An internal error occurred");
-            irisChatWebsocketService.sendStatusUpdate(session, List.of(preparingRequestStageFailed, executingPipelineStageNotStarted));
+            log.error("Failed to prepare {} pipeline execution", name, e);
+            statusUpdater.accept(List.of(preparing.error("An internal error occurred"), executing.notStarted()));
         }
     }
 
@@ -157,14 +134,29 @@ private <T extends IrisChatSession, U> void executeChatPipeline(String variant,
      * @param latestSubmission the latest submission of the student
      * @param exercise         the programming exercise
      * @param session          the chat session
-     * @see PyrisPipelineService#executeChatPipeline for more details on the pipeline execution process.
+     * @see PyrisPipelineService#executePipeline for more details on the pipeline execution process.
      */
     public void executeExerciseChatPipeline(String variant, Optional<ProgrammingSubmission> latestSubmission, ProgrammingExercise exercise, IrisExerciseChatSession session) {
-        executeChatPipeline(variant, session, "tutor-chat", // TODO: Rename this to 'exercise-chat' with next breaking Pyris version
-                base -> new PyrisExerciseChatPipelineExecutionDTO(latestSubmission.map(pyrisDTOService::toPyrisSubmissionDTO).orElse(null),
-                        pyrisDTOService.toPyrisProgrammingExerciseDTO(exercise), new PyrisCourseDTO(exercise.getCourseViaExerciseGroupOrCourseMember()), base.chatHistory(),
-                        base.user(), base.settings(), base.initialStages()),
-                () -> pyrisJobService.addExerciseChatJob(exercise.getCourseViaExerciseGroupOrCourseMember().getId(), exercise.getId(), session.getId()));
+        // @formatter:off
+        executePipeline(
+                "tutor-chat", // TODO: Rename this to 'exercise-chat' with next breaking Pyris version
+                variant,
+                pyrisJobService.addExerciseChatJob(exercise.getCourseViaExerciseGroupOrCourseMember().getId(), exercise.getId(), session.getId()),
+                executionDto -> {
+                    var course = exercise.getCourseViaExerciseGroupOrCourseMember();
+                    return new PyrisExerciseChatPipelineExecutionDTO(
+                            latestSubmission.map(pyrisDTOService::toPyrisSubmissionDTO).orElse(null),
+                            pyrisDTOService.toPyrisProgrammingExerciseDTO(exercise),
+                            new PyrisCourseDTO(course),
+                            pyrisDTOService.toPyrisMessageDTOList(session.getMessages()),
+                            new PyrisUserDTO(session.getUser()),
+                            executionDto.settings(),
+                            executionDto.initialStages()
+                    );
+                },
+                stages -> irisChatWebsocketService.sendStatusUpdate(session, stages)
+        );
+        // @formatter:on
     }
 
     /**
@@ -178,17 +170,31 @@ public void executeExerciseChatPipeline(String variant, Optional<ProgrammingSubm
      * @param variant       the variant of the pipeline
      * @param session       the chat session
      * @param competencyJol if this is due to a JoL set event, this must be the newly created competencyJoL
-     * @see PyrisPipelineService#executeChatPipeline for more details on the pipeline execution process.
+     * @see PyrisPipelineService#executePipeline for more details on the pipeline execution process.
      */
     public void executeCourseChatPipeline(String variant, IrisCourseChatSession session, CompetencyJol competencyJol) {
+        // @formatter:off
         var courseId = session.getCourse().getId();
         var studentId = session.getUser().getId();
-        executeChatPipeline(variant, session, "course-chat", base -> {
-            var fullCourse = loadCourseWithParticipationOfStudent(courseId, studentId);
-            return new PyrisCourseChatPipelineExecutionDTO(PyrisExtendedCourseDTO.of(fullCourse),
-                    learningMetricsService.getStudentCourseMetrics(session.getUser().getId(), courseId), competencyJol == null ? null : CompetencyJolDTO.of(competencyJol),
-                    base.chatHistory(), base.user(), base.settings(), base.initialStages());
-        }, () -> pyrisJobService.addCourseChatJob(courseId, session.getId()));
+        executePipeline(
+                "course-chat",
+                variant,
+                pyrisJobService.addCourseChatJob(courseId, session.getId()),
+                executionDto -> {
+                    var fullCourse = loadCourseWithParticipationOfStudent(courseId, studentId);
+                    return new PyrisCourseChatPipelineExecutionDTO(
+                            PyrisExtendedCourseDTO.of(fullCourse),
+                            learningMetricsService.getStudentCourseMetrics(session.getUser().getId(), courseId),
+                            competencyJol == null ? null : CompetencyJolDTO.of(competencyJol),
+                            pyrisDTOService.toPyrisMessageDTOList(session.getMessages()),
+                            new PyrisUserDTO(session.getUser()),
+                            executionDto.settings(), // flatten the execution dto here
+                            executionDto.initialStages()
+                    );
+                },
+                stages -> irisChatWebsocketService.sendStatusUpdate(session, stages)
+        );
+        // @formatter:on
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java
index 759e62ca9e35..0966455b3533 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/PyrisStatusUpdateService.java
@@ -1,17 +1,22 @@
 package de.tum.in.www1.artemis.service.connectors.pyris;
 
+import java.util.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState;
+import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob;
+import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService;
 import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService;
 import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService;
 
@@ -25,13 +30,16 @@ public class PyrisStatusUpdateService {
 
     private final IrisCourseChatSessionService courseChatSessionService;
 
+    private final IrisCompetencyGenerationService competencyGenerationService;
+
     private static final Logger log = LoggerFactory.getLogger(PyrisStatusUpdateService.class);
 
     public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseChatSessionService irisExerciseChatSessionService,
-            IrisCourseChatSessionService courseChatSessionService) {
+            IrisCourseChatSessionService courseChatSessionService, IrisCompetencyGenerationService competencyGenerationService) {
         this.pyrisJobService = pyrisJobService;
         this.irisExerciseChatSessionService = irisExerciseChatSessionService;
         this.courseChatSessionService = courseChatSessionService;
+        this.competencyGenerationService = competencyGenerationService;
     }
 
     /**
@@ -43,7 +51,7 @@ public PyrisStatusUpdateService(PyrisJobService pyrisJobService, IrisExerciseCha
     public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) {
         irisExerciseChatSessionService.handleStatusUpdate(job, statusUpdate);
 
-        removeJobIfTerminated(statusUpdate, job.jobId());
+        removeJobIfTerminated(statusUpdate.stages(), job.jobId());
     }
 
     /**
@@ -56,7 +64,20 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta
     public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statusUpdate) {
         courseChatSessionService.handleStatusUpdate(job, statusUpdate);
 
-        removeJobIfTerminated(statusUpdate, job.jobId());
+        removeJobIfTerminated(statusUpdate.stages(), job.jobId());
+    }
+
+    /**
+     * Handles the status update of a competency extraction job and forwards it to
+     * {@link de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService#handleStatusUpdate(String, long, PyrisCompetencyStatusUpdateDTO)}
+     *
+     * @param job          the job that is updated
+     * @param statusUpdate the status update
+     */
+    public void handleStatusUpdate(CompetencyExtractionJob job, PyrisCompetencyStatusUpdateDTO statusUpdate) {
+        competencyGenerationService.handleStatusUpdate(job.userLogin(), job.courseId(), statusUpdate);
+
+        removeJobIfTerminated(statusUpdate.stages(), job.jobId());
     }
 
     /**
@@ -66,11 +87,11 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu
      *
      * @see PyrisStageState#isTerminal()
      *
-     * @param statusUpdate the status update
-     * @param job          the job to remove
+     * @param stages the stages of the status update
+     * @param job    the job to remove
      */
-    private void removeJobIfTerminated(PyrisChatStatusUpdateDTO statusUpdate, String job) {
-        var isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal);
+    private void removeJobIfTerminated(List<PyrisStageDTO> stages, String job) {
+        var isDone = stages.stream().map(PyrisStageDTO::state).allMatch(PyrisStageState::isTerminal);
         if (isDone) {
             pyrisJobService.removeJob(job);
         }
@@ -85,10 +106,6 @@ private void removeJobIfTerminated(PyrisChatStatusUpdateDTO statusUpdate, String
      */
     public void handleStatusUpdate(IngestionWebhookJob job, PyrisLectureIngestionStatusUpdateDTO statusUpdate) {
         statusUpdate.stages().forEach(stage -> log.info(stage.name() + ":" + stage.message()));
-        boolean isDone = statusUpdate.stages().stream().map(PyrisStageDTO::state)
-                .allMatch(state -> state == PyrisStageState.DONE || state == PyrisStageState.ERROR || state == PyrisStageState.SKIPPED);
-        if (isDone) {
-            pyrisJobService.removeJob(job.jobId());
-        }
+        removeJobIfTerminated(statusUpdate.stages(), job.jobId());
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java
new file mode 100644
index 000000000000..86c5f01c0479
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/PyrisPipelineExecutionDTO.java
@@ -0,0 +1,11 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PyrisPipelineExecutionDTO(PyrisPipelineExecutionSettingsDTO settings, List<PyrisStageDTO> initialStages) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java
new file mode 100644
index 000000000000..504fe8aa92fa
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionInputDTO.java
@@ -0,0 +1,7 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PyrisCompetencyExtractionInputDTO(String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java
new file mode 100644
index 000000000000..64979fa9125d
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyExtractionPipelineExecutionDTO.java
@@ -0,0 +1,20 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisPipelineExecutionDTO;
+
+/**
+ * DTO to execute the Iris competency extraction pipeline on Pyris
+ *
+ * @param execution           The pipeline execution details
+ * @param courseDescription   The description of the course
+ * @param currentCompetencies The current competencies of the course (to avoid re-extraction)
+ * @param taxonomyOptions     The taxonomy options to use
+ * @param maxN                The maximum number of competencies to extract
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PyrisCompetencyExtractionPipelineExecutionDTO(PyrisPipelineExecutionDTO execution, String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies,
+        CompetencyTaxonomy[] taxonomyOptions, int maxN) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java
new file mode 100644
index 000000000000..897b9b7ca3ce
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyRecommendationDTO.java
@@ -0,0 +1,17 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy;
+
+/**
+ * DTO for the Iris competency generation feature.
+ * A competency recommendation is just a title, description and taxonomy generated by Iris.
+ *
+ * @param title       The title of the competency
+ * @param description The description of the competency
+ * @param taxonomy    The taxonomy of the competency
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PyrisCompetencyRecommendationDTO(String title, String description, CompetencyTaxonomy taxonomy) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java
new file mode 100644
index 000000000000..967dfcd51906
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/competency/PyrisCompetencyStatusUpdateDTO.java
@@ -0,0 +1,19 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.dto.competency;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
+
+/**
+ * DTO for the Iris competency generation feature.
+ * Pyris sends callback updates back to Artemis during generation of competencies,
+ * which are then forwarded to the user via Websockets.
+ *
+ * @param stages List of stages of the generation process
+ * @param result List of competencies recommendations that have been generated so far
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record PyrisCompetencyStatusUpdateDTO(List<PyrisStageDTO> stages, List<PyrisCompetencyRecommendationDTO> result) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java
index 39728eceb4a1..3bc3b2f9758a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageDTO.java
@@ -4,4 +4,25 @@
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record PyrisStageDTO(String name, int weight, PyrisStageState state, String message) {
+
+    public PyrisStageDTO notStarted() {
+        return new PyrisStageDTO(name, weight, PyrisStageState.NOT_STARTED, message);
+    }
+
+    public PyrisStageDTO inProgress() {
+        return new PyrisStageDTO(name, weight, PyrisStageState.IN_PROGRESS, message);
+    }
+
+    public PyrisStageDTO error(String message) {
+        return new PyrisStageDTO(name, weight, PyrisStageState.ERROR, message);
+    }
+
+    public PyrisStageDTO done() {
+        return new PyrisStageDTO(name, weight, PyrisStageState.DONE, message);
+    }
+
+    public PyrisStageDTO with(PyrisStageState state, String message) {
+        return new PyrisStageDTO(name, weight, state, message);
+    }
+
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java
index 10648687f7f2..0f2ace2f7e40 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/dto/status/PyrisStageState.java
@@ -5,15 +5,9 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public enum PyrisStageState {
 
-    NOT_STARTED(false), IN_PROGRESS(false), DONE(true), SKIPPED(true), ERROR(true);
-
-    private final boolean isTerminal;
-
-    PyrisStageState(boolean isTerminal) {
-        this.isTerminal = isTerminal;
-    }
+    NOT_STARTED, IN_PROGRESS, DONE, SKIPPED, ERROR;
 
     public boolean isTerminal() {
-        return isTerminal;
+        return this == DONE || this == SKIPPED || this == ERROR;
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java
new file mode 100644
index 000000000000..2a76f5a3b072
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/pyris/job/CompetencyExtractionJob.java
@@ -0,0 +1,22 @@
+package de.tum.in.www1.artemis.service.connectors.pyris.job;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+import de.tum.in.www1.artemis.domain.Course;
+
+/**
+ * A pyris job that extracts competencies from a course description.
+ *
+ * @param jobId     the job id
+ * @param courseId  the course in which the competencies are being extracted
+ * @param userLogin the user login of the user who started the job
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record CompetencyExtractionJob(String jobId, long courseId, String userLogin) implements PyrisJob {
+
+    @Override
+    public boolean canAccess(Course course) {
+        return course.getId().equals(courseId);
+    }
+
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java b/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java
index 97d02ca20df7..22c2cccd6546 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/dto/UserDTO.java
@@ -74,6 +74,8 @@ public class UserDTO extends AuditingEntityDTO {
 
     private String vcsAccessToken;
 
+    private ZonedDateTime vcsAccessTokenExpiryDate;
+
     private String sshPublicKey;
 
     private ZonedDateTime irisAccepted;
@@ -250,6 +252,14 @@ public void setVcsAccessToken(String vcsAccessToken) {
         this.vcsAccessToken = vcsAccessToken;
     }
 
+    public void setVcsAccessTokenExpiryDate(ZonedDateTime zoneDateTime) {
+        this.vcsAccessTokenExpiryDate = zoneDateTime;
+    }
+
+    public ZonedDateTime getVcsAccessTokenExpiryDate() {
+        return vcsAccessTokenExpiryDate;
+    }
+
     public String getSshPublicKey() {
         return sshPublicKey;
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java
new file mode 100644
index 000000000000..07be63259336
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisCompetencyGenerationService.java
@@ -0,0 +1,71 @@
+package de.tum.in.www1.artemis.service.iris;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import de.tum.in.www1.artemis.domain.Course;
+import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy;
+import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService;
+import de.tum.in.www1.artemis.service.connectors.pyris.PyrisPipelineService;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob;
+import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketService;
+
+/**
+ * Service to handle the Competency generation subsytem of Iris.
+ */
+@Service
+@Profile("iris")
+public class IrisCompetencyGenerationService {
+
+    private final PyrisPipelineService pyrisPipelineService;
+
+    private final IrisWebsocketService websocketService;
+
+    private final PyrisJobService pyrisJobService;
+
+    public IrisCompetencyGenerationService(PyrisPipelineService pyrisPipelineService, IrisWebsocketService websocketService, PyrisJobService pyrisJobService) {
+        this.pyrisPipelineService = pyrisPipelineService;
+        this.websocketService = websocketService;
+        this.pyrisJobService = pyrisJobService;
+    }
+
+    /**
+     * Executes the competency extraction pipeline on Pyris for a given course, user and course description
+     *
+     * @param user                the user for which the pipeline should be executed
+     * @param course              the course for which the pipeline should be executed
+     * @param courseDescription   the description of the course
+     * @param currentCompetencies the current competencies of the course (to avoid re-extraction)
+     */
+    public void executeCompetencyExtractionPipeline(User user, Course course, String courseDescription, PyrisCompetencyRecommendationDTO[] currentCompetencies) {
+        // @formatter:off
+        pyrisPipelineService.executePipeline(
+                "competency-extraction",
+                "default",
+                pyrisJobService.createTokenForJob(token -> new CompetencyExtractionJob(token, course.getId(), user.getLogin())),
+                executionDto -> new PyrisCompetencyExtractionPipelineExecutionDTO(executionDto, courseDescription, currentCompetencies, CompetencyTaxonomy.values(), 5),
+                stages -> websocketService.send(user.getLogin(), websocketTopic(course.getId()), new PyrisCompetencyStatusUpdateDTO(stages, null))
+        );
+        // @formatter:on
+    }
+
+    /**
+     * Takes a status update from Pyris containing a new competency extraction result and sends it to the client via websocket
+     *
+     * @param userLogin    the login of the user
+     * @param courseId     the id of the course
+     * @param statusUpdate the status update containing the new competency recommendations
+     */
+    public void handleStatusUpdate(String userLogin, long courseId, PyrisCompetencyStatusUpdateDTO statusUpdate) {
+        websocketService.send(userLogin, websocketTopic(courseId), statusUpdate);
+    }
+
+    private static String websocketTopic(long courseId) {
+        return "competencies/" + courseId;
+    }
+
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java
index dded30f4e42e..f455b13979fe 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/IrisSessionService.java
@@ -8,14 +8,12 @@
 
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.iris.message.IrisMessage;
-import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisCourseChatSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisHestiaSession;
 import de.tum.in.www1.artemis.domain.iris.session.IrisSession;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.service.iris.session.IrisChatBasedFeatureInterface;
-import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService;
 import de.tum.in.www1.artemis.service.iris.session.IrisCourseChatSessionService;
 import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService;
 import de.tum.in.www1.artemis.service.iris.session.IrisHestiaSessionService;
@@ -38,16 +36,12 @@ public class IrisSessionService {
 
     private final IrisHestiaSessionService irisHestiaSessionService;
 
-    private final IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService;
-
     public IrisSessionService(UserRepository userRepository, IrisExerciseChatSessionService irisExerciseChatSessionService,
-            IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService,
-            IrisCompetencyGenerationSessionService irisCompetencyGenerationSessionService) {
+            IrisCourseChatSessionService irisCourseChatSessionService, IrisHestiaSessionService irisHestiaSessionService) {
         this.userRepository = userRepository;
         this.irisExerciseChatSessionService = irisExerciseChatSessionService;
         this.irisCourseChatSessionService = irisCourseChatSessionService;
         this.irisHestiaSessionService = irisHestiaSessionService;
-        this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService;
     }
 
     /**
@@ -107,7 +101,7 @@ public <S extends IrisSession> void requestMessageFromIris(S session) {
     public <S extends IrisSession> void sendOverWebsocket(IrisMessage message, S session) {
         var wrapper = getIrisSessionSubService(session);
         if (wrapper.irisSubFeatureInterface instanceof IrisChatBasedFeatureInterface<S> chatWrapper) {
-            chatWrapper.sendOverWebsocket(message);
+            chatWrapper.sendOverWebsocket(session, message);
         }
         else {
             throw new BadRequestException("Invalid Iris session type " + message.getSession().getClass().getSimpleName());
@@ -143,8 +137,6 @@ private <S extends IrisSession> IrisSubFeatureWrapper<S> getIrisSessionSubServic
             case IrisExerciseChatSession chatSession -> (IrisSubFeatureWrapper<S>) new IrisSubFeatureWrapper<>(irisExerciseChatSessionService, chatSession);
             case IrisCourseChatSession courseChatSession -> (IrisSubFeatureWrapper<S>) new IrisSubFeatureWrapper<>(irisCourseChatSessionService, courseChatSession);
             case IrisHestiaSession hestiaSession -> (IrisSubFeatureWrapper<S>) new IrisSubFeatureWrapper<>(irisHestiaSessionService, hestiaSession);
-            case IrisCompetencyGenerationSession irisCompetencyGenerationSession ->
-                (IrisSubFeatureWrapper<S>) new IrisSubFeatureWrapper<>(irisCompetencyGenerationSessionService, irisCompetencyGenerationSession);
             case null, default -> throw new BadRequestException("Unknown Iris session type " + session.getClass().getSimpleName());
         };
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java
similarity index 84%
rename from src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java
rename to src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java
index 4c5067bde279..12fa282a3012 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisChatWebsocketDTO.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service.iris.websocket;
+package de.tum.in.www1.artemis.service.iris.dto;
 
 import java.util.List;
 import java.util.Objects;
@@ -20,7 +20,7 @@
  * @param stages        the stages of the Pyris pipeline
  */
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List<PyrisStageDTO> stages,
+public record IrisChatWebsocketDTO(IrisWebsocketMessageType type, IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List<PyrisStageDTO> stages,
         List<String> suggestions) {
 
     /**
@@ -31,7 +31,7 @@ public record IrisWebsocketDTO(IrisWebsocketMessageType type, IrisMessage messag
      * @param rateLimitInfo the rate limit information
      * @param stages        the stages of the Pyris pipeline
      */
-    public IrisWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List<PyrisStageDTO> stages, List<String> suggestions) {
+    public IrisChatWebsocketDTO(@Nullable IrisMessage message, IrisRateLimitService.IrisRateLimitInformation rateLimitInfo, List<PyrisStageDTO> stages, List<String> suggestions) {
         this(determineType(message), message, rateLimitInfo, stages, suggestions);
     }
 
@@ -62,7 +62,7 @@ public boolean equals(Object o) {
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
-        IrisWebsocketDTO that = (IrisWebsocketDTO) o;
+        IrisChatWebsocketDTO that = (IrisChatWebsocketDTO) o;
         return type == that.type && Objects.equals(message, that.message) && Objects.equals(rateLimitInfo, that.rateLimitInfo) && Objects.equals(stages, that.stages);
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java
index 2bef37bda870..c98fdb1663a0 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedChatSubSettingsDTO.java
@@ -10,6 +10,6 @@
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public record IrisCombinedChatSubSettingsDTO(boolean enabled, Integer rateLimit, Integer rateLimitTimeframeHours, @Nullable Set<String> allowedModels,
-        @Nullable String preferredModel, @Nullable IrisTemplate template) implements IrisCombinedSubSettingsInterface {
+        @Nullable String preferredModel, @Nullable IrisTemplate template) {
 
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java
index 7e2e399e530e..e924be92e773 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedCompetencyGenerationSubSettingsDTO.java
@@ -9,7 +9,6 @@
 import de.tum.in.www1.artemis.domain.iris.IrisTemplate;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set<String> allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template)
-        implements IrisCombinedSubSettingsInterface {
-
+public record IrisCombinedCompetencyGenerationSubSettingsDTO(boolean enabled, @Nullable Set<String> allowedModels, @Nullable String preferredModel,
+        @Nullable IrisTemplate template) {
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java
index 47861b16ebbb..315fb572194c 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedHestiaSubSettingsDTO.java
@@ -9,6 +9,5 @@
 import de.tum.in.www1.artemis.domain.iris.IrisTemplate;
 
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
-public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set<String> allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template)
-        implements IrisCombinedSubSettingsInterface {
+public record IrisCombinedHestiaSubSettingsDTO(boolean enabled, @Nullable Set<String> allowedModels, @Nullable String preferredModel, @Nullable IrisTemplate template) {
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java
deleted file mode 100644
index 79d23120b4fc..000000000000
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/dto/IrisCombinedSubSettingsInterface.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package de.tum.in.www1.artemis.service.iris.dto;
-
-import java.util.Set;
-
-import jakarta.annotation.Nullable;
-
-public interface IrisCombinedSubSettingsInterface {
-
-    boolean enabled();
-
-    @Nullable
-    Set<String> allowedModels();
-
-    @Nullable
-    String preferredModel();
-}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java
index db345e973fdb..2001cb7077b8 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisChatBasedFeatureInterface.java
@@ -8,9 +8,10 @@ public interface IrisChatBasedFeatureInterface<S extends IrisSession> extends Ir
     /**
      * Sends a message over the websocket to a specific user
      *
+     * @param session that the message belongs to
      * @param message that should be sent over the websocket
      */
-    void sendOverWebsocket(IrisMessage message);
+    void sendOverWebsocket(S session, IrisMessage message);
 
     /**
      * Sends a request to Iris to get a message for the given session.
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java
deleted file mode 100644
index d8ec1f901123..000000000000
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCompetencyGenerationSessionService.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package de.tum.in.www1.artemis.service.iris.session;
-
-import java.time.ZonedDateTime;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Profile;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.JsonNode;
-
-import de.tum.in.www1.artemis.domain.Course;
-import de.tum.in.www1.artemis.domain.User;
-import de.tum.in.www1.artemis.domain.competency.Competency;
-import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy;
-import de.tum.in.www1.artemis.domain.competency.CourseCompetency;
-import de.tum.in.www1.artemis.domain.iris.message.IrisMessage;
-import de.tum.in.www1.artemis.domain.iris.message.IrisMessageSender;
-import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent;
-import de.tum.in.www1.artemis.domain.iris.session.IrisCompetencyGenerationSession;
-import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettingsType;
-import de.tum.in.www1.artemis.repository.iris.IrisCompetencyGenerationSessionRepository;
-import de.tum.in.www1.artemis.repository.iris.IrisMessageRepository;
-import de.tum.in.www1.artemis.repository.iris.IrisSessionRepository;
-import de.tum.in.www1.artemis.security.Role;
-import de.tum.in.www1.artemis.service.AuthorizationCheckService;
-import de.tum.in.www1.artemis.service.connectors.pyris.PyrisConnectorService;
-import de.tum.in.www1.artemis.service.iris.IrisMessageService;
-import de.tum.in.www1.artemis.service.iris.settings.IrisSettingsService;
-
-/**
- * Service to handle the Competency generation subsytem of Iris.
- */
-@Service
-@Profile("iris")
-public class IrisCompetencyGenerationSessionService implements IrisButtonBasedFeatureInterface<IrisCompetencyGenerationSession, List<CourseCompetency>> {
-
-    private static final Logger log = LoggerFactory.getLogger(IrisCompetencyGenerationSessionService.class);
-
-    private final PyrisConnectorService pyrisConnectorService;
-
-    private final IrisSettingsService irisSettingsService;
-
-    private final IrisSessionRepository irisSessionRepository;
-
-    private final AuthorizationCheckService authCheckService;
-
-    private final IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository;
-
-    private final IrisMessageService irisMessageService;
-
-    private final IrisMessageRepository irisMessageRepository;
-
-    public IrisCompetencyGenerationSessionService(PyrisConnectorService pyrisConnectorService, IrisSettingsService irisSettingsService, IrisSessionRepository irisSessionRepository,
-            AuthorizationCheckService authCheckService, IrisCompetencyGenerationSessionRepository irisCompetencyGenerationSessionRepository, IrisMessageService irisMessageService,
-            IrisMessageRepository irisMessageRepository) {
-        this.pyrisConnectorService = pyrisConnectorService;
-        this.irisSettingsService = irisSettingsService;
-        this.irisSessionRepository = irisSessionRepository;
-        this.authCheckService = authCheckService;
-        this.irisCompetencyGenerationSessionRepository = irisCompetencyGenerationSessionRepository;
-        this.irisMessageService = irisMessageService;
-        this.irisMessageRepository = irisMessageRepository;
-    }
-
-    /**
-     * Creates a new Iris session for the given course and user or gets an existing one from the last hour.
-     *
-     * @param course The course to create the session for
-     * @param user   The user to create the session for
-     * @return The Iris session for the course
-     */
-    public IrisCompetencyGenerationSession getOrCreateSession(Course course, User user) {
-        var existingSession = irisCompetencyGenerationSessionRepository.findFirstByCourseIdAndUserIdOrderByCreationDateDesc(course.getId(), user.getId());
-        // Return the newest session if there is one and it is not older than 1 hour
-        if (existingSession != null && existingSession.getCreationDate().plusHours(1).isAfter(ZonedDateTime.now())) {
-            checkHasAccessTo(user, existingSession);
-            checkIsFeatureActivatedFor(existingSession);
-            return existingSession;
-        }
-
-        var irisSession = new IrisCompetencyGenerationSession();
-        irisSession.setCourse(course);
-        irisSession.setUser(user);
-        checkHasAccessTo(user, irisSession);
-        checkIsFeatureActivatedFor(irisSession);
-        irisSession = irisSessionRepository.save(irisSession);
-        return irisSession;
-    }
-
-    /**
-     * Adds a user text message to a given IRIS session
-     *
-     * @param session the IRIS session
-     * @param message the message to add
-     */
-    public void addUserTextMessageToSession(IrisCompetencyGenerationSession session, String message) {
-        var userMessage = new IrisMessage();
-        userMessage.setSender(IrisMessageSender.USER);
-        userMessage.addContent(new IrisTextMessageContent(message));
-        irisMessageService.saveMessage(userMessage, session, IrisMessageSender.USER);
-    }
-
-    // @formatter:off
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    record CompetencyGenerationDTO(
-            String courseDescription,
-            CompetencyTaxonomy[] taxonomyOptions
-    ) {}
-    // @formatter:on
-
-    @Override
-    public List<CourseCompetency> executeRequest(IrisCompetencyGenerationSession session) {
-        // TODO: Re-add in a future PR. Remember to reenable the test cases!
-        return null;
-    }
-
-    @Override
-    public void checkHasAccessTo(User user, IrisCompetencyGenerationSession irisSession) {
-        authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.EDITOR, irisSession.getCourse(), user);
-    }
-
-    @Override
-    public void checkIsFeatureActivatedFor(IrisCompetencyGenerationSession irisSession) {
-        irisSettingsService.isEnabledForElseThrow(IrisSubSettingsType.COMPETENCY_GENERATION, irisSession.getCourse());
-    }
-
-    private List<Competency> toCompetencies(JsonNode content) {
-        List<Competency> competencies = new ArrayList<>();
-        for (JsonNode node : content.get("competencies")) {
-            try {
-                Competency competency = new Competency();
-                competency.setTitle(node.required("title").asText());
-
-                // skip competency if IRIS only replied with a title containing the special response "!done!"
-                if (node.get("description") == null && node.get("title").asText().equals("!done!")) {
-                    log.info("Received special response \"!done!\", skipping parsing of competency.");
-                    continue;
-                }
-                competency.setDescription(node.required("description").asText());
-                competency.setTaxonomy(CompetencyTaxonomy.valueOf(node.required("taxonomy").asText()));
-
-                competencies.add(competency);
-            }
-            catch (IllegalArgumentException e) {
-                log.error("Missing fields, could not parse Competency: " + node.toPrettyString(), e);
-            }
-        }
-        return competencies;
-    }
-}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java
index 134e47b2abc4..bd5a4c25887b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisCourseChatSessionService.java
@@ -97,8 +97,8 @@ public void checkIsFeatureActivatedFor(IrisCourseChatSession session) {
     }
 
     @Override
-    public void sendOverWebsocket(IrisMessage message) {
-        irisChatWebsocketService.sendMessage(message);
+    public void sendOverWebsocket(IrisCourseChatSession session, IrisMessage message) {
+        irisChatWebsocketService.sendMessage(session, message, null);
     }
 
     @Override
@@ -135,7 +135,7 @@ public void handleStatusUpdate(CourseChatJob job, PyrisChatStatusUpdateDTO statu
             var message = new IrisMessage();
             message.addContent(new IrisTextMessageContent(statusUpdate.result()));
             var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM);
-            irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages());
+            irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages());
         }
         else {
             irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java
index 2916a34171ab..36508d8b0934 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/session/IrisExerciseChatSessionService.java
@@ -119,8 +119,8 @@ public void checkIsFeatureActivatedFor(IrisExerciseChatSession session) {
     }
 
     @Override
-    public void sendOverWebsocket(IrisMessage message) {
-        irisChatWebsocketService.sendMessage(message);
+    public void sendOverWebsocket(IrisExerciseChatSession session, IrisMessage message) {
+        irisChatWebsocketService.sendMessage(session, message, null);
     }
 
     @Override
@@ -170,7 +170,7 @@ public void handleStatusUpdate(ExerciseChatJob job, PyrisChatStatusUpdateDTO sta
             var message = new IrisMessage();
             message.addContent(new IrisTextMessageContent(statusUpdate.result()));
             var savedMessage = irisMessageService.saveMessage(message, session, IrisMessageSender.LLM);
-            irisChatWebsocketService.sendMessage(savedMessage, statusUpdate.stages());
+            irisChatWebsocketService.sendMessage(session, savedMessage, statusUpdate.stages());
         }
         else {
             irisChatWebsocketService.sendStatusUpdate(session, statusUpdate.stages(), statusUpdate.suggestions());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java
index 253ba0df1e45..21bfc4449228 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisChatWebsocketService.java
@@ -5,52 +5,42 @@
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
 
-import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.iris.message.IrisMessage;
 import de.tum.in.www1.artemis.domain.iris.session.IrisChatSession;
-import de.tum.in.www1.artemis.domain.iris.session.IrisSession;
-import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
 import de.tum.in.www1.artemis.service.iris.IrisRateLimitService;
+import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO;
 
 @Service
 @Profile("iris")
-public class IrisChatWebsocketService extends IrisWebsocketService {
+public class IrisChatWebsocketService {
+
+    private final IrisWebsocketService websocketService;
 
     private final IrisRateLimitService rateLimitService;
 
-    public IrisChatWebsocketService(WebsocketMessagingService websocketMessagingService, IrisRateLimitService rateLimitService) {
-        super(websocketMessagingService);
+    public IrisChatWebsocketService(IrisWebsocketService websocketService, IrisRateLimitService rateLimitService) {
+        this.websocketService = websocketService;
         this.rateLimitService = rateLimitService;
     }
 
-    private User checkSessionTypeAndGetUser(IrisSession irisSession) {
-        if (!(irisSession instanceof IrisChatSession chatSession)) {
-            throw new UnsupportedOperationException("Only IrisChatSessions are supported");
-        }
-        return chatSession.getUser();
-    }
-
     /**
-     * Sends a message over the websocket to a specific user
+     * Sends a message and/or a status update over the websocket to the user
+     * involved in the session. At least one of the message or the stages must be
+     * non-null, otherwise there is no need to send a message.
+     * This is currently used for both the exercise and course chat sessions, but
+     * this could be split up in the future.
      *
+     * @param session     the session to send the message to
      * @param irisMessage that should be sent over the websocket
      * @param stages      that should be sent over the websocket
      */
-    public void sendMessage(IrisMessage irisMessage, List<PyrisStageDTO> stages) {
-        var session = irisMessage.getSession();
-        var user = checkSessionTypeAndGetUser(session);
+    public void sendMessage(IrisChatSession session, IrisMessage irisMessage, List<PyrisStageDTO> stages) {
+        var user = session.getUser();
         var rateLimitInfo = rateLimitService.getRateLimitInformation(user);
-        super.send(user, session.getId(), new IrisWebsocketDTO(irisMessage, rateLimitInfo, stages, null));
-    }
-
-    /**
-     * Sends a message over the websocket to a specific user without stages and suggestions
-     *
-     * @param message that should be sent over the websocket
-     */
-    public void sendMessage(IrisMessage message) {
-        sendMessage(message, null);
+        var topic = "" + session.getId(); // Todo: add more specific topic
+        var payload = new IrisChatWebsocketDTO(irisMessage, rateLimitInfo, stages, null);
+        websocketService.send(user.getLogin(), topic, payload);
     }
 
     /**
@@ -59,7 +49,7 @@ public void sendMessage(IrisMessage message) {
      * @param session the session to send the status update to
      * @param stages  the stages to send
      */
-    public void sendStatusUpdate(IrisSession session, List<PyrisStageDTO> stages) {
+    public void sendStatusUpdate(IrisChatSession session, List<PyrisStageDTO> stages) {
         this.sendStatusUpdate(session, stages, null);
     }
 
@@ -70,8 +60,11 @@ public void sendStatusUpdate(IrisSession session, List<PyrisStageDTO> stages) {
      * @param stages      the stages to send
      * @param suggestions the suggestions to send
      */
-    public void sendStatusUpdate(IrisSession session, List<PyrisStageDTO> stages, List<String> suggestions) {
-        var user = checkSessionTypeAndGetUser(session);
-        super.send(user, session.getId(), new IrisWebsocketDTO(null, rateLimitService.getRateLimitInformation(user), stages, suggestions));
+    public void sendStatusUpdate(IrisChatSession session, List<PyrisStageDTO> stages, List<String> suggestions) {
+        var user = session.getUser();
+        var rateLimitInfo = rateLimitService.getRateLimitInformation(user);
+        var topic = "" + session.getId(); // Todo: add more specific topic
+        var payload = new IrisChatWebsocketDTO(null, rateLimitInfo, stages, suggestions);
+        websocketService.send(user.getLogin(), topic, payload);
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java
index 537d9f31ec76..3fcd949be7b8 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/iris/websocket/IrisWebsocketService.java
@@ -1,19 +1,24 @@
 package de.tum.in.www1.artemis.service.iris.websocket;
 
+import java.util.concurrent.ExecutionException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
 
-import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 
 /**
  * A service to send a message over the websocket to a specific user
  */
-public abstract class IrisWebsocketService {
+@Service
+@Profile("iris")
+public class IrisWebsocketService {
 
     private static final Logger log = LoggerFactory.getLogger(IrisWebsocketService.class);
 
-    private static final String IRIS_WEBSOCKET_TOPIC_PREFIX = "/topic/iris";
+    private static final String TOPIC_PREFIX = "/topic/iris/";
 
     private final WebsocketMessagingService websocketMessagingService;
 
@@ -21,10 +26,22 @@ public IrisWebsocketService(WebsocketMessagingService websocketMessagingService)
         this.websocketMessagingService = websocketMessagingService;
     }
 
-    protected void send(User user, Long sessionId, Object payload) {
-        String irisWebsocketTopic = String.format("%s/%s", IRIS_WEBSOCKET_TOPIC_PREFIX, sessionId);
-        log.debug("Sending message to user {} on topic {}: {}", user.getLogin(), irisWebsocketTopic, payload);
-        websocketMessagingService.sendMessageToUser(user.getLogin(), irisWebsocketTopic, payload);
+    /**
+     * Sends a message over the websocket to a specific user
+     *
+     * @param userLogin   the login of the user
+     * @param topicSuffix the suffix of the topic, which will be appended to "/topic/iris/"
+     * @param payload     the DTO to send, which will be serialized to JSON
+     */
+    public void send(String userLogin, String topicSuffix, Object payload) {
+        String topic = TOPIC_PREFIX + topicSuffix;
+        try {
+            websocketMessagingService.sendMessageToUser(userLogin, topic, payload).get();
+            log.debug("Sent message to Iris user {} on topic {}: {}", userLogin, topic, payload);
+        }
+        catch (InterruptedException | ExecutionException e) {
+            log.error("Error while sending message to Iris user {} on topic {}: {}", userLogin, topic, payload, e);
+        }
     }
 
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java
index 16b674bb748d..68d63b1f49e7 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/plagiarism/ProgrammingPlagiarismDetectionService.java
@@ -185,7 +185,7 @@ public File checkPlagiarismWithJPlagReport(long programmingExerciseId, float sim
     private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, float similarityThreshold, int minimumScore, int minimumSize) {
         long programmingExerciseId = programmingExercise.getId();
         final var targetPath = fileService.getTemporaryUniqueSubfolderPath(repoDownloadClonePath, 60);
-        List<ProgrammingExerciseParticipation> participations = filterStudentParticipationsForComparison(programmingExercise, minimumScore);
+        List<ProgrammingExerciseParticipation> participations = findStudentParticipationsForComparison(programmingExercise, minimumScore);
         log.info("Download repositories for JPlag for programming exercise {} to compare {} participations", programmingExerciseId, participations.size());
 
         if (participations.size() < 2) {
@@ -326,8 +326,10 @@ private Language getJPlagProgrammingLanguage(ProgrammingExercise programmingExer
      * @param minimumScore        consider only submissions whose score is greater or equal to this value
      * @return an unmodifiable list containing the latest text submission for every participation
      */
-    public List<ProgrammingExerciseParticipation> filterStudentParticipationsForComparison(ProgrammingExercise programmingExercise, int minimumScore) {
+    public List<ProgrammingExerciseParticipation> findStudentParticipationsForComparison(ProgrammingExercise programmingExercise, int minimumScore) {
+        long start = System.nanoTime();
         var studentParticipations = studentParticipationRepository.findAllForPlagiarism(programmingExercise.getId());
+        log.info("findAllForPlagiarism took {}", TimeLogUtil.formatDurationFrom(start));
 
         return studentParticipations.parallelStream().filter(participation -> !participation.isPracticeMode())
                 .filter(participation -> participation instanceof ProgrammingExerciseStudentParticipation).filter(plagiarismService.filterForStudents())
diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java
index ad6ae2ab5744..a836f81a4982 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/programming/TemplateUpgradePolicyService.java
@@ -32,8 +32,8 @@ public TemplateUpgradePolicyService(JavaTemplateUpgradeService javaRepositoryUpg
     public TemplateUpgradeService getUpgradeService(ProgrammingLanguage programmingLanguage) {
         return switch (programmingLanguage) {
             case JAVA -> javaRepositoryUpgradeService;
-            case KOTLIN, PYTHON, C, HASKELL, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY -> defaultRepositoryUpgradeService;
-            case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, RUST, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
+            case KOTLIN, PYTHON, C, HASKELL, VHDL, ASSEMBLER, SWIFT, OCAML, EMPTY, RUST -> defaultRepositoryUpgradeService;
+            case JAVASCRIPT, C_SHARP, C_PLUS_PLUS, SQL, R, TYPESCRIPT, GO, MATLAB, BASH, RUBY, POWERSHELL, ADA, DART, PHP ->
                 throw new UnsupportedOperationException("Unsupported programming language: " + programmingLanguage);
         };
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java b/src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java
new file mode 100644
index 000000000000..7e49653d99d9
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/telemetry/TelemetryService.java
@@ -0,0 +1,122 @@
+package de.tum.in.www1.artemis.service.telemetry;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.annotation.Profile;
+import org.springframework.context.event.EventListener;
+import org.springframework.core.env.Environment;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectWriter;
+
+import de.tum.in.www1.artemis.service.ProfileService;
+
+@Service
+@Profile(PROFILE_SCHEDULING)
+public class TelemetryService {
+
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    public record TelemetryData(String version, String serverUrl, String operator, String contact, List<String> profiles, String adminName) {
+    }
+
+    private static final Logger log = LoggerFactory.getLogger(TelemetryService.class);
+
+    private final Environment env;
+
+    private final RestTemplate restTemplate;
+
+    private final ProfileService profileService;
+
+    @Value("${artemis.telemetry.enabled}")
+    public boolean useTelemetry;
+
+    @Value("${artemis.telemetry.sendAdminDetails}")
+    private boolean sendAdminDetails;
+
+    @Value("${artemis.telemetry.destination}")
+    private String destination;
+
+    @Value("${artemis.version}")
+    private String version;
+
+    @Value("${server.url}")
+    private String serverUrl;
+
+    @Value("${info.operatorName}")
+    private String operator;
+
+    @Value("${info.operatorAdminName}")
+    private String operatorAdminName;
+
+    @Value("${info.contact}")
+    private String contact;
+
+    public TelemetryService(Environment env, RestTemplate restTemplate, ProfileService profileService) {
+        this.env = env;
+        this.restTemplate = restTemplate;
+        this.profileService = profileService;
+    }
+
+    /**
+     * Sends telemetry to the server specified in artemis.telemetry.destination.
+     * This function runs once, at the startup of the application.
+     * If telemetry is disabled in artemis.telemetry.enabled, no data is sent.
+     */
+    @EventListener(ApplicationReadyEvent.class)
+    public void sendTelemetry() {
+        if (!useTelemetry || profileService.isDevActive()) {
+            return;
+        }
+
+        log.info("Sending telemetry information");
+        try {
+            sendTelemetryByPostRequest();
+        }
+        catch (JsonProcessingException e) {
+            log.warn("JsonProcessingException in sendTelemetry.", e);
+        }
+        catch (Exception e) {
+            log.warn("Exception in sendTelemetry, with dst URI: {}", destination, e);
+        }
+
+    }
+
+    /**
+     * Assembles the telemetry data, and sends it to the external telemetry server.
+     *
+     * @throws Exception if the writing the telemetry data to a json format fails, or the connection to the telemetry server fails
+     */
+    public void sendTelemetryByPostRequest() throws Exception {
+        List<String> activeProfiles = Arrays.asList(env.getActiveProfiles());
+        TelemetryData telemetryData;
+        if (sendAdminDetails) {
+            telemetryData = new TelemetryData(version, serverUrl, operator, contact, activeProfiles, operatorAdminName);
+        }
+        else {
+            telemetryData = new TelemetryData(version, serverUrl, operator, null, activeProfiles, null);
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        ObjectWriter objectWriter = new ObjectMapper().writer().withDefaultPrettyPrinter();
+
+        var telemetryJson = objectWriter.writeValueAsString(telemetryData);
+        HttpEntity<String> requestEntity = new HttpEntity<>(telemetryJson, headers);
+        var response = restTemplate.postForEntity(destination + "/api/telemetry", requestEntity, String.class);
+        log.info("Successfully sent telemetry data. {}", response.getBody());
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java
index 29ba05bcd377..5734c258da9a 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AccountResource.java
@@ -2,27 +2,42 @@
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.PublicKey;
+import java.time.ZonedDateTime;
 import java.util.Optional;
 
 import jakarta.validation.Valid;
+import jakarta.ws.rs.BadRequestException;
 
+import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import de.tum.in.www1.artemis.config.icl.ssh.HashUtils;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent;
 import de.tum.in.www1.artemis.service.AccountService;
+import de.tum.in.www1.artemis.service.connectors.localvc.LocalVCPersonalAccessTokenManagementService;
 import de.tum.in.www1.artemis.service.dto.PasswordChangeDTO;
 import de.tum.in.www1.artemis.service.dto.UserDTO;
 import de.tum.in.www1.artemis.service.user.UserCreationService;
 import de.tum.in.www1.artemis.service.user.UserService;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
+import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.rest.errors.EmailAlreadyUsedException;
 import de.tum.in.www1.artemis.web.rest.errors.PasswordViolatesRequirementsException;
 
@@ -34,6 +49,11 @@
 @RequestMapping("api/")
 public class AccountResource {
 
+    @Value("${jhipster.clientApp.name}")
+    private String applicationName;
+
+    private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
+
     private final UserRepository userRepository;
 
     private final UserService userService;
@@ -96,4 +116,120 @@ public ResponseEntity<Void> changePassword(@RequestBody PasswordChangeDTO passwo
 
         return ResponseEntity.ok().build();
     }
+
+    /**
+     * PUT account/ssh-public-key : sets the ssh public key
+     *
+     * @param sshPublicKey the ssh public key to set
+     *
+     * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
+     */
+    @PutMapping("account/ssh-public-key")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> addSshPublicKey(@RequestBody String sshPublicKey) throws GeneralSecurityException, IOException {
+
+        User user = userRepository.getUser();
+        log.debug("REST request to add SSH key to user {}", user.getLogin());
+        // Parse the public key string
+        AuthorizedKeyEntry keyEntry;
+        try {
+            keyEntry = AuthorizedKeyEntry.parseAuthorizedKeyEntry(sshPublicKey);
+        }
+        catch (IllegalArgumentException e) {
+            throw new BadRequestAlertException("Invalid SSH key format", "SSH key", "invalidKeyFormat", true);
+        }
+        // Extract the PublicKey object
+        PublicKey publicKey = keyEntry.resolvePublicKey(null, null, null);
+        String keyHash = HashUtils.getSha512Fingerprint(publicKey);
+        userRepository.updateUserSshPublicKeyHash(user.getId(), keyHash, sshPublicKey);
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * PUT account/ssh-public-key : sets the ssh public key
+     *
+     * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
+     */
+    @DeleteMapping("account/ssh-public-key")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> deleteSshPublicKey() {
+        User user = userRepository.getUser();
+        log.debug("REST request to remove SSH key of user {}", user.getLogin());
+        userRepository.updateUserSshPublicKeyHash(user.getId(), null, null);
+
+        log.debug("Successfully deleted SSH key of user {}", user.getLogin());
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * PUT account/user-vcs-access-token : creates a vcsAccessToken for a user
+     *
+     * @param expiryDate The expiry date which should be set for the token
+     * @return the ResponseEntity with a userDTO containing the token: with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
+     */
+    @PutMapping("account/user-vcs-access-token")
+    @EnforceAtLeastStudent
+    public ResponseEntity<UserDTO> createVcsAccessToken(@RequestParam("expiryDate") ZonedDateTime expiryDate) {
+        User user = userRepository.getUser();
+        log.debug("REST request to create a new VCS access token for user {}", user.getLogin());
+        if (expiryDate.isBefore(ZonedDateTime.now()) || expiryDate.isAfter(ZonedDateTime.now().plusYears(1))) {
+            throw new BadRequestException("Invalid expiry date provided");
+        }
+
+        userRepository.updateUserVcsAccessToken(user.getId(), LocalVCPersonalAccessTokenManagementService.generateSecureVCSAccessToken(), expiryDate);
+        log.debug("Successfully created a VCS access token for user {}", user.getLogin());
+        user = userRepository.getUser();
+        UserDTO userDTO = new UserDTO();
+        userDTO.setLogin(user.getLogin());
+        userDTO.setVcsAccessToken(user.getVcsAccessToken());
+        userDTO.setVcsAccessTokenExpiryDate(user.getVcsAccessTokenExpiryDate());
+        return ResponseEntity.ok(userDTO);
+    }
+
+    /**
+     * DELETE account/user-vcs-access-token : deletes the vcsAccessToken of a user
+     *
+     * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
+     */
+    @DeleteMapping("account/user-vcs-access-token")
+    @EnforceAtLeastStudent
+    public ResponseEntity<Void> deleteVcsAccessToken() {
+        User user = userRepository.getUser();
+        log.debug("REST request to remove VCS access token key of user {}", user.getLogin());
+        userRepository.updateUserVcsAccessToken(user.getId(), null, null);
+        log.debug("Successfully deleted VCS access token of user {}", user.getLogin());
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * GET account/participation-vcs-access-token : get the vcsToken for of a user for a participation
+     *
+     * @param participationId the participation for which the access token should be fetched
+     *
+     * @return the versionControlAccessToken belonging to the provided participation and user
+     */
+    @GetMapping("account/participation-vcs-access-token")
+    @EnforceAtLeastStudent
+    public ResponseEntity<String> getVcsAccessToken(@RequestParam("participationId") Long participationId) {
+        User user = userRepository.getUser();
+
+        log.debug("REST request to get VCS access token of user {} for participation {}", user.getLogin(), participationId);
+        return ResponseEntity.ok(userService.getParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken());
+    }
+
+    /**
+     * PUT account/participation-vcs-access-token : get the vcsToken for of a user for a participation
+     *
+     * @param participationId the participation for which the access token should be fetched
+     *
+     * @return the versionControlAccessToken belonging to the provided participation and user
+     */
+    @PutMapping("account/participation-vcs-access-token")
+    @EnforceAtLeastStudent
+    public ResponseEntity<String> createVcsAccessToken(@RequestParam("participationId") Long participationId) {
+        User user = userRepository.getUser();
+
+        log.debug("REST request to create a new VCS access token for user {} for participation {}", user.getLogin(), participationId);
+        return ResponseEntity.ok(userService.createParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken());
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java
index ad959b26096f..8627d8f701ed 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/FileResource.java
@@ -69,6 +69,7 @@
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor;
+import de.tum.in.www1.artemis.security.annotations.enforceRoleInCourse.EnforceAtLeastEditorInCourse;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
@@ -372,6 +373,24 @@ public ResponseEntity<byte[]> getLectureAttachment(@PathVariable Long lectureId,
         return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
     }
 
+    /**
+     * GET /files/courses/{courseId}/attachments/{attachmentId} : Returns the file associated with the
+     * given attachment ID as a downloadable resource
+     *
+     * @param courseId     The ID of the course that the Attachment belongs to
+     * @param attachmentId the ID of the attachment to retrieve
+     * @return ResponseEntity containing the file as a resource
+     */
+    @GetMapping("files/courses/{courseId}/attachments/{attachmentId}")
+    @EnforceAtLeastEditorInCourse
+    public ResponseEntity<byte[]> getAttachmentFile(@PathVariable Long courseId, @PathVariable Long attachmentId) {
+        Attachment attachment = attachmentRepository.findByIdElseThrow(attachmentId);
+        Course course = courseRepository.findByIdElseThrow(courseId);
+        checkAttachmentExistsInCourseOrThrow(course, attachment);
+
+        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
+    }
+
     /**
      * GET /files/attachments/lecture/{lectureId}/merge-pdf : Get the lecture units
      * PDF attachments merged
@@ -428,6 +447,26 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachment(@PathVariable Long att
         return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
     }
 
+    /**
+     * GET files/courses/{courseId}/attachment-units/{attachmenUnitId} : Returns the file associated with the
+     * given attachmentUnit ID as a downloadable resource
+     *
+     * @param courseId         The ID of the course that the Attachment belongs to
+     * @param attachmentUnitId the ID of the attachment to retrieve
+     * @return ResponseEntity containing the file as a resource
+     */
+    @GetMapping("files/courses/{courseId}/attachment-units/{attachmentUnitId}")
+    @EnforceAtLeastEditorInCourse
+    public ResponseEntity<byte[]> getAttachmentUnitFile(@PathVariable Long courseId, @PathVariable Long attachmentUnitId) {
+        log.debug("REST request to get file for attachment unit : {}", attachmentUnitId);
+        AttachmentUnit attachmentUnit = attachmentUnitRepository.findByIdElseThrow(attachmentUnitId);
+        Course course = courseRepository.findByIdElseThrow(courseId);
+        Attachment attachment = attachmentUnit.getAttachment();
+        checkAttachmentUnitExistsInCourseOrThrow(course, attachmentUnit);
+
+        return buildFileResponse(getActualPathFromPublicPathString(attachment.getLink()), false);
+    }
+
     /**
      * GET files/attachments/slides/attachment-unit/:attachmentUnitId/slide/:slideNumber : Get the lecture unit attachment slide by slide number
      *
@@ -557,6 +596,30 @@ private void checkAttachmentAuthorizationOrThrow(Course course, Attachment attac
         }
     }
 
+    /**
+     * Checks if the attachment exists in the mentioned course
+     *
+     * @param course     the course to check if the attachment is part of it
+     * @param attachment the attachment for which the existence should be checked
+     */
+    private void checkAttachmentExistsInCourseOrThrow(Course course, Attachment attachment) {
+        if (!attachment.getLecture().getCourse().equals(course)) {
+            throw new EntityNotFoundException("This attachment does not exist in this course.");
+        }
+    }
+
+    /**
+     * Checks if the attachment exists in the mentioned course
+     *
+     * @param course         the course to check if the attachment is part of it
+     * @param attachmentUnit the attachment unit for which the existence should be checked
+     */
+    private void checkAttachmentUnitExistsInCourseOrThrow(Course course, AttachmentUnit attachmentUnit) {
+        if (!attachmentUnit.getLecture().getCourse().equals(course)) {
+            throw new EntityNotFoundException("This attachment unit does not exist in this course.");
+        }
+    }
+
     /**
      * Reads the file and turns it into a ResponseEntity
      *
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java
index 37b9afb94432..bd901ccd824b 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ResultResource.java
@@ -45,12 +45,14 @@
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor;
+import de.tum.in.www1.artemis.security.annotations.enforceRoleInExercise.EnforceAtLeastEditorInExercise;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationAuthorizationCheckService;
 import de.tum.in.www1.artemis.service.ParticipationService;
 import de.tum.in.www1.artemis.service.ResultService;
 import de.tum.in.www1.artemis.service.exam.ExamDateService;
 import de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO;
+import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
 
@@ -276,4 +278,18 @@ public ResponseEntity<Result> createResultForExternalSubmission(@PathVariable Lo
         return ResponseEntity.created(new URI("/api/results/" + savedResult.getId()))
                 .headers(HeaderUtil.createEntityCreationAlert(applicationName, true, ENTITY_NAME, savedResult.getId().toString())).body(savedResult);
     }
+
+    /**
+     * GET /exercises/:exerciseId/feedback-details : Retrieves all aggregated feedback details for a given exercise.
+     * The feedback details include counts and relative counts of feedback occurrences, along with associated test case names and task numbers.
+     *
+     * @param exerciseId The ID of the exercise for which feedback details should be retrieved.
+     * @return A ResponseEntity containing a list of {@link FeedbackDetailDTO}s
+     */
+    @GetMapping("exercises/{exerciseId}/feedback-details")
+    @EnforceAtLeastEditorInExercise
+    public ResponseEntity<List<FeedbackDetailDTO>> getAllFeedbackDetailsForExercise(@PathVariable Long exerciseId) {
+        log.debug("REST request to get all Feedback details for Exercise {}", exerciseId);
+        return ResponseEntity.ok(resultService.findAggregatedFeedbackByExerciseId(exerciseId));
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java
index 747208042837..8415cbc6f104 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/UserResource.java
@@ -2,24 +2,18 @@
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.PublicKey;
 import java.time.ZonedDateTime;
 import java.util.List;
 import java.util.Optional;
 
-import org.apache.sshd.common.config.keys.AuthorizedKeyEntry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,7 +23,6 @@
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import de.tum.in.www1.artemis.config.icl.ssh.HashUtils;
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
@@ -39,7 +32,6 @@
 import de.tum.in.www1.artemis.service.dto.UserInitializationDTO;
 import de.tum.in.www1.artemis.service.user.UserCreationService;
 import de.tum.in.www1.artemis.service.user.UserService;
-import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
 import tech.jhipster.web.util.PaginationUtil;
 
 /**
@@ -67,9 +59,6 @@
 @RequestMapping("api/")
 public class UserResource {
 
-    @Value("${jhipster.clientApp.name}")
-    private String applicationName;
-
     private static final Logger log = LoggerFactory.getLogger(UserResource.class);
 
     private final UserService userService;
@@ -180,81 +169,4 @@ public ResponseEntity<Void> setIrisAcceptedToTimestamp() {
         userRepository.updateIrisAcceptedToDate(user.getId(), ZonedDateTime.now());
         return ResponseEntity.ok().build();
     }
-
-    /**
-     * PUT users/sshpublickey : sets the ssh public key
-     *
-     * @param sshPublicKey the ssh public key to set
-     *
-     * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
-     */
-    @PutMapping("users/sshpublickey")
-    @EnforceAtLeastStudent
-    public ResponseEntity<Void> addSshPublicKey(@RequestBody String sshPublicKey) throws GeneralSecurityException, IOException {
-
-        User user = userRepository.getUser();
-        log.debug("REST request to add SSH key to user {}", user.getLogin());
-        // Parse the public key string
-        AuthorizedKeyEntry keyEntry;
-        try {
-            keyEntry = AuthorizedKeyEntry.parseAuthorizedKeyEntry(sshPublicKey);
-        }
-        catch (IllegalArgumentException e) {
-            return ResponseEntity.badRequest().headers(HeaderUtil.createFailureAlert(applicationName, true, "sshUserSettings", "saveSshKeyError", "Invalid SSH key format"))
-                    .body(null);
-        }
-        // Extract the PublicKey object
-        PublicKey publicKey = keyEntry.resolvePublicKey(null, null, null);
-        String keyHash = HashUtils.getSha512Fingerprint(publicKey);
-        userRepository.updateUserSshPublicKeyHash(user.getId(), keyHash, sshPublicKey);
-        return ResponseEntity.ok().build();
-    }
-
-    /**
-     * PUT users/sshpublickey : sets the ssh public key
-     *
-     * @return the ResponseEntity with status 200 (OK), with status 404 (Not Found), or with status 400 (Bad Request)
-     */
-    @DeleteMapping("users/sshpublickey")
-    @EnforceAtLeastStudent
-    public ResponseEntity<Void> deleteSshPublicKey() {
-        User user = userRepository.getUser();
-        log.debug("REST request to remove SSH key of user {}", user.getLogin());
-        userRepository.updateUserSshPublicKeyHash(user.getId(), null, null);
-
-        log.debug("Successfully deleted SSH key of user {}", user.getLogin());
-        return ResponseEntity.ok().build();
-    }
-
-    /**
-     * GET users/vcsToken : get the vcsToken for of a user for a participation
-     *
-     * @param participationId the participation for which the access token should be fetched
-     *
-     * @return the versionControlAccessToken belonging to the provided participation and user
-     */
-    @GetMapping("users/vcsToken")
-    @EnforceAtLeastStudent
-    public ResponseEntity<String> getVcsAccessToken(@RequestParam("participationId") Long participationId) {
-        User user = userRepository.getUser();
-
-        log.debug("REST request to get VCS access token of user {} for participation {}", user.getLogin(), participationId);
-        return ResponseEntity.ok(userService.getParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken());
-    }
-
-    /**
-     * PUT users/vcsToken : get the vcsToken for of a user for a participation
-     *
-     * @param participationId the participation for which the access token should be fetched
-     *
-     * @return the versionControlAccessToken belonging to the provided participation and user
-     */
-    @PutMapping("users/vcsToken")
-    @EnforceAtLeastStudent
-    public ResponseEntity<String> createVcsAccessToken(@RequestParam("participationId") Long participationId) {
-        User user = userRepository.getUser();
-
-        log.debug("REST request to create a new VCS access token for user {} for participation {}", user.getLogin(), participationId);
-        return ResponseEntity.ok(userService.createParticipationVcsAccessTokenForUserAndParticipationIdOrElseThrow(user, participationId).getVcsAccessToken());
-    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java
index a3fdf0875c31..036b673d1674 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/competency/CourseCompetencyResource.java
@@ -46,9 +46,10 @@
 import de.tum.in.www1.artemis.service.competency.CompetencyProgressService;
 import de.tum.in.www1.artemis.service.competency.CompetencyRelationService;
 import de.tum.in.www1.artemis.service.competency.CourseCompetencyService;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO;
 import de.tum.in.www1.artemis.service.feature.Feature;
 import de.tum.in.www1.artemis.service.feature.FeatureToggle;
-import de.tum.in.www1.artemis.service.iris.session.IrisCompetencyGenerationSessionService;
+import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService;
 import de.tum.in.www1.artemis.web.rest.dto.CourseCompetencyProgressDTO;
 import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO;
 import de.tum.in.www1.artemis.web.rest.dto.competency.CompetencyJolPairDTO;
@@ -80,7 +81,7 @@ public class CourseCompetencyResource {
 
     private final CompetencyRelationService competencyRelationService;
 
-    private final Optional<IrisCompetencyGenerationSessionService> irisCompetencyGenerationSessionService;
+    private final Optional<IrisCompetencyGenerationService> irisCompetencyGenerationService;
 
     private final CompetencyJolService competencyJolService;
 
@@ -91,7 +92,7 @@ public class CourseCompetencyResource {
     public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyService courseCompetencyService, CourseCompetencyRepository courseCompetencyRepository,
             CourseRepository courseRepository, CompetencyProgressService competencyProgressService, CompetencyProgressRepository competencyProgressRepository,
             CompetencyRelationRepository competencyRelationRepository, CompetencyRelationService competencyRelationService,
-            Optional<IrisCompetencyGenerationSessionService> irisCompetencyGenerationSessionService, CompetencyJolService competencyJolService,
+            Optional<IrisCompetencyGenerationService> irisCompetencyGenerationService, CompetencyJolService competencyJolService,
             AuthorizationCheckService authorizationCheckService) {
         this.userRepository = userRepository;
         this.courseCompetencyService = courseCompetencyService;
@@ -101,7 +102,7 @@ public CourseCompetencyResource(UserRepository userRepository, CourseCompetencyS
         this.competencyProgressRepository = competencyProgressRepository;
         this.competencyRelationRepository = competencyRelationRepository;
         this.competencyRelationService = competencyRelationService;
-        this.irisCompetencyGenerationSessionService = irisCompetencyGenerationSessionService;
+        this.irisCompetencyGenerationService = irisCompetencyGenerationService;
         this.competencyJolService = competencyJolService;
         this.authorizationCheckService = authorizationCheckService;
     }
@@ -332,25 +333,25 @@ public ResponseEntity<Void> removeCompetencyRelation(@PathVariable long courseId
     }
 
     /**
-     * POST courses/:courseId/course-competencies/generate-from-description : Generates a list of course competencies from a given course description by using
-     * IRIS.
+     * POST courses/:courseId/course-competencies/:competencyId/competencies/generate-from-description
+     * Generates a list of competencies from a given course description with IRIS.
      *
-     * @param courseId          the id of the current course
-     * @param courseDescription the text description of the course
-     * @return the ResponseEntity with status 200 (OK) and body the generated competencies
+     * @param courseId the id of the current course
+     * @param input    the course description and current competencies
+     * @return the ResponseEntity with status 202 (Accepted)
      */
     @PostMapping("courses/{courseId}/course-competencies/generate-from-description")
     @EnforceAtLeastEditorInCourse
-    public ResponseEntity<List<CourseCompetency>> generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody String courseDescription) {
-        var irisService = irisCompetencyGenerationSessionService.orElseThrow();
+    public ResponseEntity<Void> generateCompetenciesFromCourseDescription(@PathVariable Long courseId, @RequestBody PyrisCompetencyExtractionInputDTO input) {
+        var competencyGenerationService = irisCompetencyGenerationService.orElseThrow();
         var user = userRepository.getUserWithGroupsAndAuthorities();
         var course = courseRepository.findByIdElseThrow(courseId);
 
-        var session = irisService.getOrCreateSession(course, user);
-        irisService.addUserTextMessageToSession(session, courseDescription);
-        var competencies = irisService.executeRequest(session);
+        // Start the Iris competency generation pipeline for the given course.
+        // The generated competencies will be sent async over the websocket on the topic /topic/iris/competencies/{courseId}
+        competencyGenerationService.executeCompetencyExtractionPipeline(user, course, input.courseDescription(), input.currentCompetencies());
 
-        return ResponseEntity.ok(competencies);
+        return ResponseEntity.accepted().build();
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java
new file mode 100644
index 000000000000..d9e1f86d231d
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/feedback/FeedbackDetailDTO.java
@@ -0,0 +1,7 @@
+package de.tum.in.www1.artemis.web.rest.dto.feedback;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record FeedbackDetailDTO(long count, double relativeCount, String detailText, String testCaseName, int taskNumber) {
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java
index 9480b6e77d79..7950c09cb773 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicAccountResource.java
@@ -165,6 +165,7 @@ public ResponseEntity<UserDTO> getAccount() {
         UserDTO userDTO = new UserDTO(user);
         // we set this value on purpose here: the user can only fetch their own information, make the token available for constructing the token-based clone-URL
         userDTO.setVcsAccessToken(user.getVcsAccessToken());
+        userDTO.setVcsAccessTokenExpiryDate(user.getVcsAccessTokenExpiryDate());
         userDTO.setSshPublicKey(user.getSshPublicKey());
         log.info("GET /account {} took {}ms", user.getLogin(), System.currentTimeMillis() - start);
         return ResponseEntity.ok(userDTO);
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java
index d2bf76e78491..f843fb729484 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/open/PublicPyrisStatusUpdateResource.java
@@ -16,7 +16,9 @@
 import de.tum.in.www1.artemis.service.connectors.pyris.PyrisJobService;
 import de.tum.in.www1.artemis.service.connectors.pyris.PyrisStatusUpdateService;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.PyrisChatStatusUpdateDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisLectureIngestionStatusUpdateDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.job.CompetencyExtractionJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.CourseChatJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.ExerciseChatJob;
 import de.tum.in.www1.artemis.service.connectors.pyris.job.IngestionWebhookJob;
@@ -27,7 +29,7 @@
 /**
  * REST controller for providing Pyris access to Artemis internal data and status updates.
  * All endpoints in this controller use custom token based authentication.
- * See {@link PyrisJobService#getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest)} for more information.
+ * See {@link PyrisJobService#getAndAuthenticateJobFromHeaderElseThrow(HttpServletRequest, Class)} for more information.
  */
 @RestController
 @Profile("iris")
@@ -58,15 +60,12 @@ public PublicPyrisStatusUpdateResource(PyrisJobService pyrisJobService, PyrisSta
     @PostMapping("pipelines/tutor-chat/runs/{runId}/status") // TODO: Rename this to 'exercise-chat' with next breaking Pyris version
     @EnforceNothing
     public ResponseEntity<Void> setStatusOfJob(@PathVariable String runId, @RequestBody PyrisChatStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) {
-        var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request);
+        var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, ExerciseChatJob.class);
         if (!Objects.equals(job.jobId(), runId)) {
             throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch");
         }
-        if (!(job instanceof ExerciseChatJob exerciseChatJob)) {
-            throw new ConflictException("Run ID is not a exercise chat job", "Job", "invalidRunId");
-        }
 
-        pyrisStatusUpdateService.handleStatusUpdate(exerciseChatJob, statusUpdateDTO);
+        pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO);
 
         return ResponseEntity.ok().build();
     }
@@ -86,15 +85,38 @@ public ResponseEntity<Void> setStatusOfJob(@PathVariable String runId, @RequestB
     @PostMapping("pipelines/course-chat/runs/{runId}/status")
     @EnforceNothing
     public ResponseEntity<Void> setStatusOfCourseChatJob(@PathVariable String runId, @RequestBody PyrisChatStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) {
-        var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request);
+        var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, CourseChatJob.class);
         if (!Objects.equals(job.jobId(), runId)) {
             throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch");
         }
-        if (!(job instanceof CourseChatJob courseChatJob)) {
-            throw new ConflictException("Run ID is not a course chat job", "Job", "invalidRunId");
+
+        pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO);
+
+        return ResponseEntity.ok().build();
+    }
+
+    /**
+     * POST public/pyris/pipelines/competency-extraction/runs/:runId/status : Send the competencies extracted from a course description in a status update
+     * <p>
+     * Uses custom token based authentication.
+     *
+     * @param runId           the ID of the job
+     * @param statusUpdateDTO the status update
+     * @param request         the HTTP request
+     * @throws ConflictException        if the run ID in the URL does not match the run ID in the request body
+     * @throws AccessForbiddenException if the token is invalid
+     * @return a {@link ResponseEntity} with status {@code 200 (OK)}
+     */
+    @PostMapping("pipelines/competency-extraction/runs/{runId}/status")
+    @EnforceNothing
+    public ResponseEntity<Void> setCompetencyExtractionJobStatus(@PathVariable String runId, @RequestBody PyrisCompetencyStatusUpdateDTO statusUpdateDTO,
+            HttpServletRequest request) {
+        var job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, CompetencyExtractionJob.class);
+        if (!Objects.equals(job.jobId(), runId)) {
+            throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch");
         }
 
-        pyrisStatusUpdateService.handleStatusUpdate(courseChatJob, statusUpdateDTO);
+        pyrisStatusUpdateService.handleStatusUpdate(job, statusUpdateDTO);
 
         return ResponseEntity.ok().build();
     }
@@ -112,7 +134,7 @@ public ResponseEntity<Void> setStatusOfCourseChatJob(@PathVariable String runId,
     @PostMapping("webhooks/ingestion/runs/{runId}/status")
     @EnforceNothing
     public ResponseEntity<Void> setStatusOfIngestionJob(@PathVariable String runId, @RequestBody PyrisLectureIngestionStatusUpdateDTO statusUpdateDTO, HttpServletRequest request) {
-        PyrisJob job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request);
+        PyrisJob job = pyrisJobService.getAndAuthenticateJobFromHeaderElseThrow(request, PyrisJob.class);
         if (!job.jobId().equals(runId)) {
             throw new ConflictException("Run ID in URL does not match run ID in request body", "Job", "runIdMismatch");
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java
index 180d2ca8e077..2620f59f6a5d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/programming/ProgrammingExerciseResource.java
@@ -1,6 +1,7 @@
 package de.tum.in.www1.artemis.web.rest.programming;
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA;
 
 import java.io.IOException;
 import java.net.URI;
@@ -18,6 +19,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Profile;
+import org.springframework.core.env.Environment;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -89,6 +91,7 @@
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
 import de.tum.in.www1.artemis.web.websocket.dto.ProgrammingExerciseTestCaseStateDTO;
+import io.jsonwebtoken.lang.Arrays;
 
 /**
  * REST controller for managing ProgrammingExercise.
@@ -151,6 +154,8 @@ public class ProgrammingExerciseResource {
 
     private final Optional<AthenaModuleService> athenaModuleService;
 
+    private final Environment environment;
+
     public ProgrammingExerciseResource(ProgrammingExerciseRepository programmingExerciseRepository, ProgrammingExerciseTestCaseRepository programmingExerciseTestCaseRepository,
             UserRepository userRepository, AuthorizationCheckService authCheckService, CourseService courseService,
             Optional<ContinuousIntegrationService> continuousIntegrationService, Optional<VersionControlService> versionControlService, ExerciseService exerciseService,
@@ -160,7 +165,8 @@ public ProgrammingExerciseResource(ProgrammingExerciseRepository programmingExer
             GradingCriterionRepository gradingCriterionRepository, CourseRepository courseRepository, GitService gitService, AuxiliaryRepositoryService auxiliaryRepositoryService,
             SolutionProgrammingExerciseParticipationRepository solutionProgrammingExerciseParticipationRepository,
             TemplateProgrammingExerciseParticipationRepository templateProgrammingExerciseParticipationRepository,
-            BuildLogStatisticsEntryRepository buildLogStatisticsEntryRepository, ChannelRepository channelRepository, Optional<AthenaModuleService> athenaModuleService) {
+            BuildLogStatisticsEntryRepository buildLogStatisticsEntryRepository, ChannelRepository channelRepository, Optional<AthenaModuleService> athenaModuleService,
+            Environment environment) {
         this.programmingExerciseTaskService = programmingExerciseTaskService;
         this.programmingExerciseRepository = programmingExerciseRepository;
         this.programmingExerciseTestCaseRepository = programmingExerciseTestCaseRepository;
@@ -184,6 +190,7 @@ public ProgrammingExerciseResource(ProgrammingExerciseRepository programmingExer
         this.buildLogStatisticsEntryRepository = buildLogStatisticsEntryRepository;
         this.channelRepository = channelRepository;
         this.athenaModuleService = athenaModuleService;
+        this.environment = environment;
     }
 
     /**
@@ -303,9 +310,26 @@ public ResponseEntity<ProgrammingExercise> updateProgrammingExercise(@RequestBod
                 updatedProgrammingExercise.getBuildConfig().isTestwiseCoverageEnabled())) {
             throw new BadRequestAlertException("Testwise coverage enabled flag must not be changed", ENTITY_NAME, "testwiseCoverageCannotChange");
         }
-        if (!Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOnlineEditor()) && !Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOfflineIde())) {
-            return ResponseEntity.badRequest().headers(HeaderUtil.createAlert(applicationName,
-                    "You need to allow at least one participation mode, the online editor or the offline IDE", "noParticipationModeAllowed")).body(null);
+        // Check if theia Profile is enabled
+        if (Arrays.asList(this.environment.getActiveProfiles()).contains(PROFILE_THEIA)) {
+            // Require 1 / 3 participation modes to be enabled
+            if (!Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOnlineEditor()) && !Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOfflineIde())
+                    && !updatedProgrammingExercise.isAllowOnlineIde()) {
+                throw new BadRequestAlertException("You need to allow at least one participation mode, the online editor, the offline IDE, or the online IDE", ENTITY_NAME,
+                        "noParticipationModeAllowed");
+            }
+        }
+        else {
+            // Require 1 / 2 participation modes to be enabled
+            if (!Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOnlineEditor()) && !Boolean.TRUE.equals(updatedProgrammingExercise.isAllowOfflineIde())) {
+                throw new BadRequestAlertException("You need to allow at least one participation mode, the online editor or the offline IDE", ENTITY_NAME,
+                        "noParticipationModeAllowed");
+            }
+        }
+
+        // Verify that a theia image is provided when the online IDE is enabled
+        if (updatedProgrammingExercise.isAllowOnlineIde() && updatedProgrammingExercise.getBuildConfig().getTheiaImage() == null) {
+            throw new BadRequestAlertException("You need to provide a Theia image when the online IDE is enabled", ENTITY_NAME, "noTheiaImageProvided");
         }
         // Forbid changing the course the exercise belongs to.
         if (!Objects.equals(programmingExerciseBeforeUpdate.getCourseViaExerciseGroupOrCourseMember().getId(),
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java
new file mode 100644
index 000000000000..24a6977afa5b
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/theia/TheiaConfigurationResource.java
@@ -0,0 +1,41 @@
+package de.tum.in.www1.artemis.web.rest.theia;
+
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA;
+
+import java.util.Map;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import de.tum.in.www1.artemis.config.TheiaConfiguration;
+import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
+import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
+
+@Profile(PROFILE_THEIA)
+@RestController
+@RequestMapping("api/theia/")
+public class TheiaConfigurationResource {
+
+    private final TheiaConfiguration theiaConfiguration;
+
+    public TheiaConfigurationResource(TheiaConfiguration theiaConfiguration) {
+        this.theiaConfiguration = theiaConfiguration;
+    }
+
+    /**
+     * GET /api/theia/images?language=<language>: Get the images for a specific language
+     *
+     * @param language the language for which the images should be retrieved
+     * @return a map of flavor/name -> image-link
+     */
+    @GetMapping("images")
+    @EnforceAtLeastInstructor
+    public ResponseEntity<Map<String, String>> getImagesForLanguage(@RequestParam("language") ProgrammingLanguage language) {
+        return ResponseEntity.ok(this.theiaConfiguration.getImagesForLanguage(language));
+    }
+
+}
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 242f427c6a8e..56e3edc14e78 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -113,10 +113,12 @@ info:
             - programming_exercise_fail_tour: 'test'
             - programming_exercise_success_tour: 'test'
             - tutor_assessment_tour: 'Patterns in Software Engineering'
-    contact: artemis@xcit.tum.de  #default value, can be overridden if needed
     # Specifies whether text assessment analytics service (TextAssessmentEventResource) is enabled/disabled
     # default value set to true for development environment
     text-assessment-analytics-enabled: true
+    operatorName: Some Artemis Operator # Must be set before starting the application in production. Shown in the about us page and sent to the telemetry service (e.g. the name of the university "Technische Universität München")
+    operatorAdminName: Admin # Can be set to be shown in the about us page, and to be sent to the telemetry service
+    contact: admin@uni.de # The admins contact email address, shown in the about us page, and sent to the telemetry service
 
 # Eureka configuration
 eureka:
@@ -129,4 +131,19 @@ eureka:
 
 # Theia configuration
 theia:
-  portal-url: https://theia-test.k8s.ase.cit.tum.de
+    portal-url: https://theia-test.k8s.ase.cit.tum.de
+
+    images:
+        java:
+            Java-17: "ghcr.io/ls1intum/theia/java-17:latest"
+            Java-Test: "ghcr.io/ls1intum/theia/java-test:latest"
+            Java-Test2: "ghcr.io/ls1intum/theia/java-test:2"
+        c:
+            C: "ghcr.io/ls1intum/theia/c:latest"
+
+# Telemetry service: disabled for development
+artemis:
+    telemetry:
+        enabled: false # Disable sending any telemetry information to the telemetry service by setting this to false
+        sendAdminDetails: false # Include the admins email and name in the telemetry data. Set to false to disable
+        destination: telemetry.artemis.cit.tum.de
diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml
index 5fb8190cc112..7d86700066e4 100644
--- a/src/main/resources/config/application-prod.yml
+++ b/src/main/resources/config/application-prod.yml
@@ -15,6 +15,12 @@
 
 artemis:
     push-notification-relay: https://hermes.artemis.cit.tum.de
+    # Artemis sends the artemis version, the university name, the universities main admin contact, (email + name), the server url,
+    # and used profiles (gitlab, localVC, ...) to a telemetry collection service.
+    telemetry:
+        enabled: true # Disable sending any telemetry information to the telemetry service by setting this to false
+        sendAdminDetails: true # Include personal identifiable information of the admin, including email and name in the telemetry data
+        destination: telemetry.artemis.cit.tum.de
 
 spring:
     devtools:
@@ -119,8 +125,10 @@ info:
             - programming_exercise_fail_tour: 'tutorial'
             - programming_exercise_success_tour: 'tutorial'
             - tutor_assessment_tour: 'Patterns in Software Engineering'
-    contact: artemis@xcit.tum.de                                                                  #default value, can be overridden on the server
     test-server: false  # false --> production, true --> test server, --> empty == local
     # Specifies whether text assessment analytics service (TextAssessmentEventResource) is enabled/disabled
     # default value set to false in production
     text-assessment-analytics-enabled: false
+    operatorName: # Must be set before starting the application in production. Shown in the about us page and sent to the telemetry service (e.g. university or school)
+    operatorAdminName: # Can be set before starting the application in production. Shown in the about us page and used by the telemetry service
+    contact: # The admins contact email address, shown in the about us page, and sent to the telemetry service
diff --git a/src/main/resources/config/application-theia.yml b/src/main/resources/config/application-theia.yml
index 2b8e1346d008..95b058f66e20 100644
--- a/src/main/resources/config/application-theia.yml
+++ b/src/main/resources/config/application-theia.yml
@@ -1,2 +1,13 @@
 theia:
-  portal-url: https://your-theia-instance.com
+    portal-url: https://your-theia-instance.com
+
+    # Theia IDE images available for the different programming languages
+    images:
+        # Upper level key is the language category (must match the language key in the programming-exercise configuration)
+        java:
+            # Lower level key can be multiple flavors of the image, e.g. version, tag, or additional dependencies
+            Java-17: "my-registry/my-image:my-tag"
+            # Add more flavors here (e.g. Java-11, Java-8, etc.)
+        # Add more languages here (e.g. c, python, etc.)
+        c:
+            C: "my-registry/my-image:my-tag"
diff --git a/src/main/resources/config/application.yml b/src/main/resources/config/application.yml
index b216a43a2bf6..8c66b009451c 100644
--- a/src/main/resources/config/application.yml
+++ b/src/main/resources/config/application.yml
@@ -87,6 +87,8 @@ artemis:
                     default: "ls1tum/artemis-swift-swiftlint-docker:latest"
                 ocaml:
                     default: "ls1tum/artemis-ocaml-docker:v1"
+                rust:
+                    default: "ghcr.io/ls1intum/artemis-rust-docker:v0.9.70"
 
 management:
     endpoints:
@@ -196,6 +198,9 @@ spring:
             thread-name-prefix: artemis-scheduling-
             pool:
                 size: 2
+    threads:
+        virtual:
+            enabled: true
     thymeleaf:
         mode: HTML
     output:
diff --git a/src/main/resources/templates/aeolus/rust/default.sh b/src/main/resources/templates/aeolus/rust/default.sh
new file mode 100644
index 000000000000..d1ba23293a58
--- /dev/null
+++ b/src/main/resources/templates/aeolus/rust/default.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+set -e
+export AEOLUS_INITIAL_DIRECTORY=${PWD}
+build () {
+  echo '⚙️ executing build'
+  cargo build --verbose
+}
+
+run_all_tests () {
+  echo '⚙️ executing run_all_tests'
+  cargo nextest run --profile ci
+}
+
+main () {
+  if [[ "${1}" == "aeolus_sourcing" ]]; then
+    return 0 # just source to use the methods in the subshell, no execution
+  fi
+  local _script_name
+  _script_name=${BASH_SOURCE[0]:-$0}
+  cd "${AEOLUS_INITIAL_DIRECTORY}"
+  bash -c "source ${_script_name} aeolus_sourcing; build"
+  cd "${AEOLUS_INITIAL_DIRECTORY}"
+  bash -c "source ${_script_name} aeolus_sourcing; run_all_tests"
+}
+
+main "${@}"
diff --git a/src/main/resources/templates/aeolus/rust/default.yaml b/src/main/resources/templates/aeolus/rust/default.yaml
new file mode 100644
index 000000000000..4cd44c110048
--- /dev/null
+++ b/src/main/resources/templates/aeolus/rust/default.yaml
@@ -0,0 +1,14 @@
+api: v0.0.1
+metadata:
+  name: Rust
+  id: rust
+  description: Test crate using cargo
+actions:
+  - name: build
+    script: cargo build --verbose
+  - name: run_all_tests
+    script: cargo nextest run --profile ci
+    results:
+      - name: junit_target/nextest/ci/junit.xml
+        path: target/nextest/ci/junit.xml
+        type: junit
diff --git a/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml b/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml
new file mode 100644
index 000000000000..39e416158a9c
--- /dev/null
+++ b/src/main/resources/templates/gitlabci/rust/regularRuns/.gitlab-ci.yml
@@ -0,0 +1,47 @@
+stages:
+    - test
+    - upload
+
+
+test-job:
+    image: ${ARTEMIS_BUILD_DOCKER_IMAGE}
+    stage: test
+    only:
+        variables:
+            - $CI_COMMIT_BRANCH == $ARTEMIS_SUBMISSION_GIT_BRANCH
+    allow_failure: true
+    variables:
+        GIT_STRATEGY: none
+    script:
+        - git clone --branch ${ARTEMIS_TEST_GIT_BRANCH} ${CI_SERVER_PROTOCOL}://${ARTEMIS_TEST_GIT_USER}:${ARTEMIS_TEST_GIT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_NAMESPACE}/${ARTEMIS_TEST_GIT_REPOSITORY_SLUG} .
+        - git clone --branch ${ARTEMIS_SUBMISSION_GIT_BRANCH} ${CI_SERVER_PROTOCOL}://${ARTEMIS_TEST_GIT_USER}:${ARTEMIS_TEST_GIT_TOKEN}@${CI_SERVER_HOST}:${CI_SERVER_PORT}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME} assignment
+        - export ARTEMIS_NOTIFICATION_SECRET=[hidden] # Workaround for overwriting the secret
+        - export ARTEMIS_TEST_GIT_TOKEN=[hidden]
+        - cargo nextest run --profile ci | tee -a "${ARTEMIS_BUILD_LOGS_FILE}" && echo "ARTEMIS_BUILD_STATUS=success" > .env || echo "ARTEMIS_BUILD_STATUS=failed" > .env
+        - test -e target/nextest/ci/junit.xml && sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\/testsuites>/<\/testsuite>/g' target/nextest/ci/junit.xml  # <testsuites> not supported by notification plugin
+    after_script:
+        - echo "ARTEMIS_TEST_GIT_HASH=$(git rev-parse HEAD)" >> .env
+        - echo "ARTEMIS_SUBMISSION_GIT_HASH=${CI_COMMIT_SHA}" >> .env
+        - echo "ARTEMIS_SUBMISSION_GIT_REPOSITORY_SLUG=${CI_PROJECT_NAME}" >> .env
+    artifacts:
+        paths:
+            - ${ARTEMIS_BUILD_LOGS_FILE}
+            - target/nextest/ci/*.xml
+        reports:
+            dotenv: .env
+
+
+upload-job:
+    image: ${ARTEMIS_NOTIFICATION_PLUGIN_DOCKER_IMAGE}
+    stage: upload
+    dependencies:
+        - test-job
+    only:
+        variables:
+            - $CI_COMMIT_BRANCH == $ARTEMIS_SUBMISSION_GIT_BRANCH
+    variables:
+        GIT_STRATEGY: none
+    script:
+        - cp -r /notification-plugin/* .
+        - export ARTEMIS_TEST_RESULTS_DIR="target/nextest/ci"  # override project variable
+        - gradle run
diff --git a/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy
new file mode 100644
index 000000000000..965d7423ce7c
--- /dev/null
+++ b/src/main/resources/templates/jenkins/rust/regularRuns/pipeline.groovy
@@ -0,0 +1,56 @@
+/*
+ * This file configures the actual build steps for the automatic grading.
+ *
+ * !!!
+ * For regular exercises, there is no need to make changes to this file.
+ * Only this base configuration is actively supported by the Artemis maintainers
+ * and/or your Artemis instance administrators.
+ * !!!
+ */
+
+dockerImage = '#dockerImage'
+dockerFlags = '#dockerArgs'
+
+/**
+ * Main function called by Jenkins.
+ */
+void testRunner() {
+    docker.image(dockerImage).inside(dockerFlags) { c ->
+        runTestSteps()
+    }
+}
+
+private void runTestSteps() {
+    test()
+}
+
+/**
+ * Run unit tests
+ */
+private void test() {
+    stage('Test') {
+        sh 'cargo nextest run --profile ci'
+    }
+}
+
+/**
+ * Script of the post build tasks aggregating all JUnit files in $WORKSPACE/results.
+ *
+ * Called by Jenkins.
+ */
+void postBuildTasks() {
+    sh '''
+    rm -rf results
+    mkdir results
+    if [ -e target/nextest/ci/junit.xml ]
+    then
+        sed -i 's/<testsuites[^>]*>/<testsuite>/g ; s/<\\/testsuites>/<\\/testsuite>/g' target/nextest/ci/junit.xml
+    fi
+    cp target/nextest/ci/junit.xml $WORKSPACE/results/ || true
+    sed -i 's/[^[:print:]\t]/�/g' $WORKSPACE/results/*.xml || true
+    '''
+}
+
+// very important, do not remove
+// required so that Jenkins finds the methods defined in this script
+return this
diff --git a/src/main/resources/templates/rust/exercise/.gitattributes b/src/main/resources/templates/rust/exercise/.gitattributes
new file mode 100644
index 000000000000..2677732ca2e9
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto eol=lf
+
+*.rs       text eol=lf diff=rust
+Cargo.toml text eol=lf
+Cargo.lock text eol=lf
diff --git a/src/main/resources/templates/rust/exercise/.gitignore b/src/main/resources/templates/rust/exercise/.gitignore
new file mode 100644
index 000000000000..ea8c4bf7f35f
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/src/main/resources/templates/rust/exercise/Cargo.lock b/src/main/resources/templates/rust/exercise/Cargo.lock
new file mode 100644
index 000000000000..2f5f96ba7454
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/Cargo.lock
@@ -0,0 +1,100 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rust-template-exercise"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "rand",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
diff --git a/src/main/resources/templates/rust/exercise/Cargo.toml b/src/main/resources/templates/rust/exercise/Cargo.toml
new file mode 100644
index 000000000000..34b160c5368d
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust-template-exercise"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+chrono = { version = "0.4.38", default-features = false }
+rand = "0.8.5"
diff --git a/src/main/resources/templates/rust/exercise/src/bubble_sort.rs b/src/main/resources/templates/rust/exercise/src/bubble_sort.rs
new file mode 100644
index 000000000000..0587d2852dcf
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/bubble_sort.rs
@@ -0,0 +1,14 @@
+use chrono::NaiveDate;
+
+pub struct BubbleSort;
+
+impl BubbleSort {
+    /// Sorts items with the Bubble Sort algorithm.
+    ///
+    /// Arguments:
+    ///
+    /// * `input`: slice of items to be sorted
+    pub fn perform_sort(&self, input: &mut [NaiveDate]) {
+        todo!("implement");
+    }
+}
diff --git a/src/main/resources/templates/rust/exercise/src/context.rs b/src/main/resources/templates/rust/exercise/src/context.rs
new file mode 100644
index 000000000000..30940f4db7a7
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/context.rs
@@ -0,0 +1 @@
+// TODO: Create and implement a Context struct according to the UML class diagram
diff --git a/src/main/resources/templates/rust/exercise/src/lib.rs b/src/main/resources/templates/rust/exercise/src/lib.rs
new file mode 100644
index 000000000000..930d9899389d
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/lib.rs
@@ -0,0 +1,5 @@
+pub mod bubble_sort;
+pub mod context;
+pub mod merge_sort;
+pub mod policy;
+pub mod sort_strategy;
diff --git a/src/main/resources/templates/rust/exercise/src/main.rs b/src/main/resources/templates/rust/exercise/src/main.rs
new file mode 100644
index 000000000000..9263a66a267e
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/main.rs
@@ -0,0 +1,53 @@
+use std::ops::RangeInclusive;
+use std::time::Duration;
+
+use chrono::{NaiveDate, TimeDelta};
+use rand::{thread_rng, Rng};
+
+const ITERATIONS: usize = 10;
+const LENGTH_MIN: usize = 5;
+const LENGTH_MAX: usize = 15;
+
+/// Main function.
+/// Add code to demonstrate your implementation here.
+fn main() {
+    todo!("Init Context and Policy");
+
+    // Run multiple times to simulate different sorting strategies
+    for _ in 0..ITERATIONS {
+        let mut dates = create_random_dates();
+        todo!("Configure context");
+        println!("Unsorted Array of course dates = {dates:#?}");
+
+        todo!("Sort dates");
+
+        println!("Sorted Array of course dates = {dates:#?}");
+    }
+}
+
+/// Generates a [Vec] of random [NaiveDate] objects with a random length
+/// between [LENGTH_MIN] and [LENGTH_MAX].
+fn create_random_dates() -> Vec<NaiveDate> {
+    let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX);
+
+    let date_format = "%Y-%m-%d";
+    let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap();
+    let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap();
+
+    let mut dates = Vec::new();
+    dates.resize_with(length, || random_date_within(low_date..=high_date));
+    dates
+}
+
+/// Creates a random Date within the given range.
+fn random_date_within(range: RangeInclusive<NaiveDate>) -> NaiveDate {
+    let (start, end) = range.into_inner();
+
+    let max_delta = end - start;
+    let max_duration = max_delta.to_std().unwrap();
+
+    let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration);
+    let random_delta = TimeDelta::from_std(random_duration).unwrap();
+
+    start + random_delta
+}
diff --git a/src/main/resources/templates/rust/exercise/src/merge_sort.rs b/src/main/resources/templates/rust/exercise/src/merge_sort.rs
new file mode 100644
index 000000000000..78fbb6b6dd33
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/merge_sort.rs
@@ -0,0 +1,14 @@
+use chrono::NaiveDate;
+
+pub struct MergeSort;
+
+impl MergeSort {
+    /// Sorts items with the Merge Sort algorithm.
+    ///
+    /// Arguments:
+    ///
+    /// * `input`: slice of items to be sorted
+    pub fn perform_sort(&self, input: &mut [NaiveDate]) {
+        todo!("implement");
+    }
+}
diff --git a/src/main/resources/templates/rust/exercise/src/policy.rs b/src/main/resources/templates/rust/exercise/src/policy.rs
new file mode 100644
index 000000000000..ebaa1dfd92d3
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/policy.rs
@@ -0,0 +1 @@
+// TODO: Create and implement a Policy class as described in the problem statement
diff --git a/src/main/resources/templates/rust/exercise/src/sort_strategy.rs b/src/main/resources/templates/rust/exercise/src/sort_strategy.rs
new file mode 100644
index 000000000000..ccd9a65d5246
--- /dev/null
+++ b/src/main/resources/templates/rust/exercise/src/sort_strategy.rs
@@ -0,0 +1,2 @@
+// TODO: Create a SortStrategy interface according to the UML class diagram
+// TODO: Make the sorting algorithms implement this trait.
diff --git a/src/main/resources/templates/rust/readme b/src/main/resources/templates/rust/readme
new file mode 100755
index 000000000000..9510a4ca0428
--- /dev/null
+++ b/src/main/resources/templates/rust/readme
@@ -0,0 +1,91 @@
+# Sorting with the Strategy Pattern
+
+In this exercise, we want to implement sorting algorithms and choose them based on runtime specific variables.
+
+### Part 1: Sorting
+
+First, we need to implement two sorting algorithms, in this case `MergeSort` and `BubbleSort`.
+
+**You have the following tasks:**
+
+1. [task][Implement Bubble Sort](test_bubble_sort)
+Implement the method `perform_sort(&mut [NaiveDate])` in the struct `BubbleSort`. Make sure to follow the Bubble Sort algorithm exactly.
+
+2. [task][Implement Merge Sort](test_merge_sort)
+Implement the method `perform_sort(&mut [NaiveDate])` in the struct `MergeSort`. Make sure to follow the Merge Sort algorithm exactly.
+
+### Part 2: Strategy Pattern
+
+We want the application to apply different algorithms for sorting a slice of `NaiveDate` objects.
+Use the strategy pattern to select the right sorting algorithm at runtime.
+
+**You have the following tasks:**
+
+1. [task][SortStrategy Interface](test_sort_strategy_trait,test_sort_strategy_methods,test_sort_strategy_supertrait,test_merge_sort_struct,test_bubble_sort_struct)
+Create a `SortStrategy` trait and adjust the sorting algorithms so that they implement this interface.
+Also make sure to declare `std::any::Any` as a supertrait.
+
+2. [task][Context Class](test_context_fields,test_context_methods)
+Create and implement a `Context` struct following the below class diagram.
+Also add a getter for `sort_algorithm` with the signature `sort_algorithm(&self) -> &dyn SortStrategy`.
+
+3. [task][Context Policy](test_policy_fields,test_policy_methods)
+Create and implement a `Policy` struct following the below class diagram with a simple configuration mechanism:
+
+    1. [task][Select MergeSort](test_merge_sort_struct,test_use_merge_sort_for_big_list)
+    Select `MergeSort` when the List has more than 10 dates.
+
+    2. [task][Select BubbleSort](test_bubble_sort_struct,test_use_bubble_sort_for_small_list)
+    Select `BubbleSort` when the List has less or equal 10 dates.
+
+4. Complete the `main()` function which demonstrates switching between two strategies at runtime.
+
+@startuml
+
+class Policy {
+  <color:testsColor(test_policy_methods)>+new(&RefCell<Context>)</color>
+  <color:testsColor(test_policy_methods)>+configure(&[NaiveDate])</color>
+}
+
+class Context {
+  <color:testsColor(test_context_methods)>+new()</color>
+  <color:testsColor(test_context_methods)>+sort(&mut [NaiveDate])</color>
+}
+
+interface Any {
+}
+
+interface SortStrategy {
+  <color:testsColor(test_sort_strategy_methods)>+perform_sort(&mut [NaiveDate])</color>
+}
+
+class BubbleSort {
+  <color:testsColor(test_bubble_sort)>+perform_sort(&mut [NaiveDate])</color>
+}
+
+class MergeSort {
+  <color:testsColor(test_merge_sort)>+perform_sort(&mut [NaiveDate])</color>
+}
+
+MergeSort -up-|> SortStrategy #testsColor(test_merge_sort_struct)
+BubbleSort -up-|> SortStrategy #testsColor(test_bubble_sort_struct)
+SortStrategy -up-|> Any #testsColor(test_sort_strategy_supertrait)
+Policy -right-> Context #testsColor(test_policy_fields): context
+Context -right-> SortStrategy #testsColor(test_context_fields): sort_algorithm
+
+hide empty fields
+hide empty methods
+
+@enduml
+
+
+### Part 3: Optional Challenges
+
+(These are not tested)
+
+1. Create a new struct `QuickSort` that implements `SortStrategy` and implement the Quick Sort algorithm.
+
+2. Make the method `perform_sort(&mut [NaiveDate])` generic, so that other types can also be sorted by the same method.
+**Hint:** Have a look at Rust Generics and the trait `Ord`.
+
+3. Think about a useful decision in `Policy` when to use the new `QuickSort` algorithm.
diff --git a/src/main/resources/templates/rust/solution/.gitattributes b/src/main/resources/templates/rust/solution/.gitattributes
new file mode 100644
index 000000000000..2677732ca2e9
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto eol=lf
+
+*.rs       text eol=lf diff=rust
+Cargo.toml text eol=lf
+Cargo.lock text eol=lf
diff --git a/src/main/resources/templates/rust/solution/.gitignore b/src/main/resources/templates/rust/solution/.gitignore
new file mode 100644
index 000000000000..ea8c4bf7f35f
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/src/main/resources/templates/rust/solution/Cargo.lock b/src/main/resources/templates/rust/solution/Cargo.lock
new file mode 100644
index 000000000000..2f5f96ba7454
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/Cargo.lock
@@ -0,0 +1,100 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rust-template-exercise"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "rand",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
diff --git a/src/main/resources/templates/rust/solution/Cargo.toml b/src/main/resources/templates/rust/solution/Cargo.toml
new file mode 100644
index 000000000000..34b160c5368d
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "rust-template-exercise"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+chrono = { version = "0.4.38", default-features = false }
+rand = "0.8.5"
diff --git a/src/main/resources/templates/rust/solution/src/bubble_sort.rs b/src/main/resources/templates/rust/solution/src/bubble_sort.rs
new file mode 100644
index 000000000000..82c751842786
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/bubble_sort.rs
@@ -0,0 +1,23 @@
+use std::cmp::Ord;
+
+use crate::sort_strategy::SortStrategy;
+
+pub struct BubbleSort;
+
+impl<T: Ord> SortStrategy<T> for BubbleSort {
+    /// Sorts items with the Bubble Sort algorithm.
+    ///
+    /// Arguments:
+    ///
+    /// * `input`: slice of items to be sorted
+    fn perform_sort(&self, input: &mut [T]) {
+        let len = input.len();
+        for i in (0..len).rev() {
+            for j in 0..i {
+                if input[j] > input[j + 1] {
+                    input.swap(j, j + 1);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/resources/templates/rust/solution/src/context.rs b/src/main/resources/templates/rust/solution/src/context.rs
new file mode 100644
index 000000000000..71cd0d711753
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/context.rs
@@ -0,0 +1,36 @@
+use crate::sort_strategy::SortStrategy;
+use chrono::NaiveDate;
+use std::ops::Deref;
+
+pub struct Context {
+    sort_algorithm: Option<Box<dyn SortStrategy<NaiveDate>>>,
+}
+
+impl Context {
+    pub fn new() -> Context {
+        Context {
+            sort_algorithm: None,
+        }
+    }
+
+    /// Runs the configured sorting algorithm.
+    pub fn sort(&self, data: &mut [NaiveDate]) {
+        let sort_algorithm = self
+            .sort_algorithm
+            .as_ref()
+            .expect("sort_algorithm has to be set before sort() is called");
+
+        sort_algorithm.perform_sort(data);
+    }
+
+    pub fn set_sort_algorithm(&mut self, sort_algorithm: Box<dyn SortStrategy<NaiveDate>>) {
+        self.sort_algorithm = Some(sort_algorithm);
+    }
+
+    pub fn sort_algorithm(&self) -> &dyn SortStrategy<NaiveDate> {
+        self.sort_algorithm
+            .as_ref()
+            .expect("sort_algorithm has to be set")
+            .deref()
+    }
+}
diff --git a/src/main/resources/templates/rust/solution/src/lib.rs b/src/main/resources/templates/rust/solution/src/lib.rs
new file mode 100644
index 000000000000..930d9899389d
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/lib.rs
@@ -0,0 +1,5 @@
+pub mod bubble_sort;
+pub mod context;
+pub mod merge_sort;
+pub mod policy;
+pub mod sort_strategy;
diff --git a/src/main/resources/templates/rust/solution/src/main.rs b/src/main/resources/templates/rust/solution/src/main.rs
new file mode 100644
index 000000000000..0d8d362fafc9
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/main.rs
@@ -0,0 +1,59 @@
+use std::time::Duration;
+use std::{cell::RefCell, ops::RangeInclusive};
+
+use chrono::{NaiveDate, TimeDelta};
+use rand::{thread_rng, Rng};
+
+use rust_template_exercise::{context::Context, policy::Policy};
+
+const ITERATIONS: usize = 10;
+const LENGTH_MIN: usize = 5;
+const LENGTH_MAX: usize = 15;
+
+/// Main function.
+/// Add code to demonstrate your implementation here.
+fn main() {
+    // Init Context and Policy
+    let context = RefCell::new(Context::new());
+    let mut policy = Policy::new(&context);
+
+    // Run multiple times to simulate different sorting strategies
+    for _ in 0..ITERATIONS {
+        let mut dates = create_random_dates();
+        // Configure context
+        policy.configure(&dates);
+        println!("Unsorted Array of course dates = {dates:#?}");
+
+        // Sort dates
+        context.borrow().sort(&mut dates);
+
+        println!("Sorted Array of course dates = {dates:#?}");
+    }
+}
+
+/// Generates a [Vec] of random [NaiveDate] objects with a random length
+/// between [LENGTH_MIN] and [LENGTH_MAX].
+fn create_random_dates() -> Vec<NaiveDate> {
+    let length = thread_rng().gen_range(LENGTH_MIN..=LENGTH_MAX);
+
+    let date_format = "%Y-%m-%d";
+    let low_date = NaiveDate::parse_from_str("2024-09-15", date_format).unwrap();
+    let high_date = NaiveDate::parse_from_str("2025-01-15", date_format).unwrap();
+
+    let mut dates = Vec::new();
+    dates.resize_with(length, || random_date_within(low_date..=high_date));
+    dates
+}
+
+/// Creates a random Date within the given range.
+fn random_date_within(range: RangeInclusive<NaiveDate>) -> NaiveDate {
+    let (start, end) = range.into_inner();
+
+    let max_delta = end - start;
+    let max_duration = max_delta.to_std().unwrap();
+
+    let random_duration = thread_rng().gen_range(Duration::ZERO..=max_duration);
+    let random_delta = TimeDelta::from_std(random_duration).unwrap();
+
+    start + random_delta
+}
diff --git a/src/main/resources/templates/rust/solution/src/merge_sort.rs b/src/main/resources/templates/rust/solution/src/merge_sort.rs
new file mode 100644
index 000000000000..a1887c6d38f8
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/merge_sort.rs
@@ -0,0 +1,59 @@
+use std::cmp::Ord;
+
+use crate::sort_strategy::SortStrategy;
+
+pub struct MergeSort;
+
+impl<T: Ord + Copy> SortStrategy<T> for MergeSort {
+    /// Sorts items with the Merge Sort algorithm.
+    ///
+    /// Arguments:
+    ///
+    /// * `input`: slice of items to be sorted
+    fn perform_sort(&self, input: &mut [T]) {
+        mergesort(input);
+    }
+}
+
+fn mergesort<T: Ord + Copy>(input: &mut [T]) {
+    if input.len() < 2 {
+        return;
+    }
+
+    let middle = input.len() / 2;
+    let (left, right) = input.split_at_mut(middle);
+    mergesort(left);
+    mergesort(right);
+    merge(input, middle);
+}
+
+fn merge<T: Ord + Copy>(input: &mut [T], middle: usize) {
+    let mut result = Vec::with_capacity(input.len());
+
+    let mut left_index = 0;
+    let mut right_index = middle;
+
+    while left_index < middle && right_index < input.len() {
+        if input[left_index] <= input[right_index] {
+            result.push(input[left_index]);
+            left_index += 1;
+        } else {
+            result.push(input[right_index]);
+            right_index += 1;
+        }
+    }
+
+    if left_index < middle {
+        while left_index < middle {
+            result.push(input[left_index]);
+            left_index += 1;
+        }
+    } else {
+        while right_index < input.len() {
+            result.push(input[right_index]);
+            right_index += 1;
+        }
+    }
+
+    input.copy_from_slice(&result);
+}
diff --git a/src/main/resources/templates/rust/solution/src/policy.rs b/src/main/resources/templates/rust/solution/src/policy.rs
new file mode 100644
index 000000000000..a8e7e5203162
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/policy.rs
@@ -0,0 +1,28 @@
+use crate::{
+    bubble_sort::BubbleSort, context::Context, merge_sort::MergeSort, sort_strategy::SortStrategy,
+};
+use chrono::NaiveDate;
+use std::cell::RefCell;
+
+const SIZE_THRESHOLD: usize = 10;
+
+pub struct Policy<'a> {
+    context: &'a RefCell<Context>,
+}
+
+impl<'a> Policy<'a> {
+    pub fn new(context: &'a RefCell<Context>) -> Policy<'a> {
+        Policy { context }
+    }
+
+    /// Chooses a strategy depending on the number of items.
+    pub fn configure(&mut self, data: &[NaiveDate]) {
+        let sort_algorithm: Box<dyn SortStrategy<NaiveDate>> = if data.len() > SIZE_THRESHOLD {
+            Box::new(MergeSort)
+        } else {
+            Box::new(BubbleSort)
+        };
+
+        self.context.borrow_mut().set_sort_algorithm(sort_algorithm);
+    }
+}
diff --git a/src/main/resources/templates/rust/solution/src/sort_strategy.rs b/src/main/resources/templates/rust/solution/src/sort_strategy.rs
new file mode 100644
index 000000000000..b924206e39ba
--- /dev/null
+++ b/src/main/resources/templates/rust/solution/src/sort_strategy.rs
@@ -0,0 +1,10 @@
+use std::any::Any;
+
+pub trait SortStrategy<T: Ord>: Any {
+    /// Sorts a slice of `T`s.
+    ///
+    /// Arguments:
+    ///
+    /// * `input`: slice of items to be sorted
+    fn perform_sort(&self, input: &mut [T]);
+}
diff --git a/src/main/resources/templates/rust/test/.config/nextest.toml b/src/main/resources/templates/rust/test/.config/nextest.toml
new file mode 100644
index 000000000000..6a109e171680
--- /dev/null
+++ b/src/main/resources/templates/rust/test/.config/nextest.toml
@@ -0,0 +1,5 @@
+[profile.ci]
+fail-fast = false
+
+[profile.ci.junit]
+path = "junit.xml"
diff --git a/src/main/resources/templates/rust/test/.gitattributes b/src/main/resources/templates/rust/test/.gitattributes
new file mode 100644
index 000000000000..2677732ca2e9
--- /dev/null
+++ b/src/main/resources/templates/rust/test/.gitattributes
@@ -0,0 +1,5 @@
+* text=auto eol=lf
+
+*.rs       text eol=lf diff=rust
+Cargo.toml text eol=lf
+Cargo.lock text eol=lf
diff --git a/src/main/resources/templates/rust/test/.gitignore b/src/main/resources/templates/rust/test/.gitignore
new file mode 100644
index 000000000000..a37c5236a444
--- /dev/null
+++ b/src/main/resources/templates/rust/test/.gitignore
@@ -0,0 +1,2 @@
+/target
+/assignment
diff --git a/src/main/resources/templates/rust/test/Cargo.lock b/src/main/resources/templates/rust/test/Cargo.lock
new file mode 100644
index 000000000000..bb5595575a1a
--- /dev/null
+++ b/src/main/resources/templates/rust/test/Cargo.lock
@@ -0,0 +1,183 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "autocfg"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.155"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rust-template-exercise"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "rand",
+]
+
+[[package]]
+name = "rust-template-test"
+version = "0.1.0"
+dependencies = [
+ "chrono",
+ "rust-template-exercise",
+ "rust_template_test_macros",
+ "syn",
+]
+
+[[package]]
+name = "rust_template_test_macros"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "zerocopy"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/src/main/resources/templates/rust/test/Cargo.toml b/src/main/resources/templates/rust/test/Cargo.toml
new file mode 100644
index 000000000000..07f82b3f09f0
--- /dev/null
+++ b/src/main/resources/templates/rust/test/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "rust-template-test"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+chrono = { version = "0.4.38", default-features = false }
+rust-template-exercise = { path = "assignment" }
+syn = { version = "2.0.72", features = ["full"] }
+rust_template_test_macros = { path = "./rust_template_test_macros" }
+
+[build-dependencies]
+syn = { version = "2.0.72", features = ["full"] }
diff --git a/src/main/resources/templates/rust/test/build.rs b/src/main/resources/templates/rust/test/build.rs
new file mode 100644
index 000000000000..850fcb846cce
--- /dev/null
+++ b/src/main/resources/templates/rust/test/build.rs
@@ -0,0 +1,204 @@
+use std::error::Error;
+use std::ffi::OsStr;
+use std::fs::read_to_string;
+use std::path::{Component, Path};
+use std::{fs, io};
+
+use syn::{parse_file, FnArg, ImplItem, Item, TraitItem, Type, TypeParamBound};
+
+const SRC_DIR: &str = "assignment/src";
+
+fn main() {
+    println!("cargo::rerun-if-changed={SRC_DIR}");
+    if let Err(err) = visit_dirs(Path::new(SRC_DIR), &process_file) {
+        eprintln!("Failed to analyze submission: {err}");
+    }
+}
+
+fn visit_dirs<F: Fn(&Path) -> Result<(), Box<dyn Error>>>(
+    dir: &Path,
+    cb: &F,
+) -> Result<(), Box<dyn Error>> {
+    for entry in fs::read_dir(dir).map_err(|e| {
+        io::Error::new(
+            e.kind(),
+            format!("Failed to read directory {}: {}", dir.display(), e),
+        )
+    })? {
+        let entry = entry?;
+        let path = entry.path();
+        if path.is_dir() {
+            visit_dirs(&path, cb)?;
+        } else {
+            cb(&entry.path())?;
+        }
+    }
+    Ok(())
+}
+
+fn process_file(path: &Path) -> Result<(), Box<dyn Error>> {
+    if path.extension() != Some(OsStr::new("rs")) {
+        return Ok(());
+    }
+
+    let file_content = read_to_string(path)?;
+
+    let ast = parse_file(&file_content)?;
+
+    let module = path
+        .strip_prefix(SRC_DIR)?
+        .with_extension("")
+        .components()
+        .map(Component::as_os_str)
+        .collect::<Vec<_>>()
+        .join(OsStr::new("_"));
+    let module = module.to_str().ok_or("invalid UTF-8 in path")?;
+
+    for item in ast.items {
+        match item {
+            Item::Enum(e) => {
+                println!("cargo::rustc-cfg=structure_{module}_enum_{}", e.ident);
+
+                for v in e.variants {
+                    println!(
+                        "cargo::rustc-cfg=structure_{module}_enum_{}_variant_{}",
+                        e.ident, v.ident
+                    );
+                }
+            }
+            Item::Fn(f) => println!("cargo::rustc-cfg=structure_{module}_fn_{}", f.sig.ident),
+            Item::Impl(impl_) => {
+                let self_path = if let Type::Path(p) = *impl_.self_ty {
+                    p
+                } else {
+                    continue;
+                };
+
+                let self_ident = if let Some(i) = self_path.path.segments.last().map(|s| &s.ident) {
+                    i
+                } else {
+                    continue;
+                };
+
+                if impl_.trait_.is_some() {
+                    let trait_ident = if let Some(i) = impl_
+                        .trait_
+                        .as_ref()
+                        .unwrap()
+                        .1
+                        .segments
+                        .last()
+                        .map(|s| &s.ident)
+                    {
+                        i
+                    } else {
+                        continue;
+                    };
+                    println!(
+                        "cargo::rustc-cfg=structure_{module}_impl_{trait_ident}_for_{self_ident}"
+                    );
+                    continue;
+                }
+
+                for item in impl_.items {
+                    match item {
+                        ImplItem::Const(c) => println!(
+                            "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_const_{}",
+                            c.ident
+                        ),
+                        ImplItem::Fn(f) => {
+                            println!(
+                                "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_fn_{}",
+                                f.sig.ident
+                            );
+
+                            if matches!(f.sig.inputs.first(), Some(&FnArg::Receiver(_))) {
+                                println!(
+                                    "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_method_{}",
+                                    f.sig.ident
+                                );
+                            }
+                        }
+                        ImplItem::Type(t) => println!(
+                            "cargo::rustc-cfg=structure_{module}_impl_{self_ident}_type_{}",
+                            t.ident
+                        ),
+                        _ => continue,
+                    }
+                }
+            }
+            Item::Struct(struct_) => {
+                println!(
+                    "cargo::rustc-cfg=structure_{module}_struct_{}",
+                    struct_.ident
+                );
+
+                for field in struct_.fields {
+                    if let Some(field_ident) = field.ident {
+                        println!(
+                            "cargo::rustc-cfg=structure_{module}_struct_{}_field_{field_ident}",
+                            struct_.ident
+                        );
+                    }
+                }
+            }
+            Item::Trait(trait_) => {
+                println!("cargo::rustc-cfg=structure_{module}_trait_{}", trait_.ident);
+
+                for supertrait in trait_.supertraits {
+                    let supertrait = match supertrait {
+                        TypeParamBound::Trait(supertrait) => supertrait,
+                        _ => continue,
+                    };
+                    let supertrait = &supertrait.path.segments.last().unwrap().ident;
+                    println!(
+                        "cargo::rustc-cfg=structure_{module}_trait_{}_supertrait_{supertrait}",
+                        trait_.ident
+                    );
+                }
+
+                for item in trait_.items {
+                    match item {
+                        TraitItem::Const(c) => println!(
+                            "cargo::rustc-cfg=structure_{module}_trait_{}_const_{}",
+                            trait_.ident, c.ident
+                        ),
+                        TraitItem::Fn(f) => {
+                            println!(
+                                "cargo::rustc-cfg=structure_{module}_trait_{}_fn_{}",
+                                trait_.ident, f.sig.ident
+                            );
+
+                            if matches!(f.sig.inputs.first(), Some(&FnArg::Receiver(_))) {
+                                println!(
+                                    "cargo::rustc-cfg=structure_{module}_trait_{}_method_{}",
+                                    trait_.ident, f.sig.ident
+                                );
+                            }
+                        }
+                        TraitItem::Type(t) => println!(
+                            "cargo::rustc-cfg=structure_{module}_trait_{}_type_{}",
+                            trait_.ident, t.ident
+                        ),
+                        _ => continue,
+                    }
+                }
+            }
+            Item::Union(union_) => {
+                println!("cargo::rustc-cfg=structure_{module}_union_{}", union_.ident);
+
+                for field in union_.fields.named {
+                    if let Some(field_ident) = field.ident {
+                        println!(
+                            "cargo::rustc-cfg=structure_{module}_union_{}_field_{field_ident}",
+                            union_.ident
+                        );
+                    }
+                }
+            }
+            _ => continue,
+        }
+    }
+
+    Ok(())
+}
diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore b/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore
new file mode 100644
index 000000000000..ea8c4bf7f35f
--- /dev/null
+++ b/src/main/resources/templates/rust/test/rust_template_test_macros/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock
new file mode 100644
index 000000000000..a1259e414852
--- /dev/null
+++ b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.lock
@@ -0,0 +1,46 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "rust_template_test_macros"
+version = "0.1.0"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml
new file mode 100644
index 000000000000..625dee26344d
--- /dev/null
+++ b/src/main/resources/templates/rust/test/rust_template_test_macros/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "rust_template_test_macros"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+proc-macro = true
+
+[dependencies]
+quote = "1.0.36"
+syn = { version = "2.0.72", features = ["full"] }
diff --git a/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs
new file mode 100644
index 000000000000..498fa14d54a1
--- /dev/null
+++ b/src/main/resources/templates/rust/test/rust_template_test_macros/src/lib.rs
@@ -0,0 +1,346 @@
+//! Compile-time source code reflection
+//!
+//! Use this for conditional compilation.
+
+use proc_macro::TokenStream;
+
+use quote::{format_ident, quote};
+use syn::parse::Parse;
+use syn::{parse_macro_input, Ident, Item, ItemFn, Path, Token};
+
+trait ToStringLocal {
+    fn to_string(&self) -> String;
+}
+
+impl ToStringLocal for Path {
+    fn to_string(&self) -> String {
+        let segments: Vec<_> = self.segments.iter().map(|s| s.ident.to_string()).collect();
+        segments.join("::")
+    }
+}
+
+#[proc_macro_attribute]
+pub fn require_struct(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_struct)
+}
+
+#[proc_macro_attribute]
+pub fn require_struct_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_struct)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait)
+}
+
+#[proc_macro_attribute]
+pub fn require_enum(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_enum)
+}
+
+#[proc_macro_attribute]
+pub fn require_enum_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_enum)
+}
+
+#[proc_macro_attribute]
+pub fn require_function(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_for_trait(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_impl_for_trait)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_for_trait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_impl_for_trait)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_function(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_impl_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_impl_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_method(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_impl_method)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_impl_method)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_const(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_impl_const)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_impl_const)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_type(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_impl_type)
+}
+
+#[proc_macro_attribute]
+pub fn require_impl_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_impl_type)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_function(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_function_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait_function)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_method(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait_method)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_method_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait_method)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_const(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait_const)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_const_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait_const)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_type(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait_type)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_type_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait_type)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_supertrait(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_item(attr, item, make_cfg_trait_supertrait)
+}
+
+#[proc_macro_attribute]
+pub fn require_trait_supertrait_or_fail(attr: TokenStream, item: TokenStream) -> TokenStream {
+    require_for_function(attr, item, make_cfg_trait_supertrait)
+}
+
+struct SuperTraitSpec {
+    module_path: String,
+    trait_name: String,
+    supertrait: String,
+}
+
+impl Parse for SuperTraitSpec {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let path: Path = input.parse()?;
+        input.parse::<Token![:]>()?;
+        let supertrait: Path = input.parse()?;
+
+        let (module_path, trait_name) = split_path(path);
+        let supertrait = supertrait.segments.last().unwrap().ident.to_string();
+
+        Ok(SuperTraitSpec {
+            module_path,
+            trait_name,
+            supertrait,
+        })
+    }
+}
+
+impl ToStringLocal for SuperTraitSpec {
+    fn to_string(&self) -> String {
+        format!(
+            "supertrait {} of {}::{}",
+            self.supertrait, self.module_path, self.trait_name
+        )
+    }
+}
+
+fn require_for_item<A: Parse, F: FnOnce(A) -> Ident>(
+    attr: TokenStream,
+    item: TokenStream,
+    make_cfg: F,
+) -> TokenStream {
+    let attribute = parse_macro_input!(attr as A);
+    let original_item = parse_macro_input!(item as Item);
+
+    let cfg = make_cfg(attribute);
+
+    quote! (
+        #[cfg(#cfg)]
+        #original_item
+    )
+    .into()
+}
+
+fn require_for_function<A: Parse + ToStringLocal, F: FnOnce(A) -> Ident>(
+    attr: TokenStream,
+    item: TokenStream,
+    make_cfg: F,
+) -> TokenStream {
+    let attribute = parse_macro_input!(attr as A);
+    let original_fn = parse_macro_input!(item as ItemFn);
+
+    let failure_message = format!("missing {}", attribute.to_string());
+
+    let cfg = make_cfg(attribute);
+
+    let ItemFn {
+        attrs,
+        vis,
+        sig,
+        block,
+    } = original_fn;
+
+    quote!(
+        #(#attrs)*
+        #vis #sig {
+            #[cfg(not(#cfg))]
+            panic!(#failure_message);
+            #[cfg(#cfg)]
+            #block
+        }
+    )
+    .into()
+}
+
+fn make_cfg_struct(path: Path) -> Ident {
+    let (module_path, struct_name) = split_path(path);
+    format_ident!("structure_{module_path}_struct_{struct_name}")
+}
+
+fn make_cfg_trait(path: Path) -> Ident {
+    let (module_path, trait_name) = split_path(path);
+    format_ident!("structure_{module_path}_trait_{trait_name}")
+}
+
+fn make_cfg_enum(path: Path) -> Ident {
+    let (module_path, enum_name) = split_path(path);
+    format_ident!("structure_{module_path}_enum_{enum_name}")
+}
+
+fn make_cfg_function(path: Path) -> Ident {
+    let (module_path, function_name) = split_path(path);
+    format_ident!("structure_{module_path}_fn_{function_name}")
+}
+
+fn make_cfg_impl_for_trait(path: Path) -> Ident {
+    let (module_path, self_type, trait_name) = split_path2(path);
+    format_ident!("structure_{module_path}_impl_{trait_name}_for_{self_type}")
+}
+
+fn make_cfg_impl_function(path: Path) -> Ident {
+    let (module_path, self_type, function) = split_path2(path);
+    format_ident!("structure_{module_path}_impl_{self_type}_fn_{function}")
+}
+
+fn make_cfg_impl_method(path: Path) -> Ident {
+    let (module_path, self_type, function) = split_path2(path);
+    format_ident!("structure_{module_path}_impl_{self_type}_method_{function}")
+}
+
+fn make_cfg_impl_const(path: Path) -> Ident {
+    let (module_path, self_type, const_name) = split_path2(path);
+    format_ident!("structure_{module_path}_impl_{self_type}_const_{const_name}")
+}
+
+fn make_cfg_impl_type(path: Path) -> Ident {
+    let (module_path, self_type, type_name) = split_path2(path);
+    format_ident!("structure_{module_path}_impl_{self_type}_type_{type_name}")
+}
+
+fn make_cfg_trait_function(path: Path) -> Ident {
+    let (module_path, trait_type, function) = split_path2(path);
+    format_ident!("structure_{module_path}_trait_{trait_type}_fn_{function}")
+}
+
+fn make_cfg_trait_method(path: Path) -> Ident {
+    let (module_path, trait_type, function) = split_path2(path);
+    format_ident!("structure_{module_path}_trait_{trait_type}_method_{function}")
+}
+
+fn make_cfg_trait_const(path: Path) -> Ident {
+    let (module_path, trait_type, const_name) = split_path2(path);
+    format_ident!("structure_{module_path}_trait_{trait_type}_const_{const_name}")
+}
+
+fn make_cfg_trait_type(path: Path) -> Ident {
+    let (module_path, trait_type, type_name) = split_path2(path);
+    format_ident!("structure_{module_path}_trait_{trait_type}_type_{type_name}")
+}
+
+fn make_cfg_trait_supertrait(spec: SuperTraitSpec) -> Ident {
+    format_ident!(
+        "structure_{}_trait_{}_supertrait_{}",
+        spec.module_path,
+        spec.trait_name,
+        spec.supertrait
+    )
+}
+
+fn split_path(path: Path) -> (String, String) {
+    let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect();
+    let (item_name, path_segments) = path_segments.split_last().unwrap();
+
+    let item_name = item_name.to_string();
+    let module_path = path_segments
+        .iter()
+        .copied()
+        .map(Ident::to_string)
+        .collect::<Vec<_>>()
+        .join("_");
+
+    (module_path, item_name)
+}
+
+fn split_path2(path: Path) -> (String, String, String) {
+    let path_segments: Vec<_> = path.segments.iter().map(|s| &s.ident).collect();
+    let (item2_name, path_segments) = path_segments.split_last().unwrap();
+    let (item1_name, path_segments) = path_segments.split_last().unwrap();
+
+    let item1_name = item1_name.to_string();
+    let item2_name = item2_name.to_string();
+    let module_path = path_segments
+        .iter()
+        .copied()
+        .map(Ident::to_string)
+        .collect::<Vec<_>>()
+        .join("_");
+
+    (module_path, item1_name, item2_name)
+}
diff --git a/src/main/resources/templates/rust/test/tests/behavior.rs b/src/main/resources/templates/rust/test/tests/behavior.rs
new file mode 100644
index 000000000000..7efd38c20de5
--- /dev/null
+++ b/src/main/resources/templates/rust/test/tests/behavior.rs
@@ -0,0 +1,90 @@
+use chrono::NaiveDate;
+use rust_template_exercise::{bubble_sort::BubbleSort, merge_sort::MergeSort};
+
+use rust_template_test_macros::{
+    require_impl_function_or_fail, require_impl_method_or_fail, require_struct_or_fail,
+    require_trait, require_trait_supertrait_or_fail,
+};
+
+#[require_trait(sort_strategy::SortStrategy)]
+use rust_template_exercise::sort_strategy::SortStrategy;
+
+// We can't use the opt variants because the Option methods aren't const yet
+#[allow(deprecated)]
+const DATES_UNORDERED: [NaiveDate; 4] = [
+    NaiveDate::from_ymd(2018, 11, 8),
+    NaiveDate::from_ymd(2017, 4, 15),
+    NaiveDate::from_ymd(2016, 2, 15),
+    NaiveDate::from_ymd(2017, 9, 15),
+];
+#[allow(deprecated)]
+const DATES_ORDERED: [NaiveDate; 4] = [
+    NaiveDate::from_ymd(2016, 2, 15),
+    NaiveDate::from_ymd(2017, 4, 15),
+    NaiveDate::from_ymd(2017, 9, 15),
+    NaiveDate::from_ymd(2018, 11, 8),
+];
+
+#[test]
+fn test_bubble_sort() {
+    let bubble_sort = BubbleSort;
+    let mut dates = DATES_UNORDERED;
+    bubble_sort.perform_sort(&mut dates);
+    assert_eq!(dates, DATES_ORDERED, "BubbleSort does not sort correctly");
+}
+
+#[test]
+fn test_merge_sort() {
+    let merge_sort = MergeSort;
+    let mut dates = DATES_UNORDERED;
+    merge_sort.perform_sort(&mut dates);
+    assert_eq!(dates, DATES_ORDERED, "MergeSort does not sort correctly");
+}
+
+#[test]
+#[require_struct_or_fail(context::Context)]
+#[require_struct_or_fail(policy::Policy)]
+#[require_trait_supertrait_or_fail(sort_strategy::SortStrategy : Any)]
+#[require_impl_method_or_fail(context::Context::sort_algorithm)]
+#[require_impl_function_or_fail(context::Context::new)]
+#[require_impl_function_or_fail(policy::Policy::new)]
+fn test_use_merge_sort_for_big_list() {
+    let context = std::cell::RefCell::new(rust_template_exercise::context::Context::new());
+    let mut policy = rust_template_exercise::policy::Policy::new(&context);
+
+    let data = [NaiveDate::default(); 20];
+    policy.configure(&data);
+
+    let context = context.borrow();
+    let sort_strategy = context.sort_algorithm();
+
+    assert_eq!(
+        sort_strategy.type_id(),
+        std::any::TypeId::of::<MergeSort>(),
+        "The sort algorithm of Context was not MergeSort for a list with more than 10 dates."
+    );
+}
+
+#[test]
+#[require_struct_or_fail(context::Context)]
+#[require_struct_or_fail(policy::Policy)]
+#[require_trait_supertrait_or_fail(sort_strategy::SortStrategy : Any)]
+#[require_impl_method_or_fail(context::Context::sort_algorithm)]
+#[require_impl_function_or_fail(context::Context::new)]
+#[require_impl_function_or_fail(policy::Policy::new)]
+fn test_use_bubble_sort_for_small_list() {
+    let context = std::cell::RefCell::new(rust_template_exercise::context::Context::new());
+    let mut policy = rust_template_exercise::policy::Policy::new(&context);
+
+    let data = [NaiveDate::default(); 10];
+    policy.configure(&data);
+
+    let context = context.borrow();
+    let sort_strategy = context.sort_algorithm();
+
+    assert_eq!(
+        sort_strategy.type_id(),
+        std::any::TypeId::of::<BubbleSort>(),
+        "The sort algorithm of Context was not BubbleSort for a list with less or equal than 10 dates."
+    );
+}
diff --git a/src/main/resources/templates/rust/test/tests/structural.rs b/src/main/resources/templates/rust/test/tests/structural.rs
new file mode 100644
index 000000000000..70b0d19c9131
--- /dev/null
+++ b/src/main/resources/templates/rust/test/tests/structural.rs
@@ -0,0 +1,79 @@
+mod structural_helpers;
+
+use structural_helpers::*;
+
+#[test]
+fn test_sort_strategy_trait() {
+    let ast = parse_file("./assignment/src/sort_strategy.rs");
+    check_trait_names(&ast.items, ["SortStrategy"])
+        .unwrap_or_else(|name| panic!("A trait named \"{name}\" should be defined"));
+}
+
+#[test]
+fn test_sort_strategy_supertrait() {
+    let ast = parse_file("./assignment/src/sort_strategy.rs");
+    let sort_strategy = find_trait(&ast.items, "SortStrategy")
+        .expect("A trait named \"SortStrategy\" should be defined");
+    check_trait_supertrait(sort_strategy, "Any")
+        .unwrap_or_else(|_| panic!("SortStrategy should have \"Any\" as a supertrait"));
+}
+
+#[test]
+fn test_sort_strategy_methods() {
+    let ast = parse_file("./assignment/src/sort_strategy.rs");
+    let sort_strategy = find_trait(&ast.items, "SortStrategy")
+        .expect("A trait named \"SortStrategy\" should be defined");
+    check_trait_function_names(&sort_strategy.items, ["perform_sort"])
+        .unwrap_or_else(|name| panic!("SortStrategy should define the function \"{name}\""));
+}
+
+#[test]
+fn test_context_fields() {
+    let ast = parse_file("./assignment/src/context.rs");
+    let context =
+        find_struct(&ast.items, "Context").expect("A struct named \"Context\" should be defined");
+    check_struct_field_names(&context.fields, ["sort_algorithm"])
+        .unwrap_or_else(|name| panic!("Context should define the field \"{name}\""));
+}
+
+#[test]
+fn test_context_methods() {
+    let ast = parse_file("./assignment/src/context.rs");
+    let context_impl =
+        find_impl(&ast.items, "Context").expect("SortStrategy should implement functions");
+    check_impl_function_names(&context_impl.items, ["new", "sort", "sort_algorithm"])
+        .unwrap_or_else(|name| panic!("Context should implement the function \"{name}\""));
+}
+
+#[test]
+fn test_policy_fields() {
+    let ast = parse_file("./assignment/src/policy.rs");
+    let policy =
+        find_struct(&ast.items, "Policy").expect("A struct named \"Policy\" should be defined");
+    check_struct_field_names(&policy.fields, ["context"])
+        .unwrap_or_else(|name| panic!("Policy should define the field \"{name}\""));
+}
+
+#[test]
+fn test_policy_methods() {
+    let ast = parse_file("./assignment/src/policy.rs");
+    let policy_impl = find_impl(&ast.items, "Policy").expect("Policy should implement functions");
+    check_impl_function_names(&policy_impl.items, ["new", "configure"])
+        .unwrap_or_else(|name| panic!("Policy should implement the function \"{name}\""));
+}
+
+#[test]
+fn test_bubble_sort_struct() {
+    let ast = parse_file("./assignment/src/bubble_sort.rs");
+    find_struct(&ast.items, "BubbleSort").expect("A struct named \"BubbleSort\" should be defined");
+    find_impl_for(&ast.items, "BubbleSort", "SortStrategy")
+        .expect("BubbleSort should implement the trait \"SortStrategy\"");
+}
+
+#[test]
+fn test_merge_sort_struct() {
+    let ast = parse_file("./assignment/src/merge_sort.rs");
+    find_struct(&ast.items, "MergeSort").expect("A struct named \"MergeSort\" should be defined");
+    find_impl_for(&ast.items, "MergeSort", "SortStrategy")
+        .expect("MergeSort should implement the trait \"SortStrategy\"");
+}
diff --git a/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs
new file mode 100644
index 000000000000..493d043f6d5c
--- /dev/null
+++ b/src/main/resources/templates/rust/test/tests/structural_helpers/mod.rs
@@ -0,0 +1,207 @@
+//! Run-time source code reflection
+//!
+//! Use this for flexible parsing and computed names.
+#![allow(dead_code)]
+
+use std::io::Read;
+
+use syn::{
+    Fields, ImplItem, ImplItemFn,
+    Item::{self, Impl, Struct, Trait},
+    ItemImpl, ItemStruct, ItemTrait, TraitItem, TraitItemFn, TypeParamBound,
+};
+
+pub fn check_struct_names<'a, I: IntoIterator<Item = &'a str>>(
+    items: &[Item],
+    names: I,
+) -> Result<(), &'a str> {
+    for name in names {
+        find_struct(items, name).ok_or(name)?;
+    }
+    Ok(())
+}
+
+pub fn find_struct<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemStruct> {
+    find_by_name(
+        items,
+        name,
+        |i| match i {
+            Struct(s) => Some(s),
+            _ => None,
+        },
+        |s| &s.ident,
+    )
+}
+
+pub fn check_struct_field_names<'a, I: IntoIterator<Item = &'a str>>(
+    fields: &Fields,
+    names: I,
+) -> Result<(), &'a str> {
+    let p = match fields {
+        Fields::Named(f) => &f.named,
+        _ => panic!("The struct should have named fields"),
+    };
+
+    let field_names: Vec<_> = p.iter().map(|f| f.ident.as_ref().unwrap()).collect();
+
+    for name in names {
+        field_names
+            .iter()
+            .copied()
+            .find(|&n| n == name)
+            .ok_or(name)?;
+    }
+    Ok(())
+}
+
+pub fn find_impl<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemImpl> {
+    items.iter().find_map(|i| {
+        let im = match i {
+            Impl(im) => im,
+            _ => return None,
+        };
+        let self_name = match im.self_ty.as_ref() {
+            syn::Type::Path(p) => &p.path.segments.last().unwrap().ident,
+            _ => return None,
+        };
+        if im.trait_.is_some() {
+            return None;
+        }
+
+        if self_name != name {
+            return None;
+        }
+
+        Some(im)
+    })
+}
+
+pub fn find_impl_for<'a>(items: &'a [Item], name: &str, for_trait: &str) -> Option<&'a ItemImpl> {
+    items.iter().find_map(|i| {
+        let im = match i {
+            Impl(im) => im,
+            _ => return None,
+        };
+        let self_name = match im.self_ty.as_ref() {
+            syn::Type::Path(p) => &p.path.segments.last().unwrap().ident,
+            _ => return None,
+        };
+        let trait_name = match im.trait_.as_ref() {
+            Some((_, path, _)) => &path.segments.last().unwrap().ident,
+            _ => return None,
+        };
+
+        if self_name != name || trait_name != for_trait {
+            return None;
+        }
+
+        Some(im)
+    })
+}
+
+pub fn check_impl_function_names<'a, I: IntoIterator<Item = &'a str>>(
+    items: &[ImplItem],
+    names: I,
+) -> Result<(), &'a str> {
+    for name in names {
+        find_impl_function(items, name).ok_or(name)?;
+    }
+    Ok(())
+}
+
+pub fn find_impl_function<'a>(items: &'a [ImplItem], name: &str) -> Option<&'a ImplItemFn> {
+    find_by_name(
+        items,
+        name,
+        |i| match i {
+            ImplItem::Fn(f) => Some(f),
+            _ => None,
+        },
+        |f| &f.sig.ident,
+    )
+}
+
+pub fn check_trait_names<'a, I: IntoIterator<Item = &'a str>>(
+    items: &[Item],
+    names: I,
+) -> Result<(), &'a str> {
+    for name in names {
+        find_trait(items, name).ok_or(name)?;
+    }
+    Ok(())
+}
+
+pub fn find_trait<'a>(items: &'a [Item], name: &str) -> Option<&'a ItemTrait> {
+    find_by_name(
+        items,
+        name,
+        |i| match i {
+            Trait(t) => Some(t),
+            _ => None,
+        },
+        |t| &t.ident,
+    )
+}
+
+pub fn check_trait_function_names<'a, I: IntoIterator<Item = &'a str>>(
+    items: &[TraitItem],
+    names: I,
+) -> Result<(), &'a str> {
+    for name in names {
+        find_trait_function(items, name).ok_or(name)?;
+    }
+    Ok(())
+}
+
+pub fn find_trait_function<'a>(items: &'a [TraitItem], name: &str) -> Option<&'a TraitItemFn> {
+    find_by_name(
+        items,
+        name,
+        |i| match i {
+            TraitItem::Fn(f) => Some(f),
+            _ => None,
+        },
+        |f| &f.sig.ident,
+    )
+}
+
+pub fn check_trait_supertrait(trait_: &ItemTrait, supertrait_name: &str) -> Result<(), ()> {
+    find_by_name(
+        &trait_.supertraits,
+        supertrait_name,
+        |s| match s {
+            TypeParamBound::Trait(t) => Some(t),
+            _ => None,
+        },
+        |t| &t.path.segments.last().unwrap().ident,
+    )
+    .ok_or(())?;
+    Ok(())
+}
+
+fn find_by_name<
+    'a,
+    Item,
+    I: IntoIterator<Item = Item>,
+    M: FnMut(Item) -> Option<R>,
+    R,
+    N: FnMut(&R) -> C,
+    C: PartialEq<&'a str>,
+>(
+    items: I,
+    name: &'a str,
+    item_matcher: M,
+    mut name_getter: N,
+) -> Option<R> {
+    items
+        .into_iter()
+        .filter_map(item_matcher)
+        .find(|i| name_getter(i) == name)
+}
+
+pub fn parse_file<P: AsRef<std::path::Path>>(path: P) -> syn::File {
+    let mut file = std::fs::File::open(path).unwrap();
+    let mut content = String::new();
+    file.read_to_string(&mut content).unwrap();
+    syn::parse_file(&content).unwrap()
+}
diff --git a/src/main/webapp/app/admin/legal/legal-document-update.component.html b/src/main/webapp/app/admin/legal/legal-document-update.component.html
index d581d9dcf664..7ab8f31edb25 100644
--- a/src/main/webapp/app/admin/legal/legal-document-update.component.html
+++ b/src/main/webapp/app/admin/legal/legal-document-update.component.html
@@ -3,15 +3,14 @@
         <h2>
             <span id="legal-document-update-heading" data-cy="legalDocumentPageHeading" jhiTranslate="{{ titleKey }}"></span>
         </h2>
-        <jhi-markdown-editor
+        <jhi-markdown-editor-monaco
             [markdown]="legalDocument.text"
-            (markdownChange)="checkUnsavedChanges($event)"
+            (markdownChange)="onContentChanged($event)"
             [resizableMinHeight]="MIN_HEIGHT"
             [resizableMaxHeight]="MAX_HEIGHT"
+            [initialEditorHeight]="MIN_HEIGHT"
             [enableFileUpload]="false"
-            [minHeightEditor]="700"
             class="markdown-editor"
-            (onEditSelect)="updateTextIfLanguageChangedInPreview()"
         />
         <div>
             @if (!unsavedChanges && !isSaving) {
@@ -34,13 +33,7 @@ <h2>
             }
         </div>
         <div class="btn-below-editor">
-            <button
-                type="submit"
-                (click)="updateLegalDocument()"
-                class="btn btn-primary"
-                id="update-legal-document-btn"
-                [disabled]="!markdownEditor?.markdown || markdownEditor?.markdown?.trim() === '' || isSaving"
-            >
+            <button type="submit" (click)="updateLegalDocument()" class="btn btn-primary" id="update-legal-document-btn" [disabled]="!currentContentTrimmed || isSaving">
                 <fa-icon [icon]="faSave" />
                 <span jhiTranslate="entity.action.save"></span>
             </button>
diff --git a/src/main/webapp/app/admin/legal/legal-document-update.component.ts b/src/main/webapp/app/admin/legal/legal-document-update.component.ts
index 11151a4410c1..63541a0c97dc 100644
--- a/src/main/webapp/app/admin/legal/legal-document-update.component.ts
+++ b/src/main/webapp/app/admin/legal/legal-document-update.component.ts
@@ -1,14 +1,13 @@
 import { AfterContentChecked, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
 import { faBan, faCheckCircle, faCircleNotch, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons';
 import { LegalDocumentService } from 'app/shared/service/legal-document.service';
-import { MarkdownEditorComponent, MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { UnsavedChangesWarningComponent } from 'app/admin/legal/unsaved-changes-warning/unsaved-changes-warning.component';
 import { LegalDocument, LegalDocumentLanguage, LegalDocumentType } from 'app/entities/legal-document.model';
 import { ActivatedRoute } from '@angular/router';
 import { Observable, tap } from 'rxjs';
 import { JhiLanguageHelper } from 'app/core/language/language.helper';
-import { ArtemisMarkdownService } from 'app/shared/markdown.service';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 @Component({
     selector: 'jhi-privacy-statement-update-component',
@@ -35,12 +34,12 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked
     legalDocumentType: LegalDocumentType = LegalDocumentType.PRIVACY_STATEMENT;
     unsavedChanges = false;
     isSaving = false;
-    @ViewChild(MarkdownEditorComponent, { static: false }) markdownEditor: MarkdownEditorComponent;
+    @ViewChild(MarkdownEditorMonacoComponent, { static: false }) markdownEditor: MarkdownEditorMonacoComponent;
 
+    currentContentTrimmed = '';
     currentLanguage = this.DEFAULT_LANGUAGE;
     unsavedChangesWarning: NgbModalRef;
     titleKey: string;
-    private languageChangeInPreview: boolean;
 
     constructor(
         private legalDocumentService: LegalDocumentService,
@@ -48,7 +47,6 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked
         private route: ActivatedRoute,
         private languageHelper: JhiLanguageHelper,
         private changeDetectorRef: ChangeDetectorRef,
-        private markdownService: ArtemisMarkdownService,
     ) {}
 
     ngOnInit() {
@@ -84,7 +82,7 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked
 
     updateLegalDocument() {
         this.isSaving = true;
-        this.legalDocument.text = this.markdownEditor.markdown!;
+        this.legalDocument.text = this.currentContentTrimmed;
         if (this.legalDocumentType === LegalDocumentType.PRIVACY_STATEMENT) {
             this.legalDocumentService.updatePrivacyStatement(this.legalDocument).subscribe((statement) => {
                 this.setUpdatedDocument(statement);
@@ -102,29 +100,27 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked
         this.isSaving = false;
     }
 
-    checkUnsavedChanges(content: string) {
+    onContentChanged(content: string) {
+        this.currentContentTrimmed = content.trim();
         this.unsavedChanges = content !== this.legalDocument.text;
     }
 
-    onLanguageChange(legalDocumentLanguage: any) {
+    onLanguageChange(legalDocumentLanguage: LegalDocumentLanguage) {
         if (this.unsavedChanges) {
             this.showWarning(legalDocumentLanguage);
         } else {
-            this.markdownEditor.markdown = '';
             this.currentLanguage = legalDocumentLanguage;
             this.getLegalDocumentForUpdate(this.legalDocumentType, legalDocumentLanguage).subscribe((document) => {
                 this.legalDocument = document;
+                this.markdownEditor.markdown = this.legalDocument.text;
+                // Ensure the new text is parsed and displayed in the preview
+                this.markdownEditor.parseMarkdown();
                 this.unsavedChanges = false;
-                // if we are currently in preview mode, we need to update the preview
-                if (this.markdownEditor.previewMode) {
-                    this.markdownEditor.previewTextAsHtml = this.markdownService.safeHtmlForMarkdown(this.legalDocument.text);
-                    this.languageChangeInPreview = true;
-                }
             });
         }
     }
 
-    showWarning(legalDocumentLanguage: any) {
+    showWarning(legalDocumentLanguage: LegalDocumentLanguage) {
         this.unsavedChangesWarning = this.modalService.open(UnsavedChangesWarningComponent, { size: 'lg', backdrop: 'static' });
         if (this.legalDocumentType === LegalDocumentType.PRIVACY_STATEMENT) {
             this.unsavedChangesWarning.componentInstance.textMessage = 'artemisApp.legal.privacyStatement.unsavedChangesWarning';
@@ -151,16 +147,4 @@ export class LegalDocumentUpdateComponent implements OnInit, AfterContentChecked
     ngAfterContentChecked() {
         this.changeDetectorRef.detectChanges();
     }
-
-    /**
-     * If the language is changed while we are in the preview mode, we must trigger a change event, so the ace editor updates its content.
-     * We must do this when the editor is visible because otherwise the editor will only be updated if you click on it once.
-     */
-    updateTextIfLanguageChangedInPreview() {
-        if (this.languageChangeInPreview) {
-            // we have to trigger a change event, so the ace editor updates its content
-            this.markdownEditor.aceEditorContainer.getEditor().session._emit('change', { start: { row: 0, column: 0 }, end: { row: 0, column: 0 }, action: 'insert', lines: [] });
-            this.languageChangeInPreview = false;
-        }
-    }
 }
diff --git a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
index 6e026c952a34..32fb9e3112d8 100644
--- a/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
+++ b/src/main/webapp/app/admin/lti-configuration/lti-configuration.component.html
@@ -8,7 +8,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.lti.version13Configuration"></h
             <ng-template ngbNavContent>
                 <dt></dt>
                 <dt style="display: flex; align-items: center">
-                    <h4 class="modal-title">{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTranslate }}</h4>
+                    <h4 class="modal-title" jhiTranslate="artemisApp.lti.dynamicRegistrationUrl"></h4>
                     <jhi-help-icon text="artemisApp.lti.dynamicRegistrationTooltip" />
                 </dt>
                 <dd>
@@ -17,7 +17,7 @@ <h4 class="modal-title">{{ 'artemisApp.lti.dynamicRegistrationUrl' | artemisTran
                 </dd>
                 <dt style="display: flex; align-items: center; justify-content: space-between; width: 100%">
                     <div class="modal-header" style="margin-bottom: 20px">
-                        <h4 class="modal-title" style="margin-right: 2px">{{ 'artemisApp.lti.configuredPlatforms' | artemisTranslate }}</h4>
+                        <h4 class="modal-title" style="margin-right: 2px" jhiTranslate="artemisApp.lti.configuredPlatforms"></h4>
                         <jhi-help-icon text="artemisApp.lti.configuredPlatformsTooltip" />
                     </div>
                     <div class="modal-header" style="margin-bottom: 20px">
@@ -130,35 +130,35 @@ <h4 class="modal-title" style="margin-right: 2px">{{ 'artemisApp.lti.configuredP
             <a ngbNavLink jhiTranslate="artemisApp.lti.serviceUrls"></a>
             <ng-template ngbNavContent>
                 <dt>
-                    <span>{{ 'artemisApp.lti.deepLinkingUrl' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.deepLinkingUrl"></span>
                 </dt>
                 <dd>
                     <span>{{ getDeepLinkingUrl() }}</span>
                     <jhi-copy-icon-button [copyText]="getDeepLinkingUrl()" />
                 </dd>
                 <dt>
-                    <span>{{ 'artemisApp.lti.toolUrl' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.toolUrl"></span>
                 </dt>
                 <dd>
                     <span>{{ getToolUrl() }}</span>
                     <jhi-copy-icon-button [copyText]="getToolUrl()" />
                 </dd>
                 <dt>
-                    <span>{{ 'artemisApp.lti.keysetUrl' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.keysetUrl"></span>
                 </dt>
                 <dd>
                     <span>{{ getKeysetUrl() }}</span>
                     <jhi-copy-icon-button [copyText]="getKeysetUrl()" />
                 </dd>
                 <dt>
-                    <span>{{ 'artemisApp.lti.initiateLoginUrl' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.initiateLoginUrl"></span>
                 </dt>
                 <dd>
                     <span>{{ getInitiateLoginUrl() }}</span>
                     <jhi-copy-icon-button [copyText]="getInitiateLoginUrl()" />
                 </dd>
                 <dt>
-                    <span>{{ 'artemisApp.lti.redirectUri' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.redirectUri"></span>
                 </dt>
                 <dd>
                     <span>{{ getRedirectUri() }}</span>
diff --git a/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html b/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html
index 5121a3a30893..249e72addc6b 100644
--- a/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html
+++ b/src/main/webapp/app/admin/standardized-competencies/knowledge-area-edit.component.html
@@ -62,7 +62,7 @@ <h4 jhiTranslate="artemisApp.knowledgeArea.details.titleCreate"></h4>
         <div class="form-group">
             <label jhiTranslate="artemisApp.knowledgeArea.model.description"></label>
             @if (isEditing) {
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     [markdown]="form.controls.description.value"
                     (markdownChange)="updateDescriptionControl($event)"
                     class="markdown-preview"
diff --git a/src/main/webapp/app/admin/standardized-competencies/standardized-competency-edit.component.html b/src/main/webapp/app/admin/standardized-competencies/standardized-competency-edit.component.html
index 930756853853..b4e88ba6e4e9 100644
--- a/src/main/webapp/app/admin/standardized-competencies/standardized-competency-edit.component.html
+++ b/src/main/webapp/app/admin/standardized-competencies/standardized-competency-edit.component.html
@@ -45,7 +45,7 @@ <h4 jhiTranslate="artemisApp.standardizedCompetency.details.titleCreate"></h4>
         <div class="form-group">
             <label jhiTranslate="artemisApp.standardizedCompetency.model.description"></label>
             @if (isEditing) {
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     [markdown]="form.controls.description.value"
                     (markdownChange)="updateDescriptionControl($event)"
                     class="markdown-preview"
diff --git a/src/main/webapp/app/admin/standardized-competencies/standardized-competency-management.component.ts b/src/main/webapp/app/admin/standardized-competencies/standardized-competency-management.component.ts
index bbd4f86ea8da..fb73da984d1b 100644
--- a/src/main/webapp/app/admin/standardized-competencies/standardized-competency-management.component.ts
+++ b/src/main/webapp/app/admin/standardized-competencies/standardized-competency-management.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { faChevronRight, faDownLeftAndUpRightToCenter, faEye, faFileExport, faFileImport, faPlus, faUpRightAndDownLeftFromCenter } from '@fortawesome/free-solid-svg-icons';
 import {
     KnowledgeAreaDTO,
@@ -27,6 +27,7 @@ import { DocumentationType } from 'app/shared/components/documentation-button/do
     selector: 'jhi-standardized-competency-management',
     templateUrl: './standardized-competency-management.component.html',
     styleUrls: ['standardized-competency-management.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class StandardizedCompetencyManagementComponent extends StandardizedCompetencyFilterPageComponent implements OnInit, OnDestroy, ComponentCanDeactivate {
     protected isLoading = false;
@@ -63,6 +64,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
         private alertService: AlertService,
         private modalService: NgbModal,
         private translateService: TranslateService,
+        private changeDetectorRef: ChangeDetectorRef,
     ) {
         super();
     }
@@ -85,6 +87,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                 });
 
                 this.isLoading = false;
+                this.changeDetectorRef.detectChanges();
             },
             error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
         });
@@ -130,6 +133,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                     this.isEditing = false;
                     this.selectedKnowledgeArea = undefined;
                 }
+                this.changeDetectorRef.detectChanges();
             },
             error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message),
         });
@@ -152,6 +156,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                         if (!(this.selectedKnowledgeArea?.id || this.selectedCompetency) && !this.isEditing) {
                             this.selectedKnowledgeArea = resultKnowledgeArea;
                         }
+                        this.changeDetectorRef.detectChanges();
                     },
                     error: (error: HttpErrorResponse) => onError(this.alertService, error),
                 });
@@ -167,6 +172,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                         if (resultKnowledgeArea.id === this.selectedKnowledgeArea?.id) {
                             this.selectedKnowledgeArea = resultKnowledgeArea;
                         }
+                        this.changeDetectorRef.detectChanges();
                     },
                     error: (error: HttpErrorResponse) => onError(this.alertService, error),
                 });
@@ -205,6 +211,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                     this.isEditing = false;
                     this.selectedCompetency = undefined;
                 }
+                this.changeDetectorRef.detectChanges();
             },
             error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message),
         });
@@ -227,6 +234,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                         if (!(this.selectedCompetency?.id || this.selectedKnowledgeArea) && !this.isEditing) {
                             this.selectedCompetency = resultCompetency;
                         }
+                        this.changeDetectorRef.detectChanges();
                     },
                     error: (error: HttpErrorResponse) => onError(this.alertService, error),
                 });
@@ -244,6 +252,7 @@ export class StandardizedCompetencyManagementComponent extends StandardizedCompe
                         if (resultCompetency.id === this.selectedCompetency?.id) {
                             this.selectedCompetency = resultCompetency;
                         }
+                        this.changeDetectorRef.detectChanges();
                     },
                     error: (error: HttpErrorResponse) => onError(this.alertService, error),
                 });
diff --git a/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html b/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html
index 8abce445fd5f..f04719bda98d 100644
--- a/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html
+++ b/src/main/webapp/app/admin/system-notification-management/system-notification-management-update.component.html
@@ -35,7 +35,7 @@ <h2 id="myNotificationLabel" jhiTranslate="artemisApp.systemNotification.createO
                         name="expireDate"
                     />
                     @if (expireDate?.errors?.expireMustBeAfterNotification) {
-                        <span class="text-danger">{{ 'error.systemNotificationNeedsNotificationBeforeExpiration' | artemisTranslate }}</span>
+                        <span class="text-danger" jhiTranslate="error.systemNotificationNeedsNotificationBeforeExpiration"></span>
                     }
                 </div>
             </div>
diff --git a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
index d6b7c7feca64..867f0c697bb2 100644
--- a/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
+++ b/src/main/webapp/app/admin/system-notification-management/system-notification-management.component.html
@@ -30,19 +30,13 @@ <h2>
                             <td>
                                 @switch (getNotificationState(notification)) {
                                     @case (ACTIVE) {
-                                        <span class="badge bg-success">
-                                            {{ 'artemisApp.systemNotification.active' | artemisTranslate }}
-                                        </span>
+                                        <span class="badge bg-success" jhiTranslate="artemisApp.systemNotification.active"></span>
                                     }
                                     @case (EXPIRED) {
-                                        <span class="badge bg-danger">
-                                            {{ 'artemisApp.systemNotification.expired' | artemisTranslate }}
-                                        </span>
+                                        <span class="badge bg-danger" jhiTranslate="artemisApp.systemNotification.expired"></span>
                                     }
                                     @case (SCHEDULED) {
-                                        <span class="badge bg-info">
-                                            {{ 'artemisApp.systemNotification.scheduled' | artemisTranslate }}
-                                        </span>
+                                        <span class="badge bg-info" jhiTranslate="artemisApp.systemNotification.scheduled"></span>
                                     }
                                 }
                             </td>
diff --git a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html
index 1451541419e2..9d928688216a 100644
--- a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html
+++ b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.html
@@ -10,16 +10,16 @@ <h4 jhiTranslate="artemisApp.upcomingExamsAndExercises.upcomingExercises"></h4>
                 <thead>
                     <tr>
                         <th class="d-md-table-cell" style="width: 300px">
-                            <span>{{ 'artemisApp.upcomingExamsAndExercises.exercise' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.upcomingExamsAndExercises.exercise"></span>
                         </th>
                         <th class="d-md-table-cell" style="width: 300px">
-                            <span>{{ 'artemisApp.upcomingExamsAndExercises.course' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.upcomingExamsAndExercises.course"></span>
                         </th>
                         <th class="d-md-table-cell" style="width: 180px">
-                            <span>{{ 'artemisApp.upcomingExamsAndExercises.releaseDate' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.upcomingExamsAndExercises.releaseDate"></span>
                         </th>
                         <th class="d-md-table-cell" style="width: 180px">
-                            <span>{{ 'artemisApp.upcomingExamsAndExercises.dueDate' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.upcomingExamsAndExercises.dueDate"></span>
                         </th>
                     </tr>
                 </thead>
@@ -61,19 +61,19 @@ <h4 jhiTranslate="artemisApp.upcomingExamsAndExercises.upcomingExams"></h4>
                     <thead>
                         <tr>
                             <th class="d-md-table-cell" style="width: 300px">
-                                <span>{{ 'artemisApp.upcomingExamsAndExercises.exam' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.upcomingExamsAndExercises.exam"></span>
                             </th>
                             <th class="d-md-table-cell" style="width: 300px">
-                                <span>{{ 'artemisApp.upcomingExamsAndExercises.course' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.upcomingExamsAndExercises.course"></span>
                             </th>
                             <th class="d-md-table-cell" style="width: 180px">
-                                <span>{{ 'artemisApp.examManagement.visibleDate' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.visibleDate"></span>
                             </th>
                             <th class="d-md-table-cell" style="width: 180px">
-                                <span>{{ 'artemisApp.examManagement.startDate' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.startDate"></span>
                             </th>
                             <th class="d-md-table-cell" style="width: 180px">
-                                <span>{{ 'artemisApp.examManagement.endDate' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.endDate"></span>
                             </th>
                         </tr>
                     </thead>
diff --git a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts
index bb8614435e1d..8855ae1fb047 100644
--- a/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts
+++ b/src/main/webapp/app/admin/upcoming-exams-and-exercises/upcoming-exams-and-exercises.component.ts
@@ -3,7 +3,7 @@ import { HttpResponse } from '@angular/common/http';
 import { EntityArrayResponseType as ExerciseEntityArrayResponseType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { Exercise } from 'app/entities/exercise.model';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 
 @Component({
diff --git a/src/main/webapp/app/admin/user-management/user-management.component.html b/src/main/webapp/app/admin/user-management/user-management.component.html
index 1c824ea864d0..60a62a3cd70c 100644
--- a/src/main/webapp/app/admin/user-management/user-management.component.html
+++ b/src/main/webapp/app/admin/user-management/user-management.component.html
@@ -63,9 +63,11 @@ <h2>
                                     [ngClass]="{ 'btn-secondary': !filters.numberOfAppliedFilters, 'btn-success': !!filters.numberOfAppliedFilters }"
                                 >
                                     <fa-icon [icon]="faFilter" />
-                                    <span class="d-s-none d-md-inline">{{
-                                        'artemisApp.userManagement.filter.modal.open' | artemisTranslate: { num: filters.numberOfAppliedFilters }
-                                    }}</span>
+                                    <span
+                                        class="d-s-none d-md-inline"
+                                        jhiTranslate="artemisApp.userManagement.filter.modal.open"
+                                        [translateValues]="{ num: filters.numberOfAppliedFilters }"
+                                    ></span>
                                 </button>
                             </div>
                         </div>
@@ -227,14 +229,14 @@ <h2>
 <!-- Modal -->
 <ng-template #content let-modal>
     <div class="modal-header">
-        <h5 class="modal-title">{{ 'artemisApp.userManagement.filter.modal.title' | artemisTranslate }}</h5>
+        <h5 class="modal-title" jhiTranslate="artemisApp.userManagement.filter.modal.title"></h5>
         <button type="button" class="btn-close" aria-label="Close" (click)="modal.dismiss()"></button>
     </div>
     <div class="modal-body">
         <div class="container-fluid">
             <div class="row user-management-border-bottom">
                 <div class="col d-flex flex-row pb-1">
-                    <h5 class="my-0">{{ 'artemisApp.userManagement.filter.authority.title' | artemisTranslate: { num: this.filters.authorityFilter.size } }}</h5>
+                    <h5 class="my-0" jhiTranslate="artemisApp.userManagement.filter.authority.title" [translateValues]="{ num: this.filters.authorityFilter.size }"></h5>
                     <jhi-help-icon class="ps-1" text="artemisApp.userManagement.filter.authority.tooltip" />
                 </div>
             </div>
@@ -250,9 +252,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.authority.title' | artemis
                                     (click)="selectAllRoles()"
                                     [checked]="this.filters.authorityFilter.size === this.authorityFilters.length && !this.filters.noAuthority"
                                 />
-                                <label for="authorityFilter" class="form-check-label ps-1">
-                                    {{ 'artemisApp.userManagement.filter.all' | artemisTranslate }}
-                                </label>
+                                <label for="authorityFilter" class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.all"></label>
                             </div>
                             <div class="form-check col-6 d-flex justify-content-center">
                                 <input
@@ -262,9 +262,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.authority.title' | artemis
                                     (click)="selectEmptyRoles()"
                                     [checked]="this.filters.authorityFilter.size === 0 && this.filters.noAuthority"
                                 />
-                                <label for="emptyRoles" class="form-check-label ps-1">
-                                    {{ 'artemisApp.userManagement.filter.authority.without' | artemisTranslate }}
-                                </label>
+                                <label for="emptyRoles" class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.authority.without"></label>
                                 <jhi-help-icon class="ps-1" text="artemisApp.userManagement.filter.authority.withoutTooltip" />
                             </div>
                             <div class="form-check col-3 d-flex justify-content-center">
@@ -275,9 +273,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.authority.title' | artemis
                                     (click)="deselectAllRoles()"
                                     [checked]="this.filters.authorityFilter.size === 0 && !this.filters.noAuthority"
                                 />
-                                <label for="deselectAll" class="form-check-label ps-1">
-                                    {{ 'artemisApp.userManagement.filter.none' | artemisTranslate }}
-                                </label>
+                                <label for="deselectAll" class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.none"></label>
                             </div>
                         </div>
                     </div>
@@ -304,7 +300,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.authority.title' | artemis
             </div>
             <div class="row row user-management-border-bottom">
                 <div class="col d-flex flex-row pt-3 pb-1">
-                    <h5 class="my-0">{{ 'artemisApp.userManagement.filter.origin.title' | artemisTranslate: { num: this.filters.originFilter.size } }}</h5>
+                    <h5 class="my-0" jhiTranslate="artemisApp.userManagement.filter.origin.title" [translateValues]="{ num: this.filters.originFilter.size }"></h5>
                     <jhi-help-icon class="ps-1" text="artemisApp.userManagement.filter.origin.tooltip" />
                 </div>
             </div>
@@ -321,16 +317,18 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.origin.title' | artemisTra
                         }
                         <li class="col-3">
                             <input class="form-check-input" type="radio" (click)="this.toggleOriginFilter()" [checked]="this.filters.originFilter.size === 0" />
-                            <label class="form-check-label ps-1">
-                                {{ 'artemisApp.userManagement.filter.none' | artemisTranslate }}
-                            </label>
+                            <label class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.none"></label>
                         </li>
                     </ul>
                 </div>
             </div>
             <div class="row row user-management-border-bottom">
                 <div class="col d-flex flex-row pt-3 pb-1">
-                    <h5 class="my-0">{{ 'artemisApp.userManagement.filter.registrationNumber.title' | artemisTranslate: { num: this.filters.registrationNumberFilter.size } }}</h5>
+                    <h5
+                        class="my-0"
+                        jhiTranslate="artemisApp.userManagement.filter.registrationNumber.title"
+                        [translateValues]="{ num: this.filters.registrationNumberFilter.size }"
+                    ></h5>
                     <jhi-help-icon class="ps-1" text="artemisApp.userManagement.filter.registrationNumber.tooltip" />
                 </div>
             </div>
@@ -360,16 +358,14 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.registrationNumber.title'
                                 (click)="this.toggleRegistrationNumberFilter()"
                                 [checked]="this.filters.registrationNumberFilter.size === 0"
                             />
-                            <label for="toggleRegistrationNumberFilter" class="form-check-label ps-1">
-                                {{ 'artemisApp.userManagement.filter.none' | artemisTranslate }}
-                            </label>
+                            <label for="toggleRegistrationNumberFilter" class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.none"></label>
                         </li>
                     </ul>
                 </div>
             </div>
             <div class="row user-management-border-bottom">
                 <div class="col d-flex flex-row pt-3 pb-1">
-                    <h5 class="my-0">{{ 'artemisApp.userManagement.filter.status.title' | artemisTranslate: { num: this.filters.statusFilter.size } }}</h5>
+                    <h5 class="my-0" jhiTranslate="artemisApp.userManagement.filter.status.title" [translateValues]="{ num: this.filters.statusFilter.size }"></h5>
                     <jhi-help-icon class="ps-1" text="artemisApp.userManagement.filter.status.tooltip" />
                 </div>
             </div>
@@ -386,9 +382,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.status.title' | artemisTra
                         }
                         <li class="col-3">
                             <input class="form-check-input" type="radio" (click)="this.toggleStatusFilter()" [checked]="this.filters.statusFilter.size === 0" />
-                            <label class="form-check-label ps-1">
-                                {{ 'artemisApp.userManagement.filter.none' | artemisTranslate }}
-                            </label>
+                            <label class="form-check-label ps-1" jhiTranslate="artemisApp.userManagement.filter.none"></label>
                         </li>
                     </ul>
                 </div>
@@ -396,9 +390,7 @@ <h5 class="my-0">{{ 'artemisApp.userManagement.filter.status.title' | artemisTra
         </div>
     </div>
     <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" (click)="modal.close()">
-            {{ 'artemisApp.userManagement.filter.modal.close' | artemisTranslate }}
-        </button>
+        <button type="button" class="btn btn-secondary" (click)="modal.close()" jhiTranslate="artemisApp.userManagement.filter.modal.close"></button>
         <button class="btn btn-primary" (click)="applyFilter()">
             <span jhiTranslate="artemisApp.userManagement.filter.apply"></span>
         </button>
diff --git a/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html b/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html
index f9b64a37cc41..5cc591067229 100644
--- a/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html
+++ b/src/main/webapp/app/assessment/assessment-complaint-alert/assessment-complaint-alert.component.html
@@ -1,8 +1,8 @@
 @if (complaint) {
     @if (complaint?.complaintType === ComplaintType.COMPLAINT) {
-        <div class="alert alert-info">{{ 'artemisApp.complaint.hint' | artemisTranslate }}</div>
+        <div class="alert alert-info" jhiTranslate="artemisApp.complaint.hint"></div>
     }
     @if (complaint?.complaintType === ComplaintType.MORE_FEEDBACK) {
-        <div class="alert alert-info">{{ 'artemisApp.moreFeedback.hint' | artemisTranslate }}</div>
+        <div class="alert alert-info" jhiTranslate="artemisApp.moreFeedback.hint"></div>
     }
 }
diff --git a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts
index a2418b6b35d4..3245b9f4af72 100644
--- a/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts
+++ b/src/main/webapp/app/assessment/assessment-header/assessment-header.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, HostListener, Input, Output } from '@angular/c
 import { Result } from 'app/entities/result.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { ActivatedRoute } from '@angular/router';
 import { ComplaintType } from 'app/entities/complaint.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts b/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts
index c7c7aa77c910..d854c6f7ad58 100644
--- a/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts
+++ b/src/main/webapp/app/assessment/assessment-instructions/assessment-instructions/assessment-instructions.component.ts
@@ -3,10 +3,10 @@ import { SafeHtml } from '@angular/platform-browser';
 import { UMLDiagramType, UMLModel } from '@ls1intum/apollon';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 
diff --git a/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts b/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts
index aa21e99239c3..42120b935660 100644
--- a/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts
+++ b/src/main/webapp/app/assessment/assessment-warning/assessment-warning.component.ts
@@ -17,10 +17,10 @@ import { Submission } from 'app/entities/submission.model';
                 <div class="card-header">
                     <fa-icon [icon]="faExclamationTriangle" size="2x" class="text-warning" placement="bottom auto" />
                     @if (isBeforeExerciseDueDate) {
-                        <span>{{ 'artemisApp.assessment.dashboard.warning' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.assessment.dashboard.warning"></span>
                     }
                     @if (!isBeforeExerciseDueDate) {
-                        <span>{{ 'artemisApp.assessment.dashboard.warningIndividual' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.assessment.dashboard.warningIndividual"></span>
                     }
                 </div>
             }
diff --git a/src/main/webapp/app/assessment/athena.service.ts b/src/main/webapp/app/assessment/athena.service.ts
index 01e7d4ca0def..962e56b70a39 100644
--- a/src/main/webapp/app/assessment/athena.service.ts
+++ b/src/main/webapp/app/assessment/athena.service.ts
@@ -5,9 +5,9 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ModelingFeedbackSuggestion, ProgrammingFeedbackSuggestion, TextFeedbackSuggestion } from 'app/entities/feedback-suggestion.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { FEEDBACK_SUGGESTION_ACCEPTED_IDENTIFIER, FEEDBACK_SUGGESTION_IDENTIFIER, Feedback, FeedbackType } from 'app/entities/feedback.model';
-import { TextBlock } from 'app/entities/text-block.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { PROFILE_ATHENA } from 'app/app.constants';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { UMLModel, findElement } from '@ls1intum/apollon';
diff --git a/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html b/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html
index bd1b68e325b8..a270275fdf7b 100644
--- a/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html
+++ b/src/main/webapp/app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component.html
@@ -1,17 +1,17 @@
 @if (criteria) {
     <div class="mb-2">
         <button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="button" (click)="expandAll()">
-            <fa-icon [icon]="faExpand" /> <span>{{ 'artemisApp.assessmentInstructions.expandAll' | artemisTranslate }}</span>
+            <fa-icon [icon]="faExpand" /> <span jhiTranslate="artemisApp.assessmentInstructions.expandAll"></span>
         </button>
         <button type="button" class="btn btn-sm btn-outline-secondary" data-bs-toggle="button" (click)="collapseAll()">
-            <fa-icon [icon]="faCompress" /> <span>{{ 'artemisApp.assessmentInstructions.collapseAll' | artemisTranslate }}</span>
+            <fa-icon [icon]="faCompress" /> <span jhiTranslate="artemisApp.assessmentInstructions.collapseAll"></span>
         </button>
     </div>
 }
 @if (allowDrop) {
     <div class="alert alert-info">
         <fa-icon [icon]="faInfoCircle" />
-        <span>{{ 'artemisApp.exercise.dragDropInstruction' | artemisTranslate }}</span>
+        <span jhiTranslate="artemisApp.exercise.dragDropInstruction"></span>
     </div>
 }
 @for (criterion of criteria; track criterion; let criterionIndex = $index) {
diff --git a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html
index efd1d1c458d1..c59190b2dad7 100644
--- a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html
+++ b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.html
@@ -30,9 +30,8 @@
                                 ? ('artemisApp.complaint.complaintNotAllowedTooltip' | artemisTranslate)
                                 : ''
                         }}"
-                    >
-                        {{ 'artemisApp.complaint.moreInfo' | artemisTranslate }}
-                    </button>
+                        jhiTranslate="artemisApp.complaint.moreInfo"
+                    ></button>
                 }
                 @if (!isExamMode && course?.requestMoreFeedbackEnabled) {
                     <button
@@ -41,9 +40,8 @@
                         (click)="formComplaintType = ComplaintType.MORE_FEEDBACK"
                         [disabled]="!timeOfFeedbackRequestValid"
                         title="{{ !timeOfFeedbackRequestValid ? ('artemisApp.moreFeedback.notAllowedTooltip' | artemisTranslate) : '' }}"
-                    >
-                        {{ 'artemisApp.moreFeedback.button' | artemisTranslate }}
-                    </button>
+                        jhiTranslate="artemisApp.moreFeedback.button"
+                    ></button>
                 }
             </div>
         }
diff --git a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts
index b37486509496..b469dcab432f 100644
--- a/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts
+++ b/src/main/webapp/app/complaints/complaints-for-students/complaints-student-view.component.ts
@@ -6,7 +6,7 @@ import { StudentParticipation } from 'app/entities/participation/student-partici
 import { Result } from 'app/entities/result.model';
 import { Course } from 'app/entities/course.model';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { Submission } from 'app/entities/submission.model';
 import { filter } from 'rxjs/operators';
diff --git a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html
index 0997b352dbbd..97bd1ae26257 100644
--- a/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html
+++ b/src/main/webapp/app/complaints/complaints-for-tutor/complaints-for-tutor.component.html
@@ -1,25 +1,20 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 }
 @if (!isLoading && complaint) {
-    <h3>
-        {{ complaint.complaintType === ComplaintType.MORE_FEEDBACK ? ('artemisApp.moreFeedback.review' | artemisTranslate) : ('artemisApp.complaint.review' | artemisTranslate) }}
-    </h3>
+    <h3 [jhiTranslate]="complaint.complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedback.review' : 'artemisApp.complaint.review'"></h3>
 }
 @if (!isLoading && complaint) {
     <div class="col-12 mt-2" [class.px-0]="zeroIndent">
         @if (handled) {
-            <div class="alert alert-info">
-                {{
-                    complaint.complaintType === ComplaintType.MORE_FEEDBACK
-                        ? ('artemisApp.moreFeedback.alreadyHandled' | artemisTranslate)
-                        : ('artemisApp.complaint.complaintAlreadyHandled' | artemisTranslate)
-                }}
-            </div>
+            <div
+                class="alert alert-info"
+                [jhiTranslate]="complaint.complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedback.alreadyHandled' : 'artemisApp.complaint.complaintAlreadyHandled'"
+            ></div>
         }
         <div class="mt-3 mb-3">
             @if (showLockDuration) {
@@ -35,21 +30,13 @@ <h3>
                 </div>
             }
             @if (lockedByCurrentUser) {
-                <button id="lockButton" class="btn btn-secondary" (click)="removeLock()">
-                    {{ 'artemisApp.locks.removeButton' | artemisTranslate }}
-                </button>
+                <button id="lockButton" class="btn btn-secondary" (click)="removeLock()" jhiTranslate="artemisApp.locks.removeButton"></button>
             }
         </div>
         <div class="row">
             <div class="col-12 col-md-6">
                 <h4>
-                    <span
-                        >{{
-                            complaint.complaintType === ComplaintType.MORE_FEEDBACK
-                                ? ('artemisApp.moreFeedback.title' | artemisTranslate)
-                                : ('artemisApp.complaint.title' | artemisTranslate)
-                        }}
-                    </span>
+                    <span [jhiTranslate]="complaint.complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedback.title' : 'artemisApp.complaint.title'"></span>
                     @if (handled) {
                         <small>
                             @if (complaint?.accepted) {
@@ -71,13 +58,9 @@ <h4>
             </div>
             @if (handled || isAllowedToRespond) {
                 <div class="col-12 col-md-6">
-                    <h3>
-                        {{
-                            complaint.complaintType === ComplaintType.MORE_FEEDBACK
-                                ? ('artemisApp.moreFeedbackResponse.title' | artemisTranslate)
-                                : ('artemisApp.complaintResponse.title' | artemisTranslate)
-                        }}
-                    </h3>
+                    <h3
+                        [jhiTranslate]="complaint.complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedbackResponse.title' : 'artemisApp.complaintResponse.title'"
+                    ></h3>
                     <div class="d-flex flex-column">
                         <textarea
                             id="responseTextArea"
@@ -128,9 +111,8 @@ <h3>
                                     [disabled]="isLockedForLoggedInUser"
                                     (click)="respondToComplaint(true)"
                                     title="{{ 'artemisApp.moreFeedbackResponse.sendResponseTooltip' | artemisTranslate }}"
-                                >
-                                    {{ 'artemisApp.moreFeedbackResponse.provideFeedback' | artemisTranslate }}
-                                </button>
+                                    jhiTranslate="artemisApp.moreFeedbackResponse.provideFeedback"
+                                ></button>
                             </div>
                         </div>
                     }
diff --git a/src/main/webapp/app/complaints/form/complaints-form.component.html b/src/main/webapp/app/complaints/form/complaints-form.component.html
index 3fbeb9a6a83c..59167771ce96 100644
--- a/src/main/webapp/app/complaints/form/complaints-form.component.html
+++ b/src/main/webapp/app/complaints/form/complaints-form.component.html
@@ -2,7 +2,7 @@
     <div class="col-12 mt-4">
         <div class="row">
             <div class="col-12 col-md-6">
-                <h3>{{ complaintType === ComplaintType.COMPLAINT ? ('artemisApp.complaint.title' | artemisTranslate) : ('artemisApp.moreFeedback.title' | artemisTranslate) }}</h3>
+                <h3 [jhiTranslate]="complaintType === ComplaintType.COMPLAINT ? 'artemisApp.complaint.title' : 'artemisApp.moreFeedback.title'"></h3>
                 @if (complaintType !== ComplaintType.COMPLAINT) {
                     <p>
                         {{ (exercise.teamMode ? 'artemisApp.moreFeedback.descriptionTeam' : 'artemisApp.moreFeedback.description') | artemisTranslate }}
@@ -15,28 +15,18 @@ <h3>{{ complaintType === ComplaintType.COMPLAINT ? ('artemisApp.complaint.title'
             <div class="col-12 col-md-6">
                 <p>
                     @if (exercise.teamMode) {
-                        <span>
-                            {{
-                                complaintType === ComplaintType.MORE_FEEDBACK
-                                    ? ('artemisApp.moreFeedback.beDescriptiveTeam' | artemisTranslate)
-                                    : ('artemisApp.complaint.beDescriptiveTeam' | artemisTranslate)
-                            }}
-                        </span>
+                        <span
+                            [jhiTranslate]="complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedback.beDescriptiveTeam' : 'artemisApp.complaint.beDescriptiveTeam'"
+                        ></span>
                     }
                     @if (!exercise.teamMode) {
-                        <span>
-                            {{
-                                complaintType === ComplaintType.MORE_FEEDBACK
-                                    ? ('artemisApp.moreFeedback.beDescriptive' | artemisTranslate)
-                                    : ('artemisApp.complaint.beDescriptive' | artemisTranslate)
-                            }}
-                        </span>
+                        <span
+                            [jhiTranslate]="complaintType === ComplaintType.MORE_FEEDBACK ? 'artemisApp.moreFeedback.beDescriptive' : 'artemisApp.complaint.beDescriptive'"
+                        ></span>
                     }
                 </p>
                 @if (!examId) {
-                    <p>
-                        {{ 'artemisApp.complaint.exclusivityDisclaimer' | artemisTranslate }}
-                    </p>
+                    <p jhiTranslate="artemisApp.complaint.exclusivityDisclaimer"></p>
                 }
                 <div class="d-flex flex-column">
                     <textarea id="complainTextArea" class="col-12 px-1" rows="4" [maxLength]="this.maxComplaintTextLimit" [(ngModel)]="complaintText"> </textarea>
diff --git a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
index 0651cc2ad7e5..ff642a21befc 100644
--- a/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
+++ b/src/main/webapp/app/complaints/list-of-complaints/list-of-complaints.component.html
@@ -3,10 +3,10 @@
         <div class="col-md-8">
             <h2>
                 @if (complaintType === ComplaintType.COMPLAINT) {
-                    <span>{{ 'artemisApp.complaint.listOfComplaints.title' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.complaint.listOfComplaints.title"></span>
                 }
                 @if (complaintType === ComplaintType.MORE_FEEDBACK) {
-                    <span>{{ 'artemisApp.moreFeedback.list.title' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.moreFeedback.list.title"></span>
                 }
             </h2>
         </div>
@@ -15,16 +15,16 @@ <h2>
 <div class="col-12 mt-4">
     <div class="alert alert-info" [hidden]="!course || course.isAtLeastInstructor">
         @if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) {
-            <span>{{ 'artemisApp.complaint.listOfComplaints.loadAllComplaintsExplanation' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.complaint.listOfComplaints.loadAllComplaintsExplanation"></span>
         }
         @if (!allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) {
-            <span>{{ 'artemisApp.moreFeedback.list.loadAllRequestsExplanation' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.moreFeedback.list.loadAllRequestsExplanation"></span>
         }
         @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.COMPLAINT) {
-            <span> {{ 'artemisApp.complaint.listOfComplaints.allComplaintsLoaded' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.complaint.listOfComplaints.allComplaintsLoaded"></span>
         }
         @if (allComplaintsForTutorLoaded && complaintType === ComplaintType.MORE_FEEDBACK) {
-            <span>{{ 'artemisApp.moreFeedback.list.allRequestsLoaded' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.moreFeedback.list.allRequestsLoaded"></span>
         }
         @if (!allComplaintsForTutorLoaded) {
             <button
@@ -38,10 +38,10 @@ <h2>
                     <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
                 }
                 @if (complaintType === ComplaintType.COMPLAINT) {
-                    <span>{{ 'artemisApp.complaint.listOfComplaints.loadAllComplaints' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.complaint.listOfComplaints.loadAllComplaints"></span>
                 }
                 @if (complaintType === ComplaintType.MORE_FEEDBACK) {
-                    <span>{{ 'artemisApp.moreFeedback.list.loadAllRequests' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.moreFeedback.list.loadAllRequests"></span>
                 }
             </button>
         }
@@ -59,13 +59,12 @@ <h2>
                 />
                 <label class="form-check-label" for="field_showAddressedComplaint">
                     @if (complaintType === ComplaintType.COMPLAINT) {
-                        <span>{{
-                            'artemisApp.complaint.listOfComplaints.show' + (filterOption === FILTER_OPTION_ADDRESSED_COMPLAINTS ? 'Only' : '') + 'AddressedComplaints'
-                                | artemisTranslate
-                        }}</span>
+                        <span
+                            jhiTranslate="artemisApp.complaint.listOfComplaints.show{{ filterOption === FILTER_OPTION_ADDRESSED_COMPLAINTS ? 'Only' : '' }}AddressedComplaints"
+                        ></span>
                     }
                     @if (complaintType === ComplaintType.MORE_FEEDBACK) {
-                        <span>{{ 'artemisApp.moreFeedback.list.showAnsweredRequests' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.moreFeedback.list.showAnsweredRequests"></span>
                     }
                 </label>
             </div>
@@ -80,48 +79,48 @@ <h2>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.participation.exercise.title">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.exercise' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.exercise"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.submission.id">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.submissionId' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.submissionId"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.assessor.name">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.assessorName' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.assessorName"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     @if (course?.isAtLeastInstructor) {
                         <th jhiSortBy="student.login">
-                            <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.studentLogin' | artemisTranslate }}</a>
+                            <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.studentLogin"></a>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th jhiSortBy="student.name">
-                            <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.studentName' | artemisTranslate }}</a>
+                            <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.studentName"></a>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th jhiSortBy="complaintResponse.reviewer.name">
-                            <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.reviewerName' | artemisTranslate }}</a>
+                            <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.reviewerName"></a>
                             <fa-icon [icon]="faSort" />
                         </th>
                     }
                     <th jhiSortBy="submittedTime">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.dateAndTime' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.dateAndTime"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="responseTime">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.responseTime' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.responseTime"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="accepted">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.status' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.status"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="lockStatus">
-                        <a class="th-link">{{ 'artemisApp.locks.lockStatus' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.locks.lockStatus"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
-                    <th>{{ 'artemisApp.complaint.listOfComplaints.actions' | artemisTranslate }}</th>
+                    <th jhiTranslate="artemisApp.complaint.listOfComplaints.actions"></th>
                 </tr>
             </thead>
             <tbody>
@@ -166,16 +165,16 @@ <h2>
                         </td>
                         <td>
                             @if (complaint.accepted === undefined) {
-                                <span class="text-warning">{{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }}</span>
+                                <span class="text-warning" jhiTranslate="artemisApp.complaint.listOfComplaints.noReply"></span>
                             }
                             @if (complaint.accepted === true && complaintType === ComplaintType.COMPLAINT) {
-                                <span class="text-success">{{ 'artemisApp.complaint.listOfComplaints.accepted' | artemisTranslate }}</span>
+                                <span class="text-success" jhiTranslate="artemisApp.complaint.listOfComplaints.accepted"></span>
                             }
                             @if (complaint.accepted === true && complaintType === ComplaintType.MORE_FEEDBACK) {
-                                <span class="text-success">{{ 'artemisApp.moreFeedback.accepted' | artemisTranslate }}</span>
+                                <span class="text-success" jhiTranslate="artemisApp.moreFeedback.accepted"></span>
                             }
                             @if (complaint.accepted === false) {
-                                <span class="text-danger">{{ 'artemisApp.complaint.listOfComplaints.rejected' | artemisTranslate }}</span>
+                                <span class="text-danger" jhiTranslate="artemisApp.complaint.listOfComplaints.rejected"></span>
                             }
                         </td>
                         <td>
@@ -185,10 +184,10 @@ <h2>
                             <button class="btn btn-primary btn-sm" (click)="openAssessmentEditor(complaint)" id="show-complaint">
                                 <fa-icon [icon]="faFolderOpen" [fixedWidth]="true" />
                                 @if (complaintType === ComplaintType.COMPLAINT) {
-                                    <span>{{ 'artemisApp.exerciseAssessmentDashboard.showComplaint' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.showComplaint"></span>
                                 }
                                 @if (complaintType === ComplaintType.MORE_FEEDBACK) {
-                                    <span>{{ 'artemisApp.exerciseAssessmentDashboard.showMoreFeedbackRequests' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.showMoreFeedbackRequests"></span>
                                 }
                             </button>
                         </td>
@@ -199,10 +198,10 @@ <h2>
     </div>
     <div class="alert alert-info" [hidden]="complaints.length !== 0">
         @if (complaintType === ComplaintType.COMPLAINT) {
-            <span>{{ 'artemisApp.exerciseAssessmentDashboard.noComplaints' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.noComplaints"></span>
         }
         @if (complaintType === ComplaintType.MORE_FEEDBACK) {
-            <span>{{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests"></span>
         }
     </div>
 </div>
diff --git a/src/main/webapp/app/complaints/request/complaint-request.component.html b/src/main/webapp/app/complaints/request/complaint-request.component.html
index 5c3b8f448f1c..2f86094c7345 100644
--- a/src/main/webapp/app/complaints/request/complaint-request.component.html
+++ b/src/main/webapp/app/complaints/request/complaint-request.component.html
@@ -7,18 +7,13 @@
         }}
         <span [ngbTooltip]="complaint.submittedTime | artemisDate">{{ complaint.submittedTime | artemisTimeAgo }}</span>
         @if (complaint.accepted === true) {
-            <span class="badge bg-success">
-                {{
-                    complaint.complaintType === ComplaintType.COMPLAINT
-                        ? ('artemisApp.complaint.acceptedLong' | artemisTranslate)
-                        : ('artemisApp.moreFeedback.acceptedLong' | artemisTranslate)
-                }}
-            </span>
+            <span
+                class="badge bg-success"
+                [jhiTranslate]="complaint.complaintType === ComplaintType.COMPLAINT ? 'artemisApp.complaint.acceptedLong' : 'artemisApp.moreFeedback.acceptedLong'"
+            ></span>
         }
         @if (complaint.accepted === false) {
-            <span class="badge bg-danger">
-                {{ 'artemisApp.complaint.rejectedLong' | artemisTranslate }}
-            </span>
+            <span class="badge bg-danger" jhiTranslate="artemisApp.complaint.rejectedLong"></span>
         }
     </p>
     <textarea
diff --git a/src/main/webapp/app/core/about-us/about-us.component.html b/src/main/webapp/app/core/about-us/about-us.component.html
index 50775464fff8..29eda0afe1a7 100644
--- a/src/main/webapp/app/core/about-us/about-us.component.html
+++ b/src/main/webapp/app/core/about-us/about-us.component.html
@@ -1,26 +1,26 @@
 <div class="page">
     <div class="card-title ms-2">
-        <h2 class="mb-3 mt-3 font-weight-bold">{{ 'artemisApp.aboutUsOverview.title' | artemisTranslate }}</h2>
+        <h2 class="mb-3 mt-3 font-weight-bold" jhiTranslate="artemisApp.aboutUsOverview.title"></h2>
     </div>
     <div>
-        <h3 class="mb-3 ms-2 font-weight-bold">{{ 'artemisApp.aboutUsOverview.getInTouch' | artemisTranslate }}</h3>
+        <h3 class="mb-3 ms-2 font-weight-bold" jhiTranslate="artemisApp.aboutUsOverview.getInTouch"></h3>
         <ul>
             <li>
-                <a [href]="BUG_REPORT_URL" rel="noreferrer noopener" class="footer-text ms-3" target="_blank">{{ 'bug' | artemisTranslate }}</a>
+                <a [href]="BUG_REPORT_URL" rel="noreferrer noopener" class="footer-text ms-3" target="_blank" jhiTranslate="bug"></a>
             </li>
             <li>
-                <a [href]="FEATURE_REQUEST_URL" class="footer-text ms-3" target="_blank"> {{ 'feature' | artemisTranslate }}</a>
+                <a [href]="FEATURE_REQUEST_URL" class="footer-text ms-3" target="_blank" jhiTranslate="feature"></a>
             </li>
             <li>
-                <a [href]="email" class="footer-text ms-3" target="_top"> {{ 'contact' | artemisTranslate }}</a>
+                <a [href]="email" class="footer-text ms-3" target="_top" jhiTranslate="contact"></a>
             </li>
             <li>
-                <a [href]="RELEASE_NOTES_URL" class="footer-text ms-3" target="_blank">{{ 'releaseNotes' | artemisTranslate }}</a>
+                <a [href]="RELEASE_NOTES_URL" class="footer-text ms-3" target="_blank" jhiTranslate="releaseNotes"></a>
             </li>
         </ul>
     </div>
     <div class="mb-5 ms-2">
-        <h3 class="mb-3 font-weight-bold">{{ 'artemisApp.aboutUsOverview.feature' | artemisTranslate }}</h3>
+        <h3 class="mb-3 font-weight-bold" jhiTranslate="artemisApp.aboutUsOverview.feature"></h3>
         <ol>
             @for (section of SECTIONS; track section) {
                 <li>
@@ -41,7 +41,7 @@ <h4 class="font-weight-bold">{{ pm.fullName }}</h4>
                                 <h5>{{ 'artemisApp.aboutUsOverview.roles.' + pm.role | artemisTranslate }}</h5>
                                 <span>
                                     <i></i>
-                                    <a href="{{ pm.website }}" target="_blank" rel="noopener noreferrer">{{ 'artemisApp.aboutUsOverview.website' | artemisTranslate }}</a>
+                                    <a href="{{ pm.website }}" target="_blank" rel="noopener noreferrer" jhiTranslate="artemisApp.aboutUsOverview.website"></a>
                                 </span>
                             </div>
                         </div>
@@ -52,7 +52,7 @@ <h5>{{ 'artemisApp.aboutUsOverview.roles.' + pm.role | artemisTranslate }}</h5>
     }
     @if (data && data.contributors) {
         <div class="mt-5 ms-2 me-2">
-            <h3 class="font-weight-bold">{{ 'artemisApp.aboutUsOverview.contributors' | artemisTranslate }}</h3>
+            <h3 class="font-weight-bold" jhiTranslate="artemisApp.aboutUsOverview.contributors"></h3>
             <div class="row">
                 @for (contributor of data.contributors; track contributor) {
                     <div class="contributor text-center">
@@ -66,10 +66,37 @@ <h3 class="font-weight-bold">{{ 'artemisApp.aboutUsOverview.contributors' | arte
         </div>
     }
     <div class="mt-5 ms-2 me-2">
-        <h3 class="font-weight-bold">{{ 'artemisApp.git.title' | artemisTranslate }}</h3>
+        <h3 class="font-weight-bold" jhiTranslate="artemisApp.git.title"></h3>
         <div>
-            {{ 'artemisApp.git.branch' | artemisTranslate }}: {{ gitBranchName }}<br />
-            {{ 'artemisApp.git.commit' | artemisTranslate }}: {{ gitCommitId }}
+            <div class="inline-block fixed-width" jhiTranslate="artemisApp.git.branch"></div>
+            <div class="inline-block">{{ gitBranchName }}</div>
         </div>
+        <div>
+            <div class="inline-block fixed-width" jhiTranslate="artemisApp.git.commit"></div>
+            <div class="inline-block">{{ gitCommitId }}</div>
+        </div>
+    </div>
+    <div class="mt-5 ms-2 me-2">
+        <h3 class="font-weight-bold" jhiTranslate="artemisApp.operatorInfo.title"></h3>
+        <div>
+            <div class="inline-block fixed-width" jhiTranslate="artemisApp.operatorInfo.name"></div>
+            <div class="inline-block">{{ operatorName }}</div>
+        </div>
+        @if (operatorAdminName) {
+            <div>
+                <div class="inline-block fixed-width" jhiTranslate="artemisApp.operatorInfo.admin"></div>
+                <div class="inline-block">{{ operatorAdminName }}</div>
+            </div>
+        }
+        @if (operatorContactEmail) {
+            <div>
+                <div class="inline-block fixed-width" jhiTranslate="artemisApp.operatorInfo.adminEmail"></div>
+                <div class="inline-block">
+                    <a [href]="email" class="footer-text" target="_top">
+                        {{ operatorContactEmail }}
+                    </a>
+                </div>
+            </div>
+        }
     </div>
 </div>
diff --git a/src/main/webapp/app/core/about-us/about-us.component.scss b/src/main/webapp/app/core/about-us/about-us.component.scss
index 18f8bfcd0a33..6a8714e970e6 100644
--- a/src/main/webapp/app/core/about-us/about-us.component.scss
+++ b/src/main/webapp/app/core/about-us/about-us.component.scss
@@ -37,3 +37,13 @@
     flex: 0 0 50%;
     max-width: 50%;
 }
+
+.inline-block {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 20px;
+}
+
+.fixed-width {
+    width: 200px;
+}
diff --git a/src/main/webapp/app/core/about-us/about-us.component.ts b/src/main/webapp/app/core/about-us/about-us.component.ts
index aa8f35742728..42ba47b5093a 100644
--- a/src/main/webapp/app/core/about-us/about-us.component.ts
+++ b/src/main/webapp/app/core/about-us/about-us.component.ts
@@ -19,8 +19,11 @@ export class AboutUsComponent implements OnInit {
 
     email: string;
     data: AboutUsModel;
-    gitCommitId: string;
-    gitBranchName: string;
+    gitCommitId?: string;
+    gitBranchName?: string;
+    operatorName?: string;
+    operatorAdminName?: string;
+    operatorContactEmail?: string;
 
     // Array of tuple containing translation keys and translation values
     readonly SECTIONS: [string, { [key: string]: string }][] = [
@@ -61,7 +64,10 @@ export class AboutUsComponent implements OnInit {
     ngOnInit(): void {
         this.staticContentService.getStaticJsonFromArtemisServer('about-us.json').subscribe((data) => {
             // Map contributors into the model, as the returned data are just plain objects
-            this.data = { ...data, contributors: data.contributors.map((con: any) => new ContributorModel(con.fullName, con.photoDirectory, con.sortBy, con.role, con.website)) };
+            this.data = {
+                ...data,
+                contributors: data.contributors.map((con: any) => new ContributorModel(con.fullName, con.photoDirectory, con.sortBy, con.role, con.website)),
+            };
 
             // Sort by last name
             // Either the last "word" in the name, or the dedicated sortBy field, if present
@@ -74,9 +80,11 @@ export class AboutUsComponent implements OnInit {
                 this.gitCommitId = profileInfo.git.commit.id.abbrev;
                 this.gitBranchName = profileInfo.git.branch;
             }
+            this.operatorName = profileInfo.operatorName;
+            this.operatorAdminName = profileInfo.operatorAdminName;
+            this.operatorContactEmail = profileInfo.contact;
         });
     }
-
     /**
      * Create the mail reference for the contact
      */
diff --git a/src/main/webapp/app/core/auth/account.service.ts b/src/main/webapp/app/core/auth/account.service.ts
index 81e0c074557b..1b6a82c3a0a0 100644
--- a/src/main/webapp/app/core/auth/account.service.ts
+++ b/src/main/webapp/app/core/auth/account.service.ts
@@ -12,7 +12,7 @@ import { StudentParticipation } from 'app/entities/participation/student-partici
 import { Exercise, getCourseFromExercise } from 'app/entities/exercise.model';
 import { Authority } from 'app/shared/constants/authority.constants';
 import { TranslateService } from '@ngx-translate/core';
-import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { EntityResponseType } from 'app/complaints/complaint.service';
 
 export interface IAccountService {
     save: (account: any) => Observable<HttpResponse<any>>;
@@ -39,7 +39,6 @@ export class AccountService implements IAccountService {
     private authenticated = false;
     private authenticationState = new BehaviorSubject<User | undefined>(undefined);
     private prefilledUsernameValue?: string;
-    private versionControlAccessTokenRequired: boolean;
 
     constructor(
         private translateService: TranslateService,
@@ -47,7 +46,6 @@ export class AccountService implements IAccountService {
         private http: HttpClient,
         private websocketService: JhiWebsocketService,
         private featureToggleService: FeatureToggleService,
-        private profileService: ProfileService,
     ) {}
 
     get userIdentity() {
@@ -137,19 +135,10 @@ export class AccountService implements IAccountService {
             this.userIdentity = undefined;
         }
 
-        if (this.versionControlAccessTokenRequired === undefined) {
-            this.profileService.getProfileInfo().subscribe((profileInfo) => {
-                this.versionControlAccessTokenRequired = profileInfo.useVersionControlAccessToken ?? false;
-            });
-        }
-
         // check and see if we have retrieved the userIdentity data from the server.
         // if we have, reuse it by immediately resolving
         if (this.userIdentity) {
-            // in case a token is required but not present in the user, we cannot simply return the cached object
-            if (!this.versionControlAccessTokenRequired || this.userIdentity.vcsAccessToken !== undefined) {
-                return Promise.resolve(this.userIdentity);
-            }
+            return Promise.resolve(this.userIdentity);
         }
 
         // retrieve the userIdentity data from the server, update the identity object, and then resolve.
@@ -336,7 +325,7 @@ export class AccountService implements IAccountService {
         if (this.userIdentity) {
             this.userIdentity.sshPublicKey = sshPublicKey;
         }
-        return this.http.put<void>('api/users/sshpublickey', sshPublicKey);
+        return this.http.put<void>('api/account/ssh-public-key', sshPublicKey);
     }
 
     /**
@@ -346,7 +335,24 @@ export class AccountService implements IAccountService {
         if (this.userIdentity) {
             this.userIdentity.sshPublicKey = undefined;
         }
-        return this.http.delete<void>('api/users/sshpublickey');
+        return this.http.delete<void>('api/account/ssh-public-key');
+    }
+
+    /**
+     * Sends a request to the server to delete the user's current vcsAccessToken
+     */
+    deleteUserVcsAccessToken(): Observable<void> {
+        return this.http.delete<void>('api/account/user-vcs-access-token');
+    }
+
+    /**
+     * Sends a request to the server to create a new vcsAccessToken for the user
+     *
+     * @param expiryDate The expiry date which should get set for the vcsAccessToken
+     */
+    addNewVcsAccessToken(expiryDate: string): Observable<EntityResponseType> {
+        const params = new HttpParams().set('expiryDate', expiryDate);
+        return this.http.put<User>('api/account/user-vcs-access-token', null, { observe: 'response', params });
     }
 
     /**
@@ -357,7 +363,7 @@ export class AccountService implements IAccountService {
      */
     getVcsAccessToken(participationId: number): Observable<HttpResponse<string>> {
         const params = new HttpParams().set('participationId', participationId);
-        return this.http.get<string>('api/users/vcsToken', { observe: 'response', params, responseType: 'text' as 'json' });
+        return this.http.get<string>('api/account/participation-vcs-access-token', { observe: 'response', params, responseType: 'text' as 'json' });
     }
 
     /**
@@ -368,6 +374,6 @@ export class AccountService implements IAccountService {
      */
     createVcsAccessToken(participationId: number): Observable<HttpResponse<string>> {
         const params = new HttpParams().set('participationId', participationId);
-        return this.http.put<string>('api/users/vcsToken', null, { observe: 'response', params, responseType: 'text' as 'json' });
+        return this.http.put<string>('api/account/participation-vcs-access-token', null, { observe: 'response', params, responseType: 'text' as 'json' });
     }
 }
diff --git a/src/main/webapp/app/core/language/language.helper.ts b/src/main/webapp/app/core/language/language.helper.ts
index 036c2f63699c..60cfe80b69c2 100644
--- a/src/main/webapp/app/core/language/language.helper.ts
+++ b/src/main/webapp/app/core/language/language.helper.ts
@@ -98,7 +98,7 @@ export class JhiLanguageHelper {
         return 'en';
     }
 
-    public getNavigatorReference(): any {
+    public getNavigatorReference(): Navigator {
         return navigator;
     }
 }
diff --git a/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html b/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html
index 0c25f8d340e8..676e5f46c404 100644
--- a/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html
+++ b/src/main/webapp/app/core/legal/data-export/confirmation/data-export-confirmation-dialog.component.html
@@ -20,7 +20,7 @@ <h4 class="modal-title">
                                 (change)="onRequestDataExportForOtherUserChanged($event)"
                                 [(ngModel)]="requestForAnotherUser"
                             />
-                            <label for="request-for-other-user" class="form-check-label">{{ 'artemisApp.dataExport.requestForAnotherUser' | artemisTranslate }}</label>
+                            <label for="request-for-other-user" class="form-check-label" jhiTranslate="artemisApp.dataExport.requestForAnotherUser"></label>
                         </div>
                         @if (requestForAnotherUser) {
                             <jhi-type-ahead-user-search-field [(loginOrName)]="expectedLogin" />
diff --git a/src/main/webapp/app/core/legal/data-export/data-export.component.html b/src/main/webapp/app/core/legal/data-export/data-export.component.html
index 0c22abcc9769..a949ef535259 100644
--- a/src/main/webapp/app/core/legal/data-export/data-export.component.html
+++ b/src/main/webapp/app/core/legal/data-export/data-export.component.html
@@ -32,19 +32,19 @@ <h1>
     <div class="mt-3 d-flex-column align-content-center">
         @if (dataExport?.createdDate && state !== DataExportState.FAILED) {
             <p>
-                <span> {{ 'artemisApp.dataExport.lastRequestDate' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.dataExport.lastRequestDate"></span>
                 <span class="bold">{{ dataExport?.createdDate | artemisDate: 'long-date' }}</span>
             </p>
         }
         @if (dataExport?.nextRequestDate && (state === DataExportState.DELETED || state === DataExportState.DOWNLOADED_DELETED) && !canRequestDataExport) {
             <p>
-                <span> {{ 'artemisApp.dataExport.nextRequestDate' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.dataExport.nextRequestDate"></span>
                 <span class="bold">{{ dataExport?.nextRequestDate | artemisDate: 'long-date' }}</span>
             </p>
         }
         @if (state === DataExportState.REQUESTED || state === DataExportState.IN_CREATION) {
             <p>
-                <span> {{ 'artemisApp.dataExport.isBeingCreated' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.dataExport.isBeingCreated"></span>
             </p>
         }
     </div>
diff --git a/src/main/webapp/app/core/theme/theme.service.ts b/src/main/webapp/app/core/theme/theme.service.ts
index a6fa87c0c01a..507b355b11fe 100644
--- a/src/main/webapp/app/core/theme/theme.service.ts
+++ b/src/main/webapp/app/core/theme/theme.service.ts
@@ -11,24 +11,20 @@ export const THEME_OVERRIDE_ID = 'artemis-theme-override';
  * If you add new themes, make sure to adapt the theme switch component which currently only supports two themes.
  */
 export class Theme {
-    public static readonly LIGHT = new Theme('LIGHT', true, undefined, faSun, 'chrome', 'dreamweaver');
-    public static readonly DARK = new Theme('DARK', false, 'theme-dark.css', faMoon, 'dracula', 'dracula');
+    public static readonly LIGHT = new Theme('LIGHT', true, undefined, faSun);
+    public static readonly DARK = new Theme('DARK', false, 'theme-dark.css', faMoon);
 
-    private constructor(identifier: string, isDefault: boolean, fileName: string | undefined, icon: IconDefinition, markdownAceTheme: string, codeAceTheme: string) {
+    private constructor(identifier: string, isDefault: boolean, fileName: string | undefined, icon: IconDefinition) {
         this.identifier = identifier;
         this.isDefault = isDefault;
         this.fileName = fileName;
         this.icon = icon;
-        this.markdownAceTheme = markdownAceTheme;
-        this.codeAceTheme = codeAceTheme;
     }
 
     public readonly identifier: string;
     public readonly isDefault: boolean;
     public readonly fileName: string | undefined;
     public readonly icon: IconDefinition;
-    public readonly markdownAceTheme: string;
-    public readonly codeAceTheme: string;
 
     /**
      * Returns an array with all available themes.
diff --git a/src/main/webapp/app/core/user/user.model.ts b/src/main/webapp/app/core/user/user.model.ts
index 0c30062efbd0..816cf4fc9a9c 100644
--- a/src/main/webapp/app/core/user/user.model.ts
+++ b/src/main/webapp/app/core/user/user.model.ts
@@ -14,6 +14,7 @@ export class User extends Account {
     public visibleRegistrationNumber?: string;
     public password?: string;
     public vcsAccessToken?: string;
+    public vcsAccessTokenExpiryDate?: string;
     public sshPublicKey?: string;
     public irisAccepted?: dayjs.Dayjs;
 
@@ -35,6 +36,7 @@ export class User extends Account {
         password?: string,
         imageUrl?: string,
         vcsAccessToken?: string,
+        vcsAccessTokenExpiryDate?: string,
         sshPublicKey?: string,
         irisAccepted?: dayjs.Dayjs,
     ) {
@@ -48,6 +50,7 @@ export class User extends Account {
         this.lastNotificationRead = lastNotificationRead;
         this.password = password;
         this.vcsAccessToken = vcsAccessToken;
+        this.vcsAccessTokenExpiryDate = vcsAccessTokenExpiryDate;
         this.sshPublicKey = sshPublicKey;
         this.irisAccepted = irisAccepted;
     }
diff --git a/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.html b/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.html
index 90ce76259d01..86b706cec05b 100644
--- a/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.html
+++ b/src/main/webapp/app/course/competencies/competencies-popover/competencies-popover.component.html
@@ -1,12 +1,8 @@
-<ng-template #popTitle>
-    <span class="font-weight-bold">{{ 'artemisApp.competency.competencyPopover.connectedCompetencies' | artemisTranslate }}</span></ng-template
->
+<ng-template #popTitle> <span class="font-weight-bold" jhiTranslate="artemisApp.competency.competencyPopover.connectedCompetencies"></span></ng-template>
 <ng-template #popContent>
     @if (competencies && competencies.length > 0) {
         <div>
-            <small>
-                {{ 'artemisApp.competency.competencyPopover.explanation' | artemisTranslate }}
-            </small>
+            <small jhiTranslate="artemisApp.competency.competencyPopover.explanation"></small>
             <ul class="list-group">
                 @for (competency of competencies; track competency) {
                     <a class="list-group-item" [routerLink]="navigationArray">{{ competency.title }}</a>
@@ -14,7 +10,7 @@
             </ul>
         </div>
     } @else {
-        <a [routerLink]="navigationArray">{{ 'artemisApp.competency.competencyPopover.noCompetencies' | artemisTranslate }}</a>
+        <a [routerLink]="navigationArray" jhiTranslate="artemisApp.competency.competencyPopover.noCompetencies"></a>
     }
 </ng-template>
 <button type="button" class="btn btn-sm btn-primary competency-button" [ngbPopover]="popContent" [popoverTitle]="popTitle" popoverClass="competency-popover">
diff --git a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html
index e6271908e59c..ffddb7b4643a 100644
--- a/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html
+++ b/src/main/webapp/app/course/competencies/competency-card/competency-card.component.html
@@ -52,7 +52,7 @@ <h4 class="m-0">
             </div>
             @if (competency.softDueDate) {
                 <div class="col-sm col py-2" style="max-width: fit-content">
-                    <span style="vertical-align: middle"> {{ 'artemisApp.competency.competencyCard.softDueDate' | artemisTranslate }} </span>
+                    <span style="vertical-align: middle" jhiTranslate="artemisApp.competency.competencyCard.softDueDate"></span>
                     <span class="badge" [ngClass]="softDueDatePassed && !isMastered ? 'bg-danger' : 'bg-success'" id="date-badge">
                         {{ competency.softDueDate! | artemisTimeAgo }}
                     </span>
diff --git a/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html b/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html
index e50d548a6cc4..85abe072e64a 100644
--- a/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html
+++ b/src/main/webapp/app/course/competencies/competency-management/competency-relation-graph.component.html
@@ -2,9 +2,7 @@
     <div ngbAccordion [closeOthers]="true">
         <div ngbAccordionItem>
             <div ngbAccordionHeader>
-                <button ngbAccordionButton>
-                    {{ 'artemisApp.competency.relation.competencyRelations' | artemisTranslate }}
-                </button>
+                <button ngbAccordionButton jhiTranslate="artemisApp.competency.relation.competencyRelations"></button>
             </div>
             <div ngbAccordionCollapse>
                 <div ngbAccordionBody>
@@ -12,7 +10,7 @@
                         <form class="row p-3 pb-0 g-3 align-items-end">
                             <div class="col">
                                 <div class="form-group">
-                                    <label for="tail">{{ 'artemisApp.competency.relation.tailCompetency' | artemisTranslate }}</label>
+                                    <label for="tail" jhiTranslate="artemisApp.competency.relation.tailCompetency"></label>
                                     <select
                                         [ngClass]="{ 'border-danger': relationError }"
                                         class="form-select"
@@ -29,7 +27,7 @@
                             </div>
                             <div class="col">
                                 <div class="form-group">
-                                    <label for="type">{{ 'artemisApp.competency.relation.relationType' | artemisTranslate }}</label>
+                                    <label for="type" jhiTranslate="artemisApp.competency.relation.relationType"></label>
                                     <select
                                         [ngClass]="{ 'border-danger': relationError }"
                                         class="form-select"
@@ -49,7 +47,7 @@
                             </div>
                             <div class="col">
                                 <div class="form-group">
-                                    <label for="head">{{ 'artemisApp.competency.relation.headCompetency' | artemisTranslate }}</label>
+                                    <label for="head" jhiTranslate="artemisApp.competency.relation.headCompetency"></label>
                                     <select
                                         [ngClass]="{ 'border-danger': relationError }"
                                         class="form-select"
diff --git a/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html b/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html
index 3dcbbb03c4b2..ca189ca775c7 100644
--- a/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html
+++ b/src/main/webapp/app/course/competencies/competency-management/import-all-competencies.component.html
@@ -5,12 +5,12 @@ <h4 class="modal-title" [jhiTranslate]="'artemisApp.' + competencyType + '.impor
     </div>
     <div class="modal-body">
         <div class="form-group form-inline">
-            <span>{{ 'artemisApp.competency.importAll.search' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.competency.importAll.search"></span>
             <input [(ngModel)]="searchTerm" class="form-control ms-2" name="searchCourse" type="text" />
-            <span class="ms-3">{{ 'artemisApp.competency.import.importRelations' | artemisTranslate }}</span>
+            <span class="ms-3" jhiTranslate="artemisApp.competency.import.importRelations"></span>
             <input type="checkbox" class="ms-2" [(ngModel)]="importRelations" name="importRelations" />
             @if (loading) {
-                <span class="ms-3">{{ 'loading' | artemisTranslate }}</span>
+                <span class="ms-3" jhiTranslate="loading"></span>
             }
         </div>
         <table class="table table-striped align-middle flex">
diff --git a/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss b/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss
index 48cbdc56eb9e..530831419029 100644
--- a/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss
+++ b/src/main/webapp/app/course/competencies/competency-rings/competency-rings.component.scss
@@ -17,13 +17,14 @@ svg {
         transform-origin: 50%;
     }
     .progressbar {
+        stroke-linecap: round;
+
         &-anim {
             animation: ring-appear 1s ease-in-out forwards;
             transition:
                 stroke-dasharray 1s ease-in-out,
                 opacity 1s linear;
         }
-        stroke-linecap: round;
 
         &.hidden {
             // Use opacity: 0 instead of display: none to prevent animation when appearing
@@ -56,11 +57,11 @@ svg {
             stroke: var(--competency-rings-green-bg);
         }
         .progressbar {
+            stroke: var(--competency-rings-green);
             &-anim {
                 animation-duration: 1s;
                 transition-duration: 1s;
             }
-            stroke: var(--competency-rings-green);
         }
     }
 }
diff --git a/src/main/webapp/app/course/competencies/competency.module.ts b/src/main/webapp/app/course/competencies/competency.module.ts
index 815be526a131..d7b4c6da30b5 100644
--- a/src/main/webapp/app/course/competencies/competency.module.ts
+++ b/src/main/webapp/app/course/competencies/competency.module.ts
@@ -23,6 +23,7 @@ import { JudgementOfLearningRatingComponent } from 'app/course/competencies/judg
 import { CompetencyManagementTableComponent } from 'app/course/competencies/competency-management/competency-management-table.component';
 import { CompetencySearchComponent } from 'app/course/competencies/import/competency-search.component';
 import { ImportCompetenciesTableComponent } from 'app/course/competencies/import/import-competencies-table.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 @NgModule({
     imports: [
@@ -41,6 +42,7 @@ import { ImportCompetenciesTableComponent } from 'app/course/competencies/import
         RatingModule,
         JudgementOfLearningRatingComponent,
         CompetencyManagementTableComponent,
+        ArtemisMarkdownEditorModule,
     ],
     declarations: [
         CompetencyRingsComponent,
diff --git a/src/main/webapp/app/course/competencies/course-competency.service.ts b/src/main/webapp/app/course/competencies/course-competency.service.ts
index 65094f9d1a90..04403d48db93 100644
--- a/src/main/webapp/app/course/competencies/course-competency.service.ts
+++ b/src/main/webapp/app/course/competencies/course-competency.service.ts
@@ -20,6 +20,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'
 import { Prerequisite } from 'app/entities/prerequisite.model';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
 import { AccountService } from 'app/core/auth/account.service';
+import { CompetencyRecommendation } from 'app/course/competencies/generate-competencies/generate-competencies.component';
 
 type EntityResponseType = HttpResponse<CourseCompetency>;
 type EntityArrayResponseType = HttpResponse<CourseCompetency[]>;
@@ -105,8 +106,14 @@ export class CourseCompetencyService {
         );
     }
 
-    generateCompetenciesFromCourseDescription(courseDescription: string, courseId: number): Observable<EntityArrayResponseType> {
-        return this.httpClient.post<CourseCompetency[]>(`${this.resourceURL}/courses/${courseId}/course-competencies/generate-from-description`, courseDescription, {
+    // triggers the generation of competencies from the given course description
+    // the generated competencies are returned asynchronously over the websocket on the topic /topic/iris/competencies/{courseId}
+    generateCompetenciesFromCourseDescription(courseId: number, courseDescription: string, currentCompetencies: CompetencyRecommendation[]): Observable<HttpResponse<void>> {
+        const params = {
+            courseDescription: courseDescription,
+            currentCompetencies: currentCompetencies,
+        };
+        return this.httpClient.post<void>(`${this.resourceURL}/courses/${courseId}/course-competencies/generate-from-description`, params, {
             observe: 'response',
         });
     }
diff --git a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html
index 38a8936b2701..c27066b26924 100644
--- a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html
+++ b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.html
@@ -27,7 +27,7 @@
     @if (!isInConnectMode) {
         <div class="form-group">
             <label for="description" jhiTranslate="artemisApp.courseCompetency.description"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 [markdown]="descriptionControl?.value"
                 (markdownChange)="updateDescriptionControl($event)"
                 id="description"
diff --git a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts
index 11fbf0f84b9b..eff8620b4cf7 100644
--- a/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts
+++ b/src/main/webapp/app/course/competencies/forms/common-course-competency-form.component.ts
@@ -16,13 +16,23 @@ import { FormsModule } from 'app/forms/forms.module';
 import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { merge } from 'rxjs';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 @Component({
     selector: 'jhi-common-course-competency-form',
     templateUrl: './common-course-competency-form.component.html',
     styleUrls: ['./common-course-competency-form.component.scss'],
     standalone: true,
-    imports: [ArtemisSharedModule, FormDateTimePickerModule, ArtemisMarkdownModule, NgbDropdownModule, FormsModule, ArtemisCompetenciesModule, ArtemisSharedComponentModule],
+    imports: [
+        ArtemisSharedModule,
+        FormDateTimePickerModule,
+        ArtemisMarkdownModule,
+        NgbDropdownModule,
+        FormsModule,
+        ArtemisCompetenciesModule,
+        ArtemisSharedComponentModule,
+        ArtemisMarkdownEditorModule,
+    ],
 })
 export class CommonCourseCompetencyFormComponent implements OnInit, OnChanges {
     @Input()
diff --git a/src/main/webapp/app/course/competencies/generate-competencies/competency-recommendation-detail.component.html b/src/main/webapp/app/course/competencies/generate-competencies/competency-recommendation-detail.component.html
index 635267c7d7d8..5e3f9ead56cd 100644
--- a/src/main/webapp/app/course/competencies/generate-competencies/competency-recommendation-detail.component.html
+++ b/src/main/webapp/app/course/competencies/generate-competencies/competency-recommendation-detail.component.html
@@ -9,7 +9,7 @@ <h6 class="mb-0 text-nowrap text-truncate overflow-hidden">{{ titleControl.value
         <div class="d-flex align-items-center flex-grow-1 justify-content-end">
             <div class="d-flex me-3">
                 <input class="me-1" type="checkbox" id="viewed-{{ index }}" formControlName="viewed" />
-                <label for="viewed-{{ index }}">{{ 'artemisApp.competency.generate.viewedLabel' | artemisTranslate }}</label>
+                <label for="viewed-{{ index }}" jhiTranslate="artemisApp.competency.generate.viewedLabel"></label>
             </div>
             @if (!isInEditMode) {
                 <jhi-button
@@ -48,7 +48,7 @@ <h6 class="mb-0 text-nowrap text-truncate overflow-hidden">{{ titleControl.value
     </div>
     <div class="card-body border-0" [ngbCollapse]="isCollapsed" formGroupName="competency">
         <div class="form-group">
-            <label for="title-{{ index }}">{{ 'artemisApp.competency.title' | artemisTranslate }}</label>
+            <label for="title-{{ index }}" jhiTranslate="artemisApp.competency.title"></label>
             <input type="text" class="form-control" id="title-{{ index }}" formControlName="title" />
             @if (titleControl.invalid && (titleControl.dirty || titleControl.touched)) {
                 <div class="alert alert-danger">
@@ -62,9 +62,9 @@ <h6 class="mb-0 text-nowrap text-truncate overflow-hidden">{{ titleControl.value
             }
         </div>
         <div class="form-group">
-            <label for="description-{{ index }}">{{ 'artemisApp.competency.description' | artemisTranslate }}</label>
+            <label for="description-{{ index }}" jhiTranslate="artemisApp.competency.description"></label>
             @if (isInEditMode) {
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     [markdown]="descriptionControl.value"
                     (markdownChange)="updateDescriptionControl($event)"
                     id="description-{{ index }}"
@@ -91,7 +91,7 @@ <h6 class="mb-0 text-nowrap text-truncate overflow-hidden">{{ titleControl.value
             }
         </div>
         <div class="form-group">
-            <label for="taxonomy-{{ index }}">{{ 'artemisApp.competency.taxonomy' | artemisTranslate }}</label>
+            <label for="taxonomy-{{ index }}" jhiTranslate="artemisApp.competency.taxonomy"></label>
             <jhi-taxonomy-select selectId="taxonomy-{{ index }}" [form]="taxonomyControl" />
         </div>
     </div>
diff --git a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
index f0297c939a1c..3b0151de263d 100644
--- a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
+++ b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.html
@@ -14,19 +14,13 @@
         @if (courseDescriptionControl.invalid && (courseDescriptionControl.dirty || courseDescriptionControl.touched)) {
             <div class="alert alert-danger mb-0">
                 @if (courseDescriptionControl.errors?.required) {
-                    <div>
-                        {{ 'artemisApp.competency.generate.courseDescription.requiredValidationError' | artemisTranslate }}
-                    </div>
+                    <div jhiTranslate="artemisApp.competency.generate.courseDescription.requiredValidationError"></div>
                 }
                 @if (courseDescriptionControl.errors?.minlength) {
-                    <div>
-                        {{ 'artemisApp.competency.generate.courseDescription.minlengthValidationError' | artemisTranslate: { min: DESCRIPTION_MIN } }}
-                    </div>
+                    <div jhiTranslate="artemisApp.competency.generate.courseDescription.minlengthValidationError" [translateValues]="{ min: DESCRIPTION_MIN }"></div>
                 }
                 @if (courseDescriptionControl.errors?.maxlength) {
-                    <div>
-                        {{ 'artemisApp.competency.generate.courseDescription.maxlengthValidationError' | artemisTranslate: { max: DESCRIPTION_MAX } }}
-                    </div>
+                    <div jhiTranslate="artemisApp.competency.generate.courseDescription.maxlengthValidationError" [translateValues]="{ max: DESCRIPTION_MAX }"></div>
                 }
             </div>
         }
diff --git a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts
index b6cec6cdec66..a466747c670b 100644
--- a/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts
+++ b/src/main/webapp/app/course/competencies/generate-competencies/course-description-form.component.ts
@@ -9,6 +9,7 @@ import { ButtonType } from 'app/shared/components/button.component';
 })
 export class CourseDescriptionFormComponent implements OnInit {
     @Input() isLoading = false;
+    @Input() placeholder = '';
     @Output() formSubmitted: EventEmitter<string> = new EventEmitter<string>();
 
     form: FormGroup<{ courseDescription: FormControl<string | null> }>;
@@ -26,10 +27,14 @@ export class CourseDescriptionFormComponent implements OnInit {
 
     ngOnInit(): void {
         this.form = this.formBuilder.group({
-            courseDescription: ['', [Validators.required, Validators.minLength(this.DESCRIPTION_MIN), Validators.maxLength(this.DESCRIPTION_MAX)]],
+            courseDescription: [this.placeholder, [Validators.required, Validators.minLength(this.DESCRIPTION_MIN), Validators.maxLength(this.DESCRIPTION_MAX)]],
         });
     }
 
+    setCourseDescription(description: string) {
+        this.form.controls.courseDescription.setValue(description);
+    }
+
     /**
      * Sends event to parent to handle submission
      */
diff --git a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts
index 74c6d6891d3f..9501484fe9b5 100644
--- a/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts
+++ b/src/main/webapp/app/course/competencies/generate-competencies/generate-competencies.component.ts
@@ -1,4 +1,4 @@
-import { Component, HostListener, OnInit } from '@angular/core';
+import { Component, HostListener, OnInit, ViewChild } from '@angular/core';
 import { CompetencyService } from 'app/course/competencies/competency.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { onError } from 'app/shared/util/global.utils';
@@ -8,17 +8,21 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { faBan, faSave, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { FormArray, FormBuilder, FormControl, FormGroup } from '@angular/forms';
 import { ButtonType } from 'app/shared/components/button.component';
-import { finalize } from 'rxjs/operators';
 import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model';
 import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Observable, firstValueFrom, map } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { TranslateService } from '@ngx-translate/core';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
+import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
+import { IrisStageDTO, IrisStageStateDTO } from 'app/entities/iris/iris-stage-dto.model';
 import { CourseCompetencyService } from 'app/course/competencies/course-competency.service';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module';
+import { CourseManagementService } from 'app/course/manage/course-management.service';
+import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component';
 
 export type CompetencyFormControlsWithViewed = {
     competency: FormGroup<CompetencyFormControls>;
@@ -31,6 +35,17 @@ export type CompetencyFormControls = {
     taxonomy: FormControl<CompetencyTaxonomy | undefined>;
 };
 
+export type CompetencyRecommendation = {
+    title?: string;
+    description?: string;
+    taxonomy?: CompetencyTaxonomy;
+};
+
+type CompetencyGenerationStatusUpdate = {
+    stages: IrisStageDTO[];
+    result?: CompetencyRecommendation[];
+};
+
 @Component({
     selector: 'jhi-generate-competencies',
     templateUrl: './generate-competencies.component.html',
@@ -38,6 +53,8 @@ export type CompetencyFormControls = {
     imports: [ArtemisSharedCommonModule, ArtemisSharedComponentModule, ArtemisCompetenciesModule],
 })
 export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeactivate {
+    @ViewChild(CourseDescriptionFormComponent) courseDescriptionForm: CourseDescriptionFormComponent;
+
     courseId: number;
     isLoading = false;
     submitted: boolean = false;
@@ -53,6 +70,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti
     readonly documentationType: DocumentationType = 'GenerateCompetencies';
 
     constructor(
+        private courseManagementService: CourseManagementService,
         private courseCompetencyService: CourseCompetencyService,
         private competencyService: CompetencyService,
         private alertService: AlertService,
@@ -62,11 +80,15 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti
         private modalService: NgbModal,
         private artemisTranslatePipe: ArtemisTranslatePipe,
         private translateService: TranslateService,
+        private jhiWebsocketService: JhiWebsocketService,
     ) {}
 
     ngOnInit(): void {
         this.activatedRoute.params.subscribe((params) => {
             this.courseId = Number(params['courseId']);
+            firstValueFrom(this.courseManagementService.find(this.courseId))
+                .then((course) => this.courseDescriptionForm.setCourseDescription(course.body?.description ?? ''))
+                .catch((res: HttpErrorResponse) => onError(this.alertService, res));
         });
     }
 
@@ -76,24 +98,61 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti
      */
     getCompetencyRecommendations(courseDescription: string) {
         this.isLoading = true;
-        this.courseCompetencyService
-            .generateCompetenciesFromCourseDescription(courseDescription, this.courseId)
-            .pipe(
-                finalize(() => {
+        this.getCurrentCompetencies().subscribe((currentCompetencies) => {
+            this.courseCompetencyService.generateCompetenciesFromCourseDescription(this.courseId, courseDescription, currentCompetencies).subscribe({
+                next: () => {
+                    const websocketTopic = `/user/topic/iris/competencies/${this.courseId}`;
+                    this.jhiWebsocketService.subscribe(websocketTopic);
+                    this.jhiWebsocketService.receive(websocketTopic).subscribe({
+                        next: (update: CompetencyGenerationStatusUpdate) => {
+                            if (update.result) {
+                                for (const competency of update.result) {
+                                    this.addCompetencyToForm(competency);
+                                }
+                            }
+                            if (update.stages.every((stage) => stage.state === IrisStageStateDTO.DONE)) {
+                                this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: update.result?.length });
+                            } else if (update.stages.some((stage) => stage.state === IrisStageStateDTO.ERROR)) {
+                                this.alertService.warning('artemisApp.competency.generate.courseDescription.warning');
+                            }
+                            if (update.stages.every((stage) => stage.state !== IrisStageStateDTO.NOT_STARTED && stage.state !== IrisStageStateDTO.IN_PROGRESS)) {
+                                this.jhiWebsocketService.unsubscribe(websocketTopic);
+                                this.isLoading = false;
+                            }
+                        },
+                        error: (res: HttpErrorResponse) => {
+                            onError(this.alertService, res);
+                            this.jhiWebsocketService.unsubscribe(websocketTopic);
+                            this.isLoading = false;
+                        },
+                    });
+                },
+                error: (res: HttpErrorResponse) => {
+                    onError(this.alertService, res);
                     this.isLoading = false;
-                }),
-            )
-            .subscribe({
-                next: (res) => {
-                    if (res.body?.length && res.body.length > 0) {
-                        this.alertService.success('artemisApp.competency.generate.courseDescription.success', { noOfCompetencies: res.body.length });
-                        res.body?.forEach((competency) => this.addCompetencyToForm(competency));
-                    } else {
-                        this.alertService.warning('artemisApp.competency.generate.courseDescription.warning');
-                    }
                 },
-                error: (res: HttpErrorResponse) => onError(this.alertService, res),
             });
+        });
+    }
+
+    /**
+     * Returns the title, description, and taxonomy of all current competencies saved in this course,
+     * and the competency recommendations that are currently in the form.
+     * @private
+     */
+    private getCurrentCompetencies(): Observable<CompetencyRecommendation[]> {
+        const currentCompetencySuggestions = this.competencies.getRawValue().map((c) => c.competency);
+        const courseCompetenciesObservable = this.courseCompetencyService.getAllForCourse(this.courseId);
+        if (courseCompetenciesObservable) {
+            return courseCompetenciesObservable.pipe(
+                map((competencies) => competencies.body?.map((c) => ({ title: c.title, description: c.description, taxonomy: c.taxonomy }))),
+                map((competencies) => currentCompetencySuggestions.concat(competencies ?? [])),
+            );
+        }
+        return new Observable<CompetencyRecommendation[]>((subscriber) => {
+            subscriber.next(currentCompetencySuggestions);
+            subscriber.complete();
+        });
     }
 
     /**
@@ -101,7 +160,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti
      * @param competency
      * @private
      */
-    private addCompetencyToForm(competency: Competency) {
+    private addCompetencyToForm(competency: CompetencyRecommendation) {
         const formGroup: FormGroup<CompetencyFormControlsWithViewed> = this.formBuilder.nonNullable.group({
             competency: this.formBuilder.nonNullable.group({
                 title: [competency.title],
@@ -150,7 +209,7 @@ export class GenerateCompetenciesComponent implements OnInit, ComponentCanDeacti
      * Saves the competency recommendations as competencies and navigates back
      */
     save() {
-        const competenciesToSave = this.competencies.getRawValue().map((c) => c.competency as Competency);
+        const competenciesToSave = this.competencies.getRawValue().map((c) => Object.assign(new Competency(), c.competency));
         this.competencyService.createBulk(competenciesToSave, this.courseId).subscribe({
             next: () => {
                 this.submitted = true;
diff --git a/src/main/webapp/app/course/competencies/import/competency-search.component.html b/src/main/webapp/app/course/competencies/import/competency-search.component.html
index 345bc3c02558..2a58720983cf 100644
--- a/src/main/webapp/app/course/competencies/import/competency-search.component.html
+++ b/src/main/webapp/app/course/competencies/import/competency-search.component.html
@@ -1,32 +1,24 @@
 <div class="card">
     <div class="card-header">
-        <h5 class="mb-0">{{ 'artemisApp.competency.import.search.title' | artemisTranslate }}</h5>
+        <h5 class="mb-0" jhiTranslate="artemisApp.competency.import.search.title"></h5>
     </div>
     <div class="card-body pb-1">
         <div class="form-group">
-            <label for="competency-title-input">
-                {{ 'artemisApp.competency.import.search.labelCompetencyTitle' | artemisTranslate }}
-            </label>
+            <label for="competency-title-input" jhiTranslate="artemisApp.competency.import.search.labelCompetencyTitle"></label>
             <input id="competency-title-input" class="form-control" [(ngModel)]="search.title" (keydown.enter)="performSearch()" />
         </div>
         <div [ngbCollapse]="!advancedSearchEnabled">
             <div class="form-group">
-                <label for="competency-description-input">
-                    {{ 'artemisApp.competency.import.search.labelCompetencyDescription' | artemisTranslate }}
-                </label>
+                <label for="competency-description-input" jhiTranslate="artemisApp.competency.import.search.labelCompetencyDescription"></label>
                 <textarea id="competency-description-input" rows="3" class="form-control" [(ngModel)]="search.description" (keydown.enter)="performSearch()"></textarea>
             </div>
             <div class="row">
                 <div class="form-group col">
-                    <label for="course-title-input">
-                        {{ 'artemisApp.competency.import.search.labelCourseTitle' | artemisTranslate }}
-                    </label>
+                    <label for="course-title-input" jhiTranslate="artemisApp.competency.import.search.labelCourseTitle"></label>
                     <input id="course-title-input" class="form-control" [(ngModel)]="search.courseTitle" (keydown.enter)="performSearch()" />
                 </div>
                 <div class="form-group col">
-                    <label for="course-semester-select">
-                        {{ 'artemisApp.competency.import.search.labelCourseSemester' | artemisTranslate }}
-                    </label>
+                    <label for="course-semester-select" jhiTranslate="artemisApp.competency.import.search.labelCourseSemester"></label>
                     <select id="course-semester-select" class="form-select" [(ngModel)]="search.semester" (keydown.enter)="performSearch()">
                         @for (semester of semesters; track semester) {
                             <option [value]="semester">{{ semester }}</option>
@@ -42,9 +34,9 @@ <h5 class="mb-0">{{ 'artemisApp.competency.import.search.title' | artemisTransla
         <div class="d-flex flex-row justify-content-center">
             <div id="toggleAdvancedSearch" class="clickable" (click)="toggleAdvancedSearch()">
                 <fa-icon [icon]="advancedSearchEnabled ? faChevronUp : faChevronDown" />
-                <span>{{
-                    (advancedSearchEnabled ? 'artemisApp.competency.import.search.hideAdvancedSearch' : 'artemisApp.competency.import.search.showAdvancedSearch') | artemisTranslate
-                }}</span>
+                <span
+                    jhiTranslate="{{ advancedSearchEnabled ? 'artemisApp.competency.import.search.hideAdvancedSearch' : 'artemisApp.competency.import.search.showAdvancedSearch' }}"
+                ></span>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/app/course/course-scores/course-scores.component.html b/src/main/webapp/app/course/course-scores/course-scores.component.html
index 67f3e94610e7..21e3186ea908 100644
--- a/src/main/webapp/app/course/course-scores/course-scores.component.html
+++ b/src/main/webapp/app/course/course-scores/course-scores.component.html
@@ -149,13 +149,11 @@ <h4 jhiTranslate="artemisApp.instructorDashboard.courseScoreChart.scoreDistribut
                             <th jhiSortBy="overallPoints"><span jhiTranslate="artemisApp.instructorDashboard.overallScore"></span> <fa-icon [icon]="faSort" /></th>
                             @if (gradingScaleExists) {
                                 <th jhiSortBy="overallPoints">
-                                    <span>
-                                        {{
-                                            isBonus
-                                                ? ('artemisApp.courseScoreCalculation.gradingSystemBonus' | artemisTranslate)
-                                                : ('artemisApp.courseScoreCalculation.gradingSystemGrade' | artemisTranslate)
-                                        }}
-                                    </span>
+                                    <span
+                                        jhiTranslate="{{
+                                            isBonus ? 'artemisApp.courseScoreCalculation.gradingSystemBonus' : 'artemisApp.courseScoreCalculation.gradingSystemGrade'
+                                        }}"
+                                    ></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
index aa56233500bd..a91807bd95a9 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard-information.component.html
@@ -32,16 +32,14 @@
             @if (!isExamMode) {
                 <div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.assessments' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.assessments"></div>
                         <div class="col-5">
                             {{ totalNumberOfAssessments.total }} / {{ numberOfSubmissions.total }} ({{ totalAssessmentPercentage }}%) | {{ numberOfTutorAssessments }}
                         </div>
                     </div>
                     @if (complaintsEnabled) {
                         <div class="row g-0 mb-1">
-                            <div class="col-7">{{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}</div>
+                            <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.complaints"></div>
                             <div class="col-5">
                                 @if (course?.isAtLeastInstructor) {
                                     <div>
@@ -67,9 +65,7 @@
                     }
                     @if (feedbackRequestEnabled) {
                         <div class="row g-0 mb-1">
-                            <div class="col-7">
-                                {{ 'artemisApp.assessmentDashboard.moreFeedbackRequests' | artemisTranslate }}
-                            </div>
+                            <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.moreFeedbackRequests"></div>
                             <div class="col-5">
                                 @if (course?.isAtLeastInstructor) {
                                     <div>
@@ -96,9 +92,7 @@
                         </div>
                     }
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.assessmentLocks' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.assessmentLocks"></div>
                         <div class="col-5">
                             {{ assessmentLocks.tutor }} |
                             <a [routerLink]="assessmentLocksLink" [queryParams]="{ tutorId: tutorId }">
@@ -107,7 +101,7 @@
                         </div>
                     </div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">{{ 'artemisApp.exerciseAssessmentDashboard.ratings' | artemisTranslate }}</div>
+                        <div class="col-7" jhiTranslate="artemisApp.exerciseAssessmentDashboard.ratings"></div>
                         <div class="col-5">
                             @if (course?.isAtLeastInstructor) {
                                 <a [routerLink]="ratingsLink"> {{ ratings.total }} </a>
@@ -124,18 +118,14 @@
             @if (isExamMode) {
                 <div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.assessments' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.assessments"></div>
                         <div class="col-5">
                             ({{ totalNumberOfAssessments.total }} / {{ numberOfSubmissions.total * numberOfCorrectionRounds }}) ({{ totalAssessmentPercentage }}%) |
                             {{ numberOfTutorAssessments }}
                         </div>
                     </div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.complaints"></div>
                         <div class="col-5">
                             @if (course?.isAtLeastInstructor) {
                                 <div>
@@ -153,9 +143,7 @@
                         </div>
                     </div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.assessmentLocks' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.assessmentLocks"></div>
                         <div class="col-5">
                             {{ assessmentLocks.total }}
                             |
@@ -165,9 +153,7 @@
                         </div>
                     </div>
                     <div class="row g-0 mb-1">
-                        <div class="col-7">
-                            {{ 'artemisApp.assessmentDashboard.totalAssessmentsForCorrectionrounds' | artemisTranslate }}
-                        </div>
+                        <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.totalAssessmentsForCorrectionrounds"></div>
                         <div class="col-5">
                             {{ numberOfAssessmentsOfCorrectionRounds[0].inTime }}
                             @if (numberOfAssessmentsOfCorrectionRounds[1]) {
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
index 6319c7dda35a..6d95da823bb4 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.html
@@ -96,9 +96,7 @@ <h4 jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.title"></h4>
                             [ngModel]="hideFinishedExercises"
                             (ngModelChange)="triggerFinishedExercises()"
                         />
-                        <label class="form-check-label" for="field_hideFinishedExercise">
-                            {{ 'artemisApp.assessmentDashboard.hideFinishedExercises' | artemisTranslate }}
-                        </label>
+                        <label class="form-check-label" for="field_hideFinishedExercise" jhiTranslate="artemisApp.assessmentDashboard.hideFinishedExercises"></label>
                     </div>
                     <div class="form-check form-check-inline">
                         <input
@@ -109,9 +107,7 @@ <h4 jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.title"></h4>
                             [ngModel]="hideOptional"
                             (ngModelChange)="triggerOptionalExercises()"
                         />
-                        <label class="form-check-label" for="field_hideOptional">
-                            {{ 'artemisApp.assessmentDashboard.hideOptional' | artemisTranslate }}
-                        </label>
+                        <label class="form-check-label" for="field_hideOptional" jhiTranslate="artemisApp.assessmentDashboard.hideOptional"></label>
                     </div>
                 </div>
             }
@@ -120,33 +116,33 @@ <h4 jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.title"></h4>
                     <thead>
                         <tr jhiSort [(predicate)]="exercisesSortingPredicate" [(ascending)]="exercisesReverseOrder" (sortChange)="sortRows()">
                             <th jhiSortBy="type">
-                                <a class="th-link">{{ 'artemisApp.assessmentDashboard.exerciseType' | artemisTranslate }}</a>
+                                <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.exerciseType"></a>
                                 <fa-icon [icon]="faSort" />
                             </th>
                             <th jhiSortBy="title">
-                                <a class="th-link">{{ 'artemisApp.assessmentDashboard.exercise' | artemisTranslate }}</a>
+                                <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.exercise"></a>
                                 <fa-icon [icon]="faSort" />
                             </th>
                             @if (!isTestRun) {
-                                <th>{{ 'artemisApp.assessmentDashboard.yourStatus' | artemisTranslate }}</th>
+                                <th jhiTranslate="artemisApp.assessmentDashboard.yourStatus"></th>
                             }
                             <th jhiSortBy="averageRating">
-                                <a class="th-link">{{ 'artemisApp.assessmentDashboard.exerciseAverageRating' | artemisTranslate }}</a>
+                                <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.exerciseAverageRating"></a>
                                 <fa-icon [icon]="faSort" />
                             </th>
                             @if (!isExamMode) {
                                 <th jhiSortBy="dueDate">
-                                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.exerciseDueDate' | artemisTranslate }}</a>
+                                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.exerciseDueDate"></a>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
                             @if (!isExamMode) {
                                 <th jhiSortBy="assessmentDueDate">
-                                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.assessmentsDueDate' | artemisTranslate }}</a>
+                                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.assessmentsDueDate"></a>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
-                            <th>{{ 'artemisApp.assessmentDashboard.actions' | artemisTranslate }}</th>
+                            <th jhiTranslate="artemisApp.assessmentDashboard.actions"></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -241,7 +237,7 @@ <h4 jhiTranslate="artemisApp.assessmentDashboard.exerciseTable.title"></h4>
         </div>
         @if (course && course.isAtLeastInstructor && tutorIssues.length > 0) {
             <div class="container-fluid mt-4">
-                <h4>{{ 'artemisApp.assessmentDashboard.tutorPerformanceIssues.title' | artemisTranslate }}</h4>
+                <h4 jhiTranslate="artemisApp.assessmentDashboard.tutorPerformanceIssues.title"></h4>
                 @for (issue of tutorIssues; track issue) {
                     <ul>
                         @if (issue.averageTutorValue < issue.allowedRange.lowerBound) {
@@ -278,10 +274,10 @@ <h4>{{ 'artemisApp.assessmentDashboard.tutorPerformanceIssues.title' | artemisTr
         }
         <div class="container-fluid pt-4">
             @if (!isExamMode) {
-                <h4>{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.courseTitle' | artemisTranslate }}</h4>
+                <h4 jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.courseTitle"></h4>
             }
             @if (isExamMode) {
-                <h4>{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.examTitle' | artemisTranslate }}</h4>
+                <h4 jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.examTitle"></h4>
             }
             <jhi-tutor-leaderboard [exam]="exam" [tutorsData]="stats.tutorLeaderboardEntries" [course]="course" />
         </div>
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts
index 1f813c75104c..a39b6af80e77 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/assessment-dashboard.component.ts
@@ -13,7 +13,7 @@ import { Course } from 'app/entities/course.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import { FilterProp as TeamFilterProp } from 'app/exercises/shared/team/teams.component';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html
index 988ad7835bce..1bae6b366f55 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.html
@@ -3,7 +3,7 @@
         <span>
             <a [routerLink]="['/course-management', courseId, 'exams', examId, 'grading-system']" class="btn btn-info mt-1" id="grading-key-button-{{ exam.id }}">
                 <fa-icon [icon]="faClipboard" />
-                <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.gradingSystem' | artemisTranslate }}</span>
+                <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.gradingSystem"></span>
             </a>
         </span>
         <button
diff --git a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts
index 704c19d37fdc..7bc20e00e55c 100644
--- a/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts
+++ b/src/main/webapp/app/course/dashboards/assessment-dashboard/exam-assessment-buttons/exam-assessment-buttons.component.ts
@@ -9,7 +9,7 @@ import { Course } from 'app/entities/course.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { AccountService } from 'app/core/auth/account.service';
 import { onError } from 'app/shared/util/global.utils';
diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html
index 10feb00946b8..afe1b2e3e29b 100644
--- a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html
+++ b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.html
@@ -1,4 +1,4 @@
-@if (isLectureUnitLoading()) {
+@if (isLoading()) {
     <div class="row justify-content-center m-4">
         <div class="spinner-border text-primary" role="status">
             <span class="sr-only" jhiTranslate="loading"></span>
@@ -6,21 +6,30 @@
     </div>
 }
 @if (lectureUnit(); as lectureUnit) {
-    @switch (lectureUnit.type) {
-        @case (LectureUnitType.VIDEO) {
-            <jhi-video-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
-        }
-        @case (LectureUnitType.TEXT) {
-            <jhi-text-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
-        }
-        @case (LectureUnitType.ATTACHMENT) {
-            <jhi-attachment-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
-        }
-        @case (LectureUnitType.EXERCISE) {
-            <jhi-exercise-unit [exerciseUnit]="lectureUnit" />
-        }
-        @case (LectureUnitType.ONLINE) {
-            <jhi-online-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
+    <div class="row m-0">
+        <div class="col p-0">
+            @switch (lectureUnit.type) {
+                @case (LectureUnitType.VIDEO) {
+                    <jhi-video-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
+                }
+                @case (LectureUnitType.TEXT) {
+                    <jhi-text-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
+                }
+                @case (LectureUnitType.ATTACHMENT) {
+                    <jhi-attachment-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
+                }
+                @case (LectureUnitType.EXERCISE) {
+                    <jhi-exercise-unit [exerciseUnit]="lectureUnit" />
+                }
+                @case (LectureUnitType.ONLINE) {
+                    <jhi-online-unit [lectureUnit]="lectureUnit" (onCompletion)="setLearningObjectCompletion($event)" />
+                }
+            }
+        </div>
+        @if (isCommunicationEnabled()) {
+            <div class="col-md-auto p-0 ms-2">
+                <jhi-discussion-section [lecture]="this.lecture()" />
+            </div>
         }
-    }
+    </div>
 }
diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts
index a7cd72938c93..77f4cf3dd262 100644
--- a/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts
+++ b/src/main/webapp/app/course/learning-paths/components/learning-path-lecture-unit/learning-path-lecture-unit.component.ts
@@ -1,53 +1,60 @@
-import { Component, InputSignal, Signal, WritableSignal, inject, input, signal } from '@angular/core';
+import { Component, computed, effect, inject, input, signal } from '@angular/core';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 import { ArtemisLectureUnitsModule } from 'app/overview/course-lectures/lecture-units.module';
 import { LectureUnitCompletionEvent } from 'app/overview/course-lectures/course-lecture-details.component';
 import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service';
-import { Observable, lastValueFrom, switchMap } from 'rxjs';
-import { toObservable, toSignal } from '@angular/core/rxjs-interop';
+import { lastValueFrom } from 'rxjs';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { VideoUnitComponent } from 'app/overview/course-lectures/video-unit/video-unit.component';
 import { TextUnitComponent } from 'app/overview/course-lectures/text-unit/text-unit.component';
 import { AttachmentUnitComponent } from 'app/overview/course-lectures/attachment-unit/attachment-unit.component';
 import { OnlineUnitComponent } from 'app/overview/course-lectures/online-unit/online-unit.component';
+import { isCommunicationEnabled } from 'app/entities/course.model';
+import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 
 @Component({
     selector: 'jhi-learning-path-lecture-unit',
     standalone: true,
-    imports: [ArtemisLectureUnitsModule, ArtemisSharedModule, VideoUnitComponent, TextUnitComponent, AttachmentUnitComponent, OnlineUnitComponent],
+    imports: [ArtemisLectureUnitsModule, ArtemisSharedModule, VideoUnitComponent, TextUnitComponent, AttachmentUnitComponent, OnlineUnitComponent, DiscussionSectionComponent],
     templateUrl: './learning-path-lecture-unit.component.html',
 })
 export class LearningPathLectureUnitComponent {
     protected readonly LectureUnitType = LectureUnitType;
 
-    private readonly lectureUnitService: LectureUnitService = inject(LectureUnitService);
+    private readonly lectureUnitService = inject(LectureUnitService);
     private readonly learningPathNavigationService = inject(LearningPathNavigationService);
-    private readonly alertService: AlertService = inject(AlertService);
+    private readonly alertService = inject(AlertService);
 
-    readonly lectureUnitId: InputSignal<number> = input.required<number>();
-    readonly isLectureUnitLoading: WritableSignal<boolean> = signal(false);
-    private readonly lectureUnit$: Observable<LectureUnit | undefined> = toObservable(this.lectureUnitId).pipe(switchMap((lectureUnitId) => this.getLectureUnit(lectureUnitId)));
-    readonly lectureUnit: Signal<LectureUnit | undefined> = toSignal(this.lectureUnit$);
+    readonly lectureUnitId = input.required<number>();
+    readonly isLoading = signal<boolean>(false);
+    readonly lectureUnit = signal<LectureUnit | undefined>(undefined);
 
-    async getLectureUnit(lectureUnitId: number): Promise<LectureUnit | undefined> {
+    readonly lecture = computed(() => this.lectureUnit()?.lecture);
+
+    readonly isCommunicationEnabled = computed(() => isCommunicationEnabled(this.lecture()?.course));
+
+    constructor() {
+        effect(() => this.loadLectureUnit(this.lectureUnitId()), { allowSignalWrites: true });
+    }
+
+    async loadLectureUnit(lectureUnitId: number): Promise<void> {
         try {
-            this.isLectureUnitLoading.set(true);
-            return await lastValueFrom(this.lectureUnitService.getLectureUnitById(lectureUnitId));
+            this.isLoading.set(true);
+            const lectureUnit = await lastValueFrom(this.lectureUnitService.getLectureUnitById(lectureUnitId));
+            this.lectureUnit.set(lectureUnit);
         } catch (error) {
             this.alertService.error(error);
         } finally {
-            this.isLectureUnitLoading.set(false);
+            this.isLoading.set(false);
         }
     }
 
     setLearningObjectCompletion(completionEvent: LectureUnitCompletionEvent): void {
-        try {
-            this.lectureUnitService.completeLectureUnit(this.lectureUnit()!.lecture!, completionEvent);
+        this.lectureUnitService.completeLectureUnit(this.lectureUnit()!.lecture!, completionEvent);
+        if (this.lectureUnit()?.completed === completionEvent.completed) {
             this.learningPathNavigationService.setCurrentLearningObjectCompletion(completionEvent.completed);
-        } catch (error) {
-            this.alertService.error(error);
         }
     }
 }
diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts
index 15589bdb24bc..97609dd46c27 100644
--- a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts
+++ b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component.ts
@@ -1,4 +1,4 @@
-import { Component, InputSignal, OnInit, OutputEmitterRef, Signal, WritableSignal, computed, inject, input, output, signal } from '@angular/core';
+import { Component, InputSignal, OutputEmitterRef, Signal, WritableSignal, computed, effect, inject, input, output, signal, untracked } from '@angular/core';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { AlertService } from 'app/core/util/alert.service';
 import { LearningPathApiService } from 'app/course/learning-paths/services/learning-path-api.service';
@@ -15,7 +15,7 @@ import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
     templateUrl: './learning-path-nav-overview-learning-objects.component.html',
     styleUrl: './learning-path-nav-overview-learning-objects.component.scss',
 })
-export class LearningPathNavOverviewLearningObjectsComponent implements OnInit {
+export class LearningPathNavOverviewLearningObjectsComponent {
     protected readonly faCheckCircle: IconDefinition = faCheckCircle;
     protected readonly faLock: IconDefinition = faLock;
 
@@ -38,8 +38,13 @@ export class LearningPathNavOverviewLearningObjectsComponent implements OnInit {
 
     readonly onLearningObjectSelected: OutputEmitterRef<void> = output();
 
-    ngOnInit(): void {
-        this.loadLearningObjects();
+    constructor() {
+        effect(
+            () => {
+                untracked(async () => await this.loadLearningObjects());
+            },
+            { allowSignalWrites: true },
+        );
     }
 
     async loadLearningObjects(): Promise<void> {
@@ -57,9 +62,9 @@ export class LearningPathNavOverviewLearningObjectsComponent implements OnInit {
         }
     }
 
-    selectLearningObject(learningObject: LearningPathNavigationObjectDTO): void {
+    async selectLearningObject(learningObject: LearningPathNavigationObjectDTO): Promise<void> {
         if (!learningObject.unreleased) {
-            this.learningPathNavigationService.loadRelativeLearningPathNavigation(this.learningPathId(), learningObject);
+            await this.learningPathNavigationService.loadRelativeLearningPathNavigation(this.learningPathId(), learningObject);
             this.onLearningObjectSelected.emit();
         }
     }
diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts
index 669bde84d5b3..a63830f98bc7 100644
--- a/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts
+++ b/src/main/webapp/app/course/learning-paths/components/learning-path-nav-overview/learning-path-nav-overview.component.ts
@@ -1,4 +1,4 @@
-import { Component, InputSignal, OutputEmitterRef, Signal, WritableSignal, computed, inject, input, output, signal, viewChild } from '@angular/core';
+import { Component, InputSignal, OutputEmitterRef, Signal, WritableSignal, computed, effect, inject, input, output, signal, viewChild } from '@angular/core';
 import { NgbAccordionDirective, NgbAccordionModule, NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@@ -10,8 +10,6 @@ import { LearningPathApiService } from 'app/course/learning-paths/services/learn
 import { CompetencyGraphModalComponent } from 'app/course/learning-paths/components/competency-graph-modal/competency-graph-modal.component';
 import { LearningPathNavOverviewLearningObjectsComponent } from 'app/course/learning-paths/components/learning-path-nav-overview-learning-objects/learning-path-nav-overview-learning-objects.component';
 import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service';
-import { toObservable, toSignal } from '@angular/core/rxjs-interop';
-import { Observable, switchMap } from 'rxjs';
 
 @Component({
     selector: 'jhi-learning-path-nav-overview',
@@ -34,25 +32,26 @@ export class LearningPathNavOverviewComponent {
 
     readonly onLearningObjectSelected: OutputEmitterRef<void> = output();
     readonly isLoading: WritableSignal<boolean> = signal(false);
-    private readonly competencies$: Observable<LearningPathCompetencyDTO[]> = toObservable(this.learningPathId).pipe(
-        switchMap((learningPathId) => this.loadCompetencies(learningPathId)),
-    );
-    readonly competencies: Signal<LearningPathCompetencyDTO[] | undefined> = toSignal(this.competencies$);
+    readonly competencies = signal<LearningPathCompetencyDTO[]>([]);
 
     // competency id of currently selected learning object
     readonly currentCompetencyId: Signal<number | undefined> = computed(() => this.learningPathNavigationService.currentLearningObject()?.competencyId);
     // current competency of learning path (not the one of the selected learning object)
     readonly currentCompetencyOnPath: Signal<LearningPathCompetencyDTO | undefined> = computed(() => this.competencies()?.find((competency) => competency.masteryProgress < 1));
 
-    async loadCompetencies(learningPathId: number): Promise<LearningPathCompetencyDTO[]> {
+    constructor() {
+        effect(async () => await this.loadCompetencies(this.learningPathId()), { allowSignalWrites: true });
+    }
+
+    async loadCompetencies(learningPathId: number): Promise<void> {
         try {
             this.isLoading.set(true);
             const competencies = await this.learningPathApiService.getLearningPathCompetencies(learningPathId);
-            this.isLoading.set(false);
-            return competencies;
+            this.competencies.set(competencies);
         } catch (error) {
             this.alertService.error(error);
-            return [];
+        } finally {
+            this.isLoading.set(false);
         }
     }
 
diff --git a/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts b/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts
index 906cf5148089..90eb7bb2b43e 100644
--- a/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts
+++ b/src/main/webapp/app/course/learning-paths/components/learning-path-student-nav/learning-path-student-nav.component.ts
@@ -1,4 +1,4 @@
-import { Component, InputSignal, OnInit, Signal, WritableSignal, computed, inject, input, signal } from '@angular/core';
+import { Component, InputSignal, Signal, WritableSignal, computed, effect, inject, input, signal } from '@angular/core';
 import { LearningPathNavigationObjectDTO } from 'app/entities/competency/learning-path.model';
 import { CommonModule } from '@angular/common';
 import { NgbAccordionModule, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
@@ -15,7 +15,7 @@ import { LearningPathNavigationService } from 'app/course/learning-paths/service
     templateUrl: './learning-path-student-nav.component.html',
     styleUrl: './learning-path-student-nav.component.scss',
 })
-export class LearningPathNavComponent implements OnInit {
+export class LearningPathNavComponent {
     protected readonly faChevronDown: IconDefinition = faChevronDown;
     protected readonly faCheckCircle: IconDefinition = faCheckCircle;
     protected readonly faFlag: IconDefinition = faFlag;
@@ -37,12 +37,12 @@ export class LearningPathNavComponent implements OnInit {
 
     readonly isDropdownOpen: WritableSignal<boolean> = signal(false);
 
-    ngOnInit(): void {
-        this.learningPathNavigationService.loadLearningPathNavigation(this.learningPathId());
+    constructor() {
+        effect(async () => await this.learningPathNavigationService.loadLearningPathNavigation(this.learningPathId()), { allowSignalWrites: true });
     }
 
-    selectLearningObject(selectedLearningObject: LearningPathNavigationObjectDTO): void {
-        this.learningPathNavigationService.loadRelativeLearningPathNavigation(this.learningPathId(), selectedLearningObject);
+    async selectLearningObject(selectedLearningObject: LearningPathNavigationObjectDTO): Promise<void> {
+        await this.learningPathNavigationService.loadRelativeLearningPathNavigation(this.learningPathId(), selectedLearningObject);
     }
 
     completeLearningPath(): void {
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-legend.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-legend.component.html
index 4252873fa014..15702855fa6a 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-legend.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-legend.component.html
@@ -3,9 +3,7 @@
         <div id="competency-end" class="row" ngbTooltip="{{ 'artemisApp.learningPath.graph.legend.competencyEnd.tooltip' | artemisTranslate }}">
             <div class="col-auto"><fa-icon class="legend-icon" [icon]="getIcon(competencyEnd)" /></div>
             <div class="col-auto">
-                <span>
-                    {{ 'artemisApp.learningPath.graph.legend.competencyEnd.title' | artemisTranslate }}
-                </span>
+                <span jhiTranslate="artemisApp.learningPath.graph.legend.competencyEnd.title"></span>
             </div>
         </div>
     }
@@ -13,9 +11,7 @@
         <div id="match-start" class="row" ngbTooltip="{{ 'artemisApp.learningPath.graph.legend.matchStart.tooltip' | artemisTranslate }}">
             <div class="col-auto"><fa-icon class="legend-icon" [icon]="getIcon(matchStart)" /></div>
             <div class="col-auto">
-                <span>
-                    {{ 'artemisApp.learningPath.graph.legend.matchStart.title' | artemisTranslate }}
-                </span>
+                <span jhiTranslate="artemisApp.learningPath.graph.legend.matchStart.title"></span>
             </div>
         </div>
     }
@@ -23,9 +19,7 @@
         <div id="match-end" class="row" ngbTooltip="{{ 'artemisApp.learningPath.graph.legend.matchEnd.tooltip' | artemisTranslate }}">
             <div class="col-auto"><fa-icon class="legend-icon" [icon]="getIcon(matchEnd)" /></div>
             <div class="col-auto">
-                <span>
-                    {{ 'artemisApp.learningPath.graph.legend.matchEnd.title' | artemisTranslate }}
-                </span>
+                <span jhiTranslate="artemisApp.learningPath.graph.legend.matchEnd.title"></span>
             </div>
         </div>
     }
@@ -33,9 +27,7 @@
         <div id="learning-object" class="row" ngbTooltip="{{ 'artemisApp.learningPath.graph.legend.learningObject.tooltip' | artemisTranslate }}">
             <div class="col-auto"><fa-icon class="legend-icon" [icon]="getIcon(learningObject)" /></div>
             <div class="col-auto">
-                <span>
-                    {{ 'artemisApp.learningPath.graph.legend.learningObject.title' | artemisTranslate }}
-                </span>
+                <span jhiTranslate="artemisApp.learningPath.graph.legend.learningObject.title"></span>
             </div>
         </div>
     }
@@ -43,9 +35,7 @@
         <div id="completed-learning-object" class="row" ngbTooltip="{{ 'artemisApp.learningPath.graph.legend.completedLearningObject.tooltip' | artemisTranslate }}">
             <div class="col-auto"><fa-icon class="legend-icon" [icon]="getIcon(completedLearningObject)" /></div>
             <div class="col-auto">
-                <span>
-                    {{ 'artemisApp.learningPath.graph.legend.completedLearningObject.title' | artemisTranslate }}
-                </span>
+                <span jhiTranslate="artemisApp.learningPath.graph.legend.completedLearningObject.title"></span>
             </div>
         </div>
     }
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
index 396b2735560b..864bcc2920b0 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 } @else {
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
index 061c611f6b93..c8a10304da15 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 }
diff --git a/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts b/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts
index 18d74923ab92..7df486af265c 100644
--- a/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts
+++ b/src/main/webapp/app/course/learning-paths/pages/learning-path-student-page/learning-path-student-page.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, Signal, inject, signal } from '@angular/core';
+import { Component, effect, inject, signal } from '@angular/core';
 import { LearningObjectType } from 'app/entities/competency/learning-path.model';
 import { map } from 'rxjs';
 import { toSignal } from '@angular/core/rxjs-interop';
@@ -29,7 +29,7 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
         ArtemisSharedModule,
     ],
 })
-export class LearningPathStudentPageComponent implements OnInit {
+export class LearningPathStudentPageComponent {
     protected readonly LearningObjectType = LearningObjectType;
 
     private readonly learningApiService: LearningPathApiService = inject(LearningPathApiService);
@@ -39,12 +39,12 @@ export class LearningPathStudentPageComponent implements OnInit {
 
     readonly isLearningPathIdLoading = signal(false);
     readonly learningPathId = signal<number | undefined>(undefined);
-    readonly courseId: Signal<number> = toSignal(this.activatedRoute.parent!.parent!.params.pipe(map((params) => params.courseId)));
+    readonly courseId = toSignal(this.activatedRoute.parent!.parent!.params.pipe(map((params) => Number(params.courseId))), { requireSync: true });
     readonly currentLearningObject = this.learningPathNavigationService.currentLearningObject;
     readonly isLearningPathNavigationLoading = this.learningPathNavigationService.isLoading;
 
-    ngOnInit(): void {
-        this.loadLearningPathId(this.courseId());
+    constructor() {
+        effect(async () => await this.loadLearningPathId(this.courseId()), { allowSignalWrites: true });
     }
 
     private async loadLearningPathId(courseId: number): Promise<void> {
diff --git a/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component.ts b/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component.ts
index 1aa64c85f315..7d96b1de44ea 100644
--- a/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component.ts
+++ b/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component.ts
@@ -38,8 +38,5 @@ export class LearningPathLectureUnitViewComponent {
      */
     onChildActivate(instance: DiscussionSectionComponent) {
         this.discussionComponent = instance; // save the reference to the component instance
-        if (this.lecture) {
-            instance.lecture = this.lecture;
-        }
     }
 }
diff --git a/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.module.ts b/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.module.ts
index d4c29200f2d0..090649b6990f 100644
--- a/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.module.ts
+++ b/src/main/webapp/app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.module.ts
@@ -19,13 +19,6 @@ const routes: Routes = [
             pageTitle: 'overview.learningPath',
         },
         canActivate: [UserRouteAccessService],
-        children: [
-            {
-                path: '',
-                pathMatch: 'full',
-                loadChildren: () => import('app/overview/discussion-section/discussion-section.module').then((m) => m.DiscussionSectionModule),
-            },
-        ],
     },
 ];
 
diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
index 8c267652beff..b7252be6dc5d 100644
--- a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
+++ b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.html
@@ -16,28 +16,28 @@ <h4 class="modal-title" id="myProgrammingExerciseLabel" jhiTranslate="artemisApp
             <a ngbNavLink jhiTranslate="artemisApp.lti.generalConfiguration"></a>
             <ng-template ngbNavContent>
                 <dt>
-                    <span>{{ 'artemisApp.lti.userPrefix' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.userPrefix"></span>
                 </dt>
                 <dd>
                     <span>{{ onlineCourseConfiguration?.userPrefix }}</span>
                 </dd>
                 <dt>
-                    <span>{{ 'artemisApp.lti.requireExistingUser' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.lti.requireExistingUser"></span>
                 </dt>
                 <dd>
-                    <span>{{ (onlineCourseConfiguration?.requireExistingUser ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</span>
+                    <span jhiTranslate="{{ onlineCourseConfiguration?.requireExistingUser ? 'global.generic.yes' : 'global.generic.no' }}"></span>
                 </dd>
                 <div class="form-group">
                     <dt>
                         <span>{{ 'LTI Version' }}</span>
                     </dt>
                     <dd>
-                        <span>{{ 'artemisApp.lti.version13' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.version13"></span>
                     </dd>
                 </div>
                 <div>
                     <dt>
-                        <span>{{ 'artemisApp.lti13.externalToolSettings' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti13.externalToolSettings"></span>
                         @if (missingLti13ConfigurationField()) {
                             <fa-icon [icon]="faExclamationTriangle" class="text-warning" ngbTooltip="{{ 'artemisApp.lti13.missingConfigurationWarning' | artemisTranslate }}" />
                         }
@@ -45,42 +45,42 @@ <h4 class="modal-title" id="myProgrammingExerciseLabel" jhiTranslate="artemisApp
                     </dt>
                     <dd></dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.customName' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.customName"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.customName }}</span>
                         <jhi-copy-icon-button [copyText]="onlineCourseConfiguration?.ltiPlatformConfiguration?.customName ?? ''" />
                     </dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.registrationId' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.registrationId"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.registrationId }}</span>
                         <jhi-copy-icon-button [copyText]="onlineCourseConfiguration?.ltiPlatformConfiguration?.registrationId ?? ''" />
                     </dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.clientId' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.clientId"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.clientId }}</span>
                         <jhi-copy-icon-button [copyText]="onlineCourseConfiguration?.ltiPlatformConfiguration?.clientId ?? ''" />
                     </dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.authorizationUri' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.authorizationUri"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.authorizationUri }}</span>
                         <jhi-copy-icon-button [copyText]="onlineCourseConfiguration?.ltiPlatformConfiguration?.authorizationUri ?? ''" />
                     </dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.tokenUri' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.tokenUri"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.tokenUri }}</span>
                         <jhi-copy-icon-button [copyText]="onlineCourseConfiguration?.ltiPlatformConfiguration?.tokenUri ?? ''" />
                     </dd>
                     <dt>
-                        <span>{{ 'artemisApp.lti.jwkSetUri' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.lti.jwkSetUri"></span>
                     </dt>
                     <dd>
                         <span>{{ onlineCourseConfiguration?.ltiPlatformConfiguration?.jwkSetUri }}</span>
@@ -91,10 +91,10 @@ <h4 class="modal-title" id="myProgrammingExerciseLabel" jhiTranslate="artemisApp
                     <dd>
                         <a (click)="toggleAdvancedSettings()">
                             @if (!showAdvancedSettings) {
-                                <span>{{ 'artemisApp.lti.viewAdvancedSettings' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.lti.viewAdvancedSettings"></span>
                             }
                             @if (showAdvancedSettings) {
-                                <span> {{ 'artemisApp.lti.closeAdvancedSettings' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.lti.closeAdvancedSettings"></span>
                             }
                         </a>
                     </dd>
@@ -102,26 +102,26 @@ <h4 class="modal-title" id="myProgrammingExerciseLabel" jhiTranslate="artemisApp
                 @if (showAdvancedSettings) {
                     <div>
                         <dt>
-                            <span>{{ 'artemisApp.lti.ltiLaunchTarget' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.lti.ltiLaunchTarget"></span>
                             <jhi-help-icon text="artemisApp.lti.launchTargetTooltip" />
                         </dt>
                         <dd>
                             <span>New Window</span>
                         </dd>
                         <dt>
-                            <span>{{ 'artemisApp.lti.scored' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.lti.scored"></span>
                         </dt>
                         <dd>
                             <span>True</span>
                         </dd>
                         <dt>
-                            <span>{{ 'artemisApp.lti.requestUsername' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.lti.requestUsername"></span>
                         </dt>
                         <dd>
                             <span>True</span>
                         </dd>
                         <dt>
-                            <span>{{ 'artemisApp.lti.requestEmail' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.lti.requestEmail"></span>
                             <jhi-help-icon text="artemisApp.lti.requestUserEmailTooltip" />
                         </dt>
                         <dd>
diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
index 85a65e3bf46f..4b6e4c70cea3 100644
--- a/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
+++ b/src/main/webapp/app/course/manage/course-lti-configuration/edit-course-lti-configuration.component.html
@@ -36,7 +36,7 @@ <h4 class="modal-title mt-4" id="generalConfiguration" jhiTranslate="artemisApp.
     <div *jhiHasAnyAuthority="'ROLE_ADMIN'">
         <h4 class="modal-title mt-4" id="lti13" jhiTranslate="artemisApp.lti.version13"></h4>
         <div class="form-group mt-2">
-            <span>{{ 'artemisApp.lti13.externalToolSettings' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.lti13.externalToolSettings"></span>
             <jhi-help-icon text="artemisApp.lti13.editExternalToolSettingsTooltip" />
             <div class="form-group">
                 <div ngbDropdown class="d-inline-block me-2">
diff --git a/src/main/webapp/app/course/manage/course-management-exercises-search.component.html b/src/main/webapp/app/course/manage/course-management-exercises-search.component.html
index df388fd7b0af..67fdb931241a 100644
--- a/src/main/webapp/app/course/manage/course-management-exercises-search.component.html
+++ b/src/main/webapp/app/course/manage/course-management-exercises-search.component.html
@@ -1,12 +1,10 @@
 <div class="card search-card">
     <div class="card-header">
-        <h5 class="mb-0">{{ 'artemisApp.course.exercise.search.cardTitle' | artemisTranslate }}</h5>
+        <h5 class="mb-0" jhiTranslate="artemisApp.course.exercise.search.cardTitle"></h5>
     </div>
     <div class="card-body">
         <div class="form-group">
-            <label for="exercise-search-input">
-                {{ 'artemisApp.course.exercise.search.labelExerciseName' | artemisTranslate }}
-            </label>
+            <label for="exercise-search-input" jhiTranslate="artemisApp.course.exercise.search.labelExerciseName"></label>
             <input
                 id="exercise-search-input"
                 type="search"
@@ -18,9 +16,7 @@ <h5 class="mb-0">{{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans
         </div>
         <div class="row">
             <div class="form-group col">
-                <label for="exercise-search-category-input">
-                    {{ 'artemisApp.course.exercise.search.labelExerciseCategory' | artemisTranslate }}
-                </label>
+                <label for="exercise-search-category-input" jhiTranslate="artemisApp.course.exercise.search.labelExerciseCategory"></label>
                 <input
                     id="exercise-search-category-input"
                     type="text"
@@ -31,9 +27,7 @@ <h5 class="mb-0">{{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans
                 />
             </div>
             <div class="form-group col">
-                <label for="exercise-search-type-input">
-                    {{ 'artemisApp.course.exercise.search.labelExerciseType' | artemisTranslate }}
-                </label>
+                <label for="exercise-search-type-input" jhiTranslate="artemisApp.course.exercise.search.labelExerciseType"></label>
                 <select id="exercise-search-type-input" class="form-select" [(ngModel)]="exerciseTypeSearch" (ngModelChange)="sendUpdate()">
                     @for (optionValue of typeOptions; track optionValue) {
                         <option [value]="optionValue">
@@ -44,12 +38,14 @@ <h5 class="mb-0">{{ 'artemisApp.course.exercise.search.cardTitle' | artemisTrans
             </div>
         </div>
         <div class="gap-2 d-flex">
-            <button id="resetFilterButton" class="btn btn-secondary offset-6 col-3" type="button" (click)="reset()">
-                {{ 'artemisApp.course.exercise.search.resetButton' | artemisTranslate }}
-            </button>
-            <button id="saveFilterButton" class="btn btn-primary col-3" type="button" (click)="sendUpdate()">
-                {{ 'artemisApp.course.exercise.search.searchButton' | artemisTranslate }}
-            </button>
+            <button
+                id="resetFilterButton"
+                class="btn btn-secondary offset-6 col-3"
+                type="button"
+                (click)="reset()"
+                jhiTranslate="artemisApp.course.exercise.search.resetButton"
+            ></button>
+            <button id="saveFilterButton" class="btn btn-primary col-3" type="button" (click)="sendUpdate()" jhiTranslate="artemisApp.course.exercise.search.searchButton"></button>
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/app/course/manage/course-management-exercises.component.html b/src/main/webapp/app/course/manage/course-management-exercises.component.html
index 603b9c3c3c6e..d267f2b04fa4 100644
--- a/src/main/webapp/app/course/manage/course-management-exercises.component.html
+++ b/src/main/webapp/app/course/manage/course-management-exercises.component.html
@@ -24,9 +24,7 @@ <h3>
         <jhi-course-management-exercises-search (exerciseFilter)="exerciseFilter = $event" />
     }
     @if (showSearch && getFilteredExerciseCount() === 0 && !exerciseFilter.isEmpty()) {
-        <div class="alert alert-secondary" role="alert">
-            {{ 'artemisApp.course.exercise.search.noResults' | artemisTranslate }}
-        </div>
+        <div class="alert alert-secondary" role="alert" jhiTranslate="artemisApp.course.exercise.search.noResults"></div>
     }
     <jhi-course-exercise-card
         [headingJhiTranslate]="'artemisApp.course.programmingExercises'"
diff --git a/src/main/webapp/app/course/manage/course-management.component.html b/src/main/webapp/app/course/manage/course-management.component.html
index 608facb98435..bae8b6e55b96 100644
--- a/src/main/webapp/app/course/manage/course-management.component.html
+++ b/src/main/webapp/app/course/manage/course-management.component.html
@@ -37,14 +37,10 @@ <h4 class="fw-medium" id="course-page-heading" jhiTranslate="artemisApp.course.h
                             <span style="font-size: 24px"> {{ 'artemisApp.course.semester' | artemisTranslate }}: {{ 'global.generic.unset' | artemisTranslate }} </span>
                         }
                         @if (semester === 'test') {
-                            <span style="font-size: 24px">
-                                {{ 'artemisApp.course.testCourse.plural' | artemisTranslate }}
-                            </span>
+                            <span style="font-size: 24px" jhiTranslate="artemisApp.course.testCourse.plural"></span>
                         }
                         @if (semester === 'recent') {
-                            <span style="font-size: 24px">
-                                {{ 'artemisApp.course.recentlyAccessed' | artemisTranslate }}
-                            </span>
+                            <span style="font-size: 24px" jhiTranslate="artemisApp.course.recentlyAccessed"></span>
                         }
                     </div>
                     @if (!semesterCollapsed[semester]) {
diff --git a/src/main/webapp/app/course/manage/course-management.module.ts b/src/main/webapp/app/course/manage/course-management.module.ts
index c0c181457447..333de23de8b3 100644
--- a/src/main/webapp/app/course/manage/course-management.module.ts
+++ b/src/main/webapp/app/course/manage/course-management.module.ts
@@ -69,6 +69,7 @@ import { BuildQueueComponent } from 'app/localci/build-queue/build-queue.compone
 import { SubmissionResultStatusModule } from 'app/overview/submission-result-status.module';
 import { ImageCropperModalComponent } from 'app/course/manage/image-cropper-modal.component';
 import { HeaderCourseComponent } from 'app/overview/header-course.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 @NgModule({
     imports: [
@@ -122,6 +123,7 @@ import { HeaderCourseComponent } from 'app/overview/header-course.component';
         IrisModule,
         DetailModule,
         SubmissionResultStatusModule,
+        ArtemisMarkdownEditorModule,
     ],
     declarations: [
         CourseManagementComponent,
diff --git a/src/main/webapp/app/course/manage/course-update.component.html b/src/main/webapp/app/course/manage/course-update.component.html
index 3013cd9ac721..43b03f3f9040 100644
--- a/src/main/webapp/app/course/manage/course-update.component.html
+++ b/src/main/webapp/app/course/manage/course-update.component.html
@@ -114,7 +114,7 @@ <h5>
                             [error]="!isValidDate"
                         />
                         @if (!isValidDate) {
-                            <span class="invalid-feedback"> {{ 'artemisApp.course.form.startDate.invalid' | artemisTranslate }}</span>
+                            <span class="invalid-feedback" jhiTranslate="artemisApp.course.form.startDate.invalid"></span>
                         }
                     </div>
                     <div class="form-group flex-grow-1 ms-3">
@@ -126,7 +126,7 @@ <h5>
                             [error]="!isValidDate"
                         />
                         @if (!isValidDate) {
-                            <span class="invalid-feedback"> {{ 'artemisApp.course.form.endDate.invalid' | artemisTranslate }}</span>
+                            <span class="invalid-feedback" jhiTranslate="artemisApp.course.form.endDate.invalid"></span>
                         }
                     </div>
                 </div>
@@ -319,9 +319,11 @@ <h5>
                             [ngModelOptions]="{ standalone: true }"
                             (change)="disableMessaging()"
                         />
-                        <label for="field_communicationEnabled" class="form-check-label">
-                            {{ 'artemisApp.course.courseCommunicationSetting.communicationEnabled.label' | artemisTranslate }}
-                        </label>
+                        <label
+                            for="field_communicationEnabled"
+                            class="form-check-label"
+                            jhiTranslate="artemisApp.course.courseCommunicationSetting.communicationEnabled.label"
+                        ></label>
                         <fa-icon
                             [icon]="faQuestionCircle"
                             class="text-secondary"
@@ -338,9 +340,7 @@ <h5>
                             [ngModelOptions]="{ standalone: true }"
                             [disabled]="!communicationEnabled"
                         />
-                        <label for="field_messagingEnabled" class="form-check-label">
-                            {{ 'artemisApp.course.courseCommunicationSetting.messagingEnabled.label' | artemisTranslate }}
-                        </label>
+                        <label for="field_messagingEnabled" class="form-check-label" jhiTranslate="artemisApp.course.courseCommunicationSetting.messagingEnabled.label"></label>
                         <fa-icon
                             [icon]="faQuestionCircle"
                             class="text-secondary"
@@ -351,7 +351,7 @@ <h5>
                         <div class="form-group">
                             <label class="form-control-label" jhiTranslate="artemisApp.codeOfConduct.title"></label>
                             <jhi-help-icon text="artemisApp.codeOfConduct.tooltip" />
-                            <jhi-markdown-editor
+                            <jhi-markdown-editor-monaco
                                 class="markdown-editor"
                                 [(markdown)]="course.courseInformationSharingMessagingCodeOfConduct"
                                 (markdownChange)="updateCourseInformationSharingMessagingCodeOfConduct($event)"
@@ -446,7 +446,7 @@ <h5>
                                 [error]="!isValidEnrollmentPeriod"
                             />
                             @if (!isValidEnrollmentPeriod) {
-                                <span class="invalid-feedback"> {{ 'artemisApp.course.form.enrollmentStartDate.invalid' | artemisTranslate }}</span>
+                                <span class="invalid-feedback" jhiTranslate="artemisApp.course.form.enrollmentStartDate.invalid"></span>
                             }
                         </div>
                         <div class="form-group flex-grow-1 ms-3">
@@ -458,7 +458,7 @@ <h5>
                                 [error]="!isValidEnrollmentPeriod"
                             />
                             @if (!isValidEnrollmentPeriod) {
-                                <span class="invalid-feedback"> {{ 'artemisApp.course.form.enrollmentEndDate.invalid' | artemisTranslate }}</span>
+                                <span class="invalid-feedback" jhiTranslate="artemisApp.course.form.enrollmentEndDate.invalid"></span>
                             }
                         </div>
                     </div>
@@ -468,7 +468,7 @@ <h5>
                         <label class="form-control-label" jhiTranslate="artemisApp.course.enrollmentConfirmationMessage" for="field_enrollmentConfirmationMessage"
                             >Enrollment Confirmation Message</label
                         >
-                        <jhi-markdown-editor
+                        <jhi-markdown-editor-monaco
                             class="markdown-editor"
                             [(markdown)]="course.enrollmentConfirmationMessage"
                             (markdownChange)="updateEnrollmentConfirmationMessage($event)"
@@ -500,7 +500,7 @@ <h5>
                             [error]="!isValidUnenrollmentEndDate"
                         />
                         @if (!isValidUnenrollmentEndDate) {
-                            <span class="invalid-feedback"> {{ 'artemisApp.course.form.unenrollmentEndDate.invalid' | artemisTranslate }}</span>
+                            <span class="invalid-feedback" jhiTranslate="artemisApp.course.form.unenrollmentEndDate.invalid"></span>
                         }
                     </div>
                 }
@@ -509,13 +509,11 @@ <h5>
             @if (tutorialGroupsFeatureActivated) {
                 <div class="col-auto border border-warning p-3">
                     <span class="badge rounded-pill text-bg-warning ms-1">BETA</span>
-                    <label class="form-label" for="timeZone">{{ 'artemisApp.forms.configurationForm.timeZoneInput.label' | artemisTranslate }}</label>
+                    <label class="form-label" for="timeZone" jhiTranslate="artemisApp.forms.configurationForm.timeZoneInput.label"></label>
                     @if (timeZoneChanged) {
-                        <div class="alert alert-danger" role="alert">
-                            {{ 'artemisApp.forms.configurationForm.timeZoneInput.changeWarning' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" role="alert" jhiTranslate="artemisApp.forms.configurationForm.timeZoneInput.changeWarning"></div>
                     }
-                    <div>{{ 'artemisApp.forms.configurationForm.timeZoneInput.beta' | artemisTranslate }}</div>
+                    <div jhiTranslate="artemisApp.forms.configurationForm.timeZoneInput.beta"></div>
                     <input
                         id="timeZone"
                         type="text"
@@ -530,9 +528,7 @@ <h5>
                         (focus)="tzFocus$.next($any($event).target.value)"
                         (click)="tzClick$.next($any($event).target.value)"
                     />
-                    <div class="form-text">
-                        {{ 'artemisApp.forms.configurationForm.timeZoneInput.explanation' | artemisTranslate }}
-                    </div>
+                    <div class="form-text" jhiTranslate="artemisApp.forms.configurationForm.timeZoneInput.explanation"></div>
                 </div>
             }
             <div class="mt-3 d-flex">
diff --git a/src/main/webapp/app/course/manage/course-update.component.ts b/src/main/webapp/app/course/manage/course-update.component.ts
index cc260d0a289b..a3406ad5f46b 100644
--- a/src/main/webapp/app/course/manage/course-update.component.ts
+++ b/src/main/webapp/app/course/manage/course-update.component.ts
@@ -21,7 +21,7 @@ import { OrganizationSelectorComponent } from 'app/shared/organization-selector/
 import { faBan, faExclamationTriangle, faPen, faQuestionCircle, faSave, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { base64StringToBlob } from 'app/utils/blob-util';
 import { ImageCroppedEvent } from 'app/shared/image-cropper/interfaces/image-cropped-event.interface';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { CourseAdminService } from 'app/course/manage/course-admin.service';
 import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts b/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts
index 43d6336168a7..123e334cca33 100644
--- a/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts
+++ b/src/main/webapp/app/course/manage/courses-for-dashboard-dto.ts
@@ -1,5 +1,5 @@
 import { CourseForDashboardDTO } from 'app/course/manage/course-for-dashboard-dto';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 export class CoursesForDashboardDTO {
     courses: CourseForDashboardDTO[];
diff --git a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
index b499fda9b56b..9d379b38622e 100644
--- a/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
+++ b/src/main/webapp/app/course/manage/detail/course-detail-line-chart.component.html
@@ -1,7 +1,7 @@
 <div class="course-detail-parent-container col">
     <div class="d-flex flex-nowrap justify-content-center gap-2 mt-3">
         <a [routerLink]="['/course-management', course.id, 'course-statistics']" class="text-center">
-            <h5>{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}</h5>
+            <h5 jhiTranslate="artemisApp.courseStatistics.activeStudents"></h5>
         </a>
         <jhi-help-icon class="chart-explanation-tooltip" placement="right auto" text="artemisApp.courseStatistics.activeStudentsExplanation" />
     </div>
@@ -16,25 +16,24 @@ <h5>{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}</h5>
                                 [disabled]="!showLifetimeOverview && displayedNumberOfWeeks === 4"
                                 (click)="displayPeriodOverview(4)"
                                 ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.periodTooltip' | artemisTranslate: { amount: 4 } }}"
-                            >
-                                {{ 'artemisApp.courseStatistics.scopeButton.period' | artemisTranslate: { amount: 4 } }}
-                            </button>
+                                jhiTranslate="artemisApp.courseStatistics.scopeButton.period"
+                                [translateValues]="{ amount: 4 }"
+                            ></button>
                             <button
                                 class="btn"
                                 [disabled]="!showLifetimeOverview && displayedNumberOfWeeks === 8"
                                 (click)="displayPeriodOverview(8)"
                                 ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.periodTooltip' | artemisTranslate: { amount: 8 } }}"
-                            >
-                                {{ 'artemisApp.courseStatistics.scopeButton.period' | artemisTranslate: { amount: 8 } }}
-                            </button>
+                                jhiTranslate="artemisApp.courseStatistics.scopeButton.period"
+                                [translateValues]="{ amount: 8 }"
+                            ></button>
                             <button
                                 class="btn"
                                 [disabled]="showLifetimeOverview"
                                 (click)="displayLifetimeOverview()"
                                 ngbTooltip="{{ 'artemisApp.courseStatistics.scopeButton.overviewTooltip' | artemisTranslate }}"
-                            >
-                                {{ 'artemisApp.courseStatistics.scopeButton.overview' | artemisTranslate }}
-                            </button>
+                                jhiTranslate="artemisApp.courseStatistics.scopeButton.overview"
+                            ></button>
                         </div>
                         <span class="pt-1">|</span>
                     }
@@ -85,7 +84,7 @@ <h1 class="spinner">
         </ng-container>
     } @else {
         <ng-container>
-            <h4 class="text-center mt-3">{{ 'artemisApp.course.notStartedYet' | artemisTranslate }}</h4>
+            <h4 class="text-center mt-3" jhiTranslate="artemisApp.course.notStartedYet"></h4>
             <h3 class="text-center">{{ course.startDate | artemisDate }}</h3>
         </ng-container>
     }
diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.component.html b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
index 3619d90a93d8..adf01ba9af77 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-card.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-card.component.html
@@ -40,9 +40,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             </a>
                         }
                         @if (courseWithUsers.numberOfStudents === undefined) {
-                            <a [routerLink]="['/course-management', course.id, 'groups', 'students']">
-                                {{ 'artemisApp.course.students' | artemisTranslate }}
-                            </a>
+                            <a [routerLink]="['/course-management', course.id, 'groups', 'students']" jhiTranslate="artemisApp.course.students"></a>
                         }
                     </div>
                     <div>
@@ -57,9 +55,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             </a>
                         }
                         @if (courseWithUsers.numberOfTeachingAssistants === undefined) {
-                            <a [routerLink]="['/course-management', course.id, 'groups', 'tutors']">
-                                {{ 'artemisApp.course.tutors' | artemisTranslate }}
-                            </a>
+                            <a [routerLink]="['/course-management', course.id, 'groups', 'tutors']" jhiTranslate="artemisApp.course.tutors"></a>
                         }
                     </div>
                 </div>
@@ -76,9 +72,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             </a>
                         }
                         @if (courseWithUsers.numberOfEditors === undefined) {
-                            <a [routerLink]="['/course-management', course.id, 'groups', 'editors']">
-                                {{ 'artemisApp.course.editors' | artemisTranslate }}
-                            </a>
+                            <a [routerLink]="['/course-management', course.id, 'groups', 'editors']" jhiTranslate="artemisApp.course.editors"></a>
                         }
                     </div>
                     <div>
@@ -93,9 +87,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             </a>
                         }
                         @if (courseWithUsers.numberOfInstructors === undefined) {
-                            <a [routerLink]="['/course-management', course.id, 'groups', 'instructors']">
-                                {{ 'artemisApp.course.instructors' | artemisTranslate }}
-                            </a>
+                            <a [routerLink]="['/course-management', course.id, 'groups', 'instructors']" jhiTranslate="artemisApp.course.instructors"></a>
                         }
                     </div>
                 </div>
@@ -116,7 +108,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             <div>
                                 <div class="control-label" (click)="showFutureExercises = !showFutureExercises">
                                     <fa-icon class="control-icon" [icon]="showFutureExercises ? faAngleDown : faAngleUp" />
-                                    <strong>{{ 'artemisApp.course.releasedSoon' | artemisTranslate }}</strong>
+                                    <strong jhiTranslate="artemisApp.course.releasedSoon"></strong>
                                 </div>
                                 @if (showFutureExercises) {
                                     <div>
@@ -139,7 +131,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             <div>
                                 <div class="control-label" (click)="showCurrentExercises = !showCurrentExercises">
                                     <fa-icon class="control-icon" [icon]="showCurrentExercises ? faAngleDown : faAngleUp" />
-                                    <strong>{{ 'artemisApp.course.currentWorking' | artemisTranslate }}</strong>
+                                    <strong jhiTranslate="artemisApp.course.currentWorking"></strong>
                                 </div>
                                 @if (showCurrentExercises) {
                                     <div>
@@ -162,7 +154,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             <div>
                                 <div class="control-label" (click)="showExercisesInAssessment = !showExercisesInAssessment">
                                     <fa-icon class="control-icon" [icon]="showExercisesInAssessment ? faAngleDown : faAngleUp" />
-                                    <strong>{{ 'artemisApp.course.inAssessment' | artemisTranslate }}</strong>
+                                    <strong jhiTranslate="artemisApp.course.inAssessment"></strong>
                                 </div>
                                 @if (showExercisesInAssessment) {
                                     <div>
@@ -185,7 +177,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                             <div>
                                 <div class="control-label" (click)="showPastExercises = !showPastExercises">
                                     <fa-icon class="control-icon" [icon]="showPastExercises ? faAngleDown : faAngleUp" />
-                                    <strong>{{ 'artemisApp.course.pastExercises' | artemisTranslate: { amount: pastExercises.length, total: pastExerciseCount } }}</strong>
+                                    <strong jhiTranslate="artemisApp.course.pastExercises" [translateValues]="{ amount: pastExercises.length, total: pastExerciseCount }"></strong>
                                 </div>
                                 @if (showPastExercises) {
                                     <div>
@@ -206,7 +198,7 @@ <h3 class="card-title text-center fw-medium course-title">{{ course.title }} ({{
                         }
                         @if ((futureExercises?.length || 0) + (currentExercises?.length || 0) + (exercisesInAssessment?.length || 0) + (pastExercises?.length || 0) === 0) {
                             <div>
-                                <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExercises' | artemisTranslate }}</h4>
+                                <h4 class="text-center no-exercises mt-3 fw-medium" jhiTranslate="artemisApp.course.noExercises"></h4>
                             </div>
                         }
                     </div>
@@ -240,7 +232,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-exams"
             >
                 <fa-icon [icon]="faGraduationCap" />
-                <span class="d-none d-xl-inline">{{ 'entity.action.exams' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="entity.action.exams"></span>
             </a>
         }
         @if (course.isAtLeastTutor) {
@@ -252,7 +244,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-exercises"
             >
                 <fa-icon [icon]="faListAlt" />
-                <span class="d-none d-xl-inline">{{ 'entity.action.exercise' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="entity.action.exercise"></span>
             </a>
         }
         @if (course.isAtLeastEditor) {
@@ -263,7 +255,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-lectures"
             >
                 <fa-icon [icon]="faFilePdf" />
-                <span class="d-none d-xl-inline">{{ 'entity.action.lecture' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="entity.action.lecture"></span>
             </a>
         }
         @if (course.isAtLeastTutor) {
@@ -274,7 +266,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-open-statistics"
             >
                 <fa-icon [icon]="faChartBar" />
-                <span class="d-none d-xl-inline">{{ 'artemisApp.courseStatistics.statistics' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="artemisApp.courseStatistics.statistics"></span>
             </a>
         }
         @if (isCommunicationEnabled(course) && course.isAtLeastTutor) {
@@ -284,7 +276,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 [ngbTooltip]="'artemisApp.courseOverview.menu.communication' | artemisTranslate"
             >
                 <fa-icon [icon]="faComments" />
-                <span class="d-none d-xl-inline">{{ 'artemisApp.metis.communication.label' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="artemisApp.metis.communication.label"></span>
             </a>
         }
         @if (course.timeZone || course.isAtLeastInstructor) {
@@ -332,7 +324,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-assessment-dashboard"
             >
                 <fa-icon [icon]="faUserCheck" />
-                <span class="d-none d-xl-inline">{{ 'entity.action.assessmentDashboard' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="entity.action.assessmentDashboard"></span>
             </a>
         }
         @if (course.isAtLeastInstructor) {
@@ -343,7 +335,7 @@ <h4 class="text-center no-exercises mt-3 fw-medium">{{ 'artemisApp.course.noExer
                 id="course-card-open-scores"
             >
                 <fa-icon [icon]="faTable" />
-                <span class="d-none d-xl-inline">{{ 'entity.action.scores' | artemisTranslate }}</span>
+                <span class="d-none d-xl-inline" jhiTranslate="entity.action.scores"></span>
             </a>
         }
     </div>
diff --git a/src/main/webapp/app/course/manage/overview/course-management-card.scss b/src/main/webapp/app/course/manage/overview/course-management-card.scss
index 2d3561b67c33..d48a2845f0e7 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-card.scss
+++ b/src/main/webapp/app/course/manage/overview/course-management-card.scss
@@ -17,13 +17,14 @@
         transition: 0.15s;
         background-color: var(--background-color-for-hover) !important;
 
-        &:hover {
-            background-color: color-mix(in srgb, var(--background-color-for-hover), transparent 15%) !important;
-        }
         display: flex;
         cursor: pointer;
         height: 100px;
 
+        &:hover {
+            background-color: color-mix(in srgb, var(--background-color-for-hover), transparent 15%) !important;
+        }
+
         > div {
             flex: 0 1 auto;
         }
@@ -210,7 +211,11 @@
 
 @media screen and (max-width: 850px) {
     .card {
+        height: unset;
         .card-heading {
+            height: unset;
+            max-height: 135px;
+
             .card-header-left {
                 flex-direction: column;
                 max-width: 110px;
@@ -244,12 +249,7 @@
                 display: flex;
                 align-content: center;
             }
-
-            height: unset;
-            max-height: 135px;
         }
-
-        height: unset;
     }
 }
 
diff --git a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
index f4940c20c0c4..e5f8cdd9dee2 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-exercise-row.component.html
@@ -25,7 +25,7 @@
                 <div class="row-flex exercise-date-container">
                     <div [ngClass]="!!details.releaseDate ? 'exercise-date' : 'exercise-date exercise-no-date'">
                         <div class="exercise-date-timeline"></div>
-                        <span>{{ 'artemisApp.course.releaseDate' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.course.releaseDate"></span>
                         @if (!details.releaseDate) {
                             <div>
                                 <div class="calender-icon-container">
@@ -51,7 +51,7 @@
                     </div>
                     <div [ngClass]="!!details.dueDate ? 'exercise-date' : 'exercise-date exercise-no-date'">
                         <div class="exercise-date-timeline"></div>
-                        <span>{{ 'artemisApp.course.dueDate' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.course.dueDate"></span>
                         @if (!details.dueDate) {
                             <div>
                                 <div class="calender-icon-container">
@@ -77,7 +77,7 @@
                     </div>
                     <div [ngClass]="!!details.assessmentDueDate ? 'exercise-date' : 'exercise-date exercise-no-date'">
                         <div class="exercise-date-timeline"></div>
-                        <span>{{ 'artemisApp.course.assessmentDueDate' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.course.assessmentDueDate"></span>
                         @if (!details.assessmentDueDate) {
                             <div>
                                 <div class="calender-icon-container">
@@ -105,7 +105,7 @@
                 <div class="row-flex exercise-score-container">
                     @if (statistic && rowType === exerciseRowType.CURRENT) {
                         <div class="exercise-score">
-                            <span>{{ 'artemisApp.course.participations' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.course.participations"></span>
                             <jhi-progress-bar
                                 [tooltip]="'artemisApp.course.participations' | artemisTranslate"
                                 [percentage]="statistic.participationRateInPercent || 0"
@@ -116,7 +116,7 @@
                     }
                     @if (statistic && rowType === exerciseRowType.ASSESSING) {
                         <div class="exercise-score">
-                            <span>{{ 'artemisApp.course.assessmentProgress' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.course.assessmentProgress"></span>
                             <jhi-progress-bar
                                 [tooltip]="'artemisApp.course.assessmentProgress' | artemisTranslate"
                                 [percentage]="statistic.noOfAssessmentsDoneInPercent || 0"
@@ -127,7 +127,7 @@
                     }
                     @if (statistic && rowType === exerciseRowType.PAST) {
                         <div class="exercise-score">
-                            <span>{{ 'artemisApp.course.averageScore' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.course.averageScore"></span>
                             <jhi-progress-bar
                                 [tooltip]="'artemisApp.course.averageScore' | artemisTranslate"
                                 [percentage]="statistic.averageScoreInPercent || 0"
diff --git a/src/main/webapp/app/course/manage/overview/course-management-overview-statistics.component.html b/src/main/webapp/app/course/manage/overview/course-management-overview-statistics.component.html
index 9aebc5ff0678..6e2a65cae400 100644
--- a/src/main/webapp/app/course/manage/overview/course-management-overview-statistics.component.html
+++ b/src/main/webapp/app/course/manage/overview/course-management-overview-statistics.component.html
@@ -1,7 +1,7 @@
 <div class="row justify-content-center chart-title-line">
     <div class="d-inline-flex flex-nowrap justify-content-center align-items-center">
         <a [routerLink]="['/course-management', course.id, 'course-statistics']" class="text-center">
-            <h4>{{ 'artemisApp.courseStatistics.activeStudents' | artemisTranslate }}</h4>
+            <h4 jhiTranslate="artemisApp.courseStatistics.activeStudents"></h4>
         </a>
         <jhi-help-icon class="chart-explanation-tooltip headline-margin" placement="right auto" text="artemisApp.courseStatistics.activeStudentsExplanation" />
     </div>
diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
index d6a8cb3f33ac..a66f7b342595 100644
--- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
+++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/detail-view/plagiarism-case-instructor-detail-view.component.html
@@ -3,7 +3,7 @@
         <div class="case-header">
             <div class="row">
                 <div class="col-12 col-lg-6 col-xl-3 d-flex align-items-center">
-                    <h1 class="h2">{{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artemisTranslate }}</h1>
+                    <h1 class="h2" jhiTranslate="artemisApp.plagiarism.plagiarismCases.plagiarismCase"></h1>
                 </div>
                 <div class="col-12 col-lg-6 col-xl-3 d-flex align-items-center">
                     <jhi-plagiarism-case-verdict [plagiarismCase]="plagiarismCase" class="my-2" />
@@ -50,28 +50,26 @@ <h1 class="h2">{{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artem
         </div>
         <div class="case-body">
             <section>
-                <h3>{{ 'artemisApp.plagiarism.plagiarismCases.conversation' | artemisTranslate }}</h3>
+                <h3 jhiTranslate="artemisApp.plagiarism.plagiarismCases.conversation"></h3>
                 @if (posts && posts.length > 0) {
                     <jhi-posting-thread [post]="posts[0]" [showAnswers]="true" />
                 }
                 @if ((!posts || posts.length === 0) && createdPost) {
                     <div>
-                        <button class="btn btn-md btn-primary" (click)="createEditModal.open()">
-                            {{ 'artemisApp.plagiarism.plagiarismCases.notifyStudent' | artemisTranslate }}
-                        </button>
+                        <button class="btn btn-md btn-primary" (click)="createEditModal.open()" jhiTranslate="artemisApp.plagiarism.plagiarismCases.notifyStudent"></button>
                         <jhi-post-create-edit-modal #createEditModal [posting]="createdPost" (onCreate)="onStudentNotified($event)" />
                     </div>
                 }
             </section>
             <section class="d-print-none">
-                <h2 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | artemisTranslate }}</h2>
-                <p>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.text' | artemisTranslate }}</p>
+                <h2 class="mt-5" jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.verdict"></h2>
+                <p jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.text"></p>
                 <div class="verdict-container">
                     <ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" [destroyOnHide]="false" class="nav-tabs">
                         <li [ngbNavItem]="1">
                             <a ngbNavLink jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.plagiarism"></a>
                             <ng-template ngbNavContent>
-                                <p>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.plagiarismDescription' | artemisTranslate }}</p>
+                                <p jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.plagiarismDescription"></p>
                                 <div class="form-inline">
                                     <jhi-confirm-button
                                         title="artemisApp.plagiarism.plagiarismCases.verdict.plagiarism"
@@ -96,7 +94,7 @@ <h2 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | ar
                         <li [ngbNavItem]="2">
                             <a ngbNavLink jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.pointDeduction"></a>
                             <ng-template ngbNavContent>
-                                <p>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.pointDeductionDescription' | artemisTranslate }}</p>
+                                <p jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.pointDeductionDescription"></p>
                                 <div class="form-inline">
                                     <div class="input-group w-auto">
                                         <input
@@ -126,7 +124,7 @@ <h2 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | ar
                         <li [ngbNavItem]="3">
                             <a ngbNavLink jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.warning"></a>
                             <ng-template ngbNavContent>
-                                <p>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.warningDescription' | artemisTranslate }}</p>
+                                <p jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.warningDescription"></p>
                                 <div class="form">
                                     <div class="form-group">
                                         <textarea
@@ -169,7 +167,7 @@ <h2 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.verdict.verdict' | ar
                 </div>
             </section>
             <section>
-                <h3 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.comparisons' | artemisTranslate }}</h3>
+                <h3 class="mt-5" jhiTranslate="artemisApp.plagiarism.plagiarismCases.comparisons"></h3>
                 <div class="container-fluid">
                     <jhi-plagiarism-case-review [plagiarismCase]="plagiarismCase" [forStudent]="false" />
                 </div>
diff --git a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html
index ce89853044d4..6bad6dfcb843 100644
--- a/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html
+++ b/src/main/webapp/app/course/plagiarism-cases/instructor-view/plagiarism-cases-instructor-view.component.html
@@ -7,7 +7,7 @@ <h4 jhiTranslate="artemisApp.plagiarism.cases.pageSubtitle"></h4>
     <div>
         <div class="plagiarism-cases--toolbar row mb-3">
             <div class="col-auto">
-                <button class="btn btn-primary" (click)="exportPlagiarismCases()">{{ 'artemisApp.plagiarism.cases.exportCsv' | artemisTranslate }}</button>
+                <button class="btn btn-primary" (click)="exportPlagiarismCases()" jhiTranslate="artemisApp.plagiarism.cases.exportCsv"></button>
             </div>
         </div>
         @for (exercise of exercisesWithPlagiarismCases; track exercise; let i = $index) {
@@ -57,9 +57,11 @@ <h5 class="mb-0">
                                 </a>
                             </div>
                             @if (plagiarismCase.plagiarismSubmissions) {
-                                <div class="col-2 text-center">
-                                    {{ 'artemisApp.plagiarism.plagiarismCases.appearsInComparisons' | artemisTranslate: { count: plagiarismCase.plagiarismSubmissions.length } }}
-                                </div>
+                                <div
+                                    class="col-2 text-center"
+                                    jhiTranslate="artemisApp.plagiarism.plagiarismCases.appearsInComparisons"
+                                    [translateValues]="{ count: plagiarismCase.plagiarismSubmissions.length }"
+                                ></div>
                             }
                             @if (plagiarismCase.post) {
                                 <div class="col-3 text-center">
@@ -67,15 +69,13 @@ <h5 class="mb-0">
                                 </div>
                             }
                             @if (!plagiarismCase.post) {
-                                <div class="col-3 text-center">{{ 'artemisApp.plagiarism.plagiarismCases.notNotified' | artemisTranslate }}</div>
+                                <div class="col-3 text-center" jhiTranslate="artemisApp.plagiarism.plagiarismCases.notNotified"></div>
                             }
                             @if (hasStudentAnswer(plagiarismCase)) {
-                                <div class="col-3 text-center">
-                                    {{ 'artemisApp.plagiarism.plagiarismCases.respondedByStudent' | artemisTranslate }}
-                                </div>
+                                <div class="col-3 text-center" jhiTranslate="artemisApp.plagiarism.plagiarismCases.respondedByStudent"></div>
                             }
                             @if (!hasStudentAnswer(plagiarismCase)) {
-                                <div class="col-3 text-center">{{ 'artemisApp.plagiarism.plagiarismCases.notResponded' | artemisTranslate }}</div>
+                                <div class="col-3 text-center" jhiTranslate="artemisApp.plagiarism.plagiarismCases.notResponded"></div>
                             }
                             <div class="col-3">
                                 <jhi-plagiarism-case-verdict [plagiarismCase]="plagiarismCase" [hideDetails]="true" />
diff --git a/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html b/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html
index 93adf2aed0c6..128ceb47bede 100644
--- a/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html
+++ b/src/main/webapp/app/course/plagiarism-cases/student-view/detail-view/plagiarism-case-student-detail-view.component.html
@@ -3,7 +3,7 @@
         <div class="case-header">
             <div class="row">
                 <div class="col-12 col-lg-6 col-xl-3 d-flex align-items-center">
-                    <h1 class="h2">{{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artemisTranslate }}</h1>
+                    <h1 class="h2" jhiTranslate="artemisApp.plagiarism.plagiarismCases.plagiarismCase"></h1>
                 </div>
                 <div class="col-12 col-lg-6 col-xl-3 d-flex align-items-center">
                     <jhi-plagiarism-case-verdict [plagiarismCase]="plagiarismCase" class="my-2" />
@@ -34,20 +34,20 @@ <h1 class="h2">{{ 'artemisApp.plagiarism.plagiarismCases.plagiarismCase' | artem
                 <section>
                     @if (plagiarismCase.verdict === plagiarismVerdict.POINT_DEDUCTION) {
                         <div class="alert alert-danger">
-                            <h5>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.pointDeduction' | artemisTranslate }}</h5>
+                            <h5 jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.pointDeduction"></h5>
                             <p class="mb-0">{{ plagiarismCase.verdictPointDeduction }}&nbsp;&percnt;</p>
                         </div>
                     }
                     @if (plagiarismCase.verdict === plagiarismVerdict.WARNING) {
                         <div class="alert alert-danger">
-                            <h5>{{ 'artemisApp.plagiarism.plagiarismCases.verdict.warning' | artemisTranslate }}</h5>
+                            <h5 jhiTranslate="artemisApp.plagiarism.plagiarismCases.verdict.warning"></h5>
                             <p class="mb-0">{{ plagiarismCase.verdictMessage }}</p>
                         </div>
                     }
                 </section>
             }
             <section>
-                <h3>{{ 'artemisApp.plagiarism.plagiarismCases.conversation' | artemisTranslate }}</h3>
+                <h3 jhiTranslate="artemisApp.plagiarism.plagiarismCases.conversation"></h3>
                 <div class="row">
                     @if (posts && posts.length > 0) {
                         <div class="row mb-2 col-12">
@@ -97,7 +97,7 @@ <h3>{{ 'artemisApp.plagiarism.plagiarismCases.conversation' | artemisTranslate }
                 </div>
             </section>
             <section>
-                <h3 class="mt-5">{{ 'artemisApp.plagiarism.plagiarismCases.comparisons' | artemisTranslate }}</h3>
+                <h3 class="mt-5" jhiTranslate="artemisApp.plagiarism.plagiarismCases.comparisons"></h3>
                 <div class="container-fluid">
                     <jhi-plagiarism-case-review [plagiarismCase]="plagiarismCase" [forStudent]="true" />
                 </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-detail/tutorial-group-detail.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-detail/tutorial-group-detail.component.html
index a4c1272ab2e4..ced9dd74a469 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-detail/tutorial-group-detail.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-detail/tutorial-group-detail.component.html
@@ -9,7 +9,7 @@ <h2>{{ tutorialGroup.title }}</h2>
         <jhi-detail-overview-list [sections]="tutorialDetailSections" />
     }
     <div class="mt-1">
-        <strong>{{ 'artemisApp.entities.tutorialGroup.sessions' | artemisTranslate }}</strong>
+        <strong jhiTranslate="artemisApp.entities.tutorialGroup.sessions"></strong>
     </div>
     @if (sessions && sessions.length) {
         <div class="scrollbar table-wrapper-scroll-y border border-lightgrey p-3">
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html
index 70edd4b36df5..b3a9ec03eac7 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-free-days-overview/tutorial-group-free-days-overview.component.html
@@ -15,9 +15,8 @@
                                 placement="top"
                                 [ngbPopover]="freeDay.reason.trim()"
                                 [popoverTitle]="'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate"
-                            >
-                                {{ 'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate }}
-                            </button>
+                                jhiTranslate="artemisApp.entities.tutorialFreePeriod.reason"
+                            ></button>
                         }
                     </li>
                 }
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-session-row/tutorial-group-session-row.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-session-row/tutorial-group-session-row.component.html
index 37141de8e855..b3abffb208e7 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-session-row/tutorial-group-session-row.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-session-row/tutorial-group-session-row.component.html
@@ -67,9 +67,7 @@
     @if (tutorialGroup.tutorialGroupSchedule) {
         <td>
             @if (!hasSchedule) {
-                <div class="alert alert-info" role="alert">
-                    {{ 'artemisApp.pages.tutorialGroupSessionManagement.differsFromSchedule' | artemisTranslate }}
-                </div>
+                <div class="alert alert-info" role="alert" jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.differsFromSchedule"></div>
             }
         </td>
     }
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-sessions-table.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-sessions-table.component.html
index acb3ad023018..16545c75b8ae 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-sessions-table.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-group-sessions-table/tutorial-group-sessions-table.component.html
@@ -1,25 +1,28 @@
 <div class="table-responsive session-table">
     <div class="col-12 mb-2">
-        <div class="alert alert-info">
-            {{ 'artemisApp.pages.tutorialGroupSessionManagement.timeZoneExplanation' | artemisTranslate: { timeZone: timeZoneUsedForDisplay } }}
-        </div>
+        <div
+            class="alert alert-info"
+            jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.timeZoneExplanation"
+            [translateValues]="{ timeZone: timeZoneUsedForDisplay }"
+        ></div>
     </div>
     <table class="table table-sm">
         <thead>
             <tr>
                 @if (showIdColumn) {
-                    <th>{{ 'global.field.id' | artemisTranslate }}</th>
+                    <th jhiTranslate="global.field.id"></th>
                 }
-                <th>{{ 'artemisApp.entities.tutorialGroupSession.date' | artemisTranslate }}</th>
+                <th jhiTranslate="artemisApp.entities.tutorialGroupSession.date"></th>
                 <th>
-                    <span>{{
-                        (tutorialGroup.isOnline ? 'artemisApp.forms.scheduleForm.locationInput.labelOnline' : 'artemisApp.forms.scheduleForm.locationInput.labelOffline')
-                            | artemisTranslate
-                    }}</span>
+                    <span
+                        jhiTranslate="{{
+                            tutorialGroup.isOnline ? 'artemisApp.forms.scheduleForm.locationInput.labelOnline' : 'artemisApp.forms.scheduleForm.locationInput.labelOffline'
+                        }}"
+                    ></span>
                 </th>
-                <th class="attendance-column" id="attendanceHeader">{{ 'artemisApp.entities.tutorialGroupSession.attendance' | artemisTranslate }}</th>
+                <th class="attendance-column" id="attendanceHeader" jhiTranslate="artemisApp.entities.tutorialGroupSession.attendance"></th>
                 @if (tutorialGroup.tutorialGroupSchedule) {
-                    <th>{{ 'artemisApp.pages.tutorialGroupSessionManagement.columns.notes' | artemisTranslate }}</th>
+                    <th jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.columns.notes"></th>
                 }
                 @if (extraColumn) {
                     <th></th>
@@ -45,9 +48,12 @@
                 <td [colSpan]="numberOfColumns">
                     {{ 'artemisApp.pages.tutorialGroupSessionManagement.divider' | artemisTranslate }}
                     <div class="text-center">
-                        <button type="button" class="btn btn-sm btn-outline-secondary" (click)="isCollapsed = !isCollapsed">
-                            {{ 'artemisApp.pages.tutorialGroupSessionManagement.showAll' | artemisTranslate }}
-                        </button>
+                        <button
+                            type="button"
+                            class="btn btn-sm btn-outline-secondary"
+                            (click)="isCollapsed = !isCollapsed"
+                            jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.showAll"
+                        ></button>
                     </div>
                 </td>
             </tr>
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html
index 00440e00746f..69291296cf47 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-group-row/tutorial-group-row.component.html
@@ -23,9 +23,7 @@
         } @else {}
     </td>
     @if (mixOfOfflineAndOfflineTutorialGroups) {
-        <td>
-            {{ (tutorialGroup.isOnline ? 'artemisApp.generic.online' : 'artemisApp.generic.offline') | artemisTranslate }}
-        </td>
+        <td jhiTranslate="{{ tutorialGroup.isOnline ? 'artemisApp.generic.online' : 'artemisApp.generic.offline' }}"></td>
     }
     @if (mifOfDifferentLanguages) {
         <td>
diff --git a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-groups-table.component.html b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-groups-table.component.html
index 09a12c441264..1abbddca1b11 100644
--- a/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-groups-table.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/shared/tutorial-groups-table/tutorial-groups-table.component.html
@@ -1,63 +1,65 @@
 <div class="table-responsive tutorial-groups-table">
     <div class="col-12 mb-2">
-        <div class="alert alert-info">
-            {{ 'artemisApp.pages.tutorialGroupSessionManagement.timeZoneExplanation' | artemisTranslate: { timeZone: timeZoneUsedForDisplay } }}
-        </div>
+        <div
+            class="alert alert-info"
+            jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.timeZoneExplanation"
+            [translateValues]="{ timeZone: timeZoneUsedForDisplay }"
+        ></div>
     </div>
     <table class="table table-sm table-hover">
         <thead>
             <tr jhiSort [(predicate)]="sortingPredicate" [(ascending)]="ascending" (sortChange)="sortRows()">
                 @if (showIdColumn) {
                     <th jhiSortBy="id">
-                        <a class="th-link">{{ 'global.field.id' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="global.field.id"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 <th jhiSortBy="title">
-                    <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.title' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.title"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th>
-                    <span>{{ 'artemisApp.entities.tutorialGroup.utilization' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.entities.tutorialGroup.utilization"></span>
                     <fa-icon [icon]="faQuestionCircle" class="text-secondary" ngbTooltip="{{ 'artemisApp.entities.tutorialGroup.utilizationHelp' | artemisTranslate }}" />
                 </th>
                 <th jhiSortBy="capacityAndRegistrations">
-                    <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.registrationsWithCapacity' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.registrationsWithCapacity"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="teachingAssistantName">
-                    <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.teachingAssistant' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.teachingAssistant"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="dayAndTime">
-                    <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.locationTime' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.locationTime"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 @if (mixOfOfflineAndOfflineTutorialGroups) {
                     <th jhiSortBy="isOnline" id="online-column">
-                        <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.isOnline' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.isOnline"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 @if (mifOfDifferentLanguages) {
                     <th jhiSortBy="language" id="language-column">
-                        <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.language' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.language"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 @if (tutorialGroupsSplitAcrossMultipleCampuses) {
                     <th jhiSortBy="campus" id="campus-column">
-                        <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.campus' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.campus"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 <th jhiSortBy="nextSession">
-                    <a class="th-link">{{ 'artemisApp.entities.tutorialGroup.nextSession' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.entities.tutorialGroup.nextSession"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 @if (showChannelColumn) {
                     <th>
-                        <a class="th-link" [routerLink]="['/courses', course.id!, 'communication']">{{ 'artemisApp.entities.tutorialGroup.channel' | artemisTranslate }}</a>
+                        <a class="th-link" [routerLink]="['/courses', course.id!, 'communication']" jhiTranslate="artemisApp.entities.tutorialGroup.channel"></a>
                     </th>
                 }
                 @if (extraColumn) {
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/registered-students/registered-students.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/registered-students/registered-students.component.html
index 5b215410d892..037b0abe64a1 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/registered-students/registered-students.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/registered-students/registered-students.component.html
@@ -2,14 +2,17 @@
     @if (isInitialized && tutorialGroup) {
         <div>
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'artemisApp.pages.registeredStudents.header' | artemisTranslate: { title: tutorialGroup.title } }}</h4>
+                <h4 class="modal-title" jhiTranslate="artemisApp.pages.registeredStudents.header" [translateValues]="{ title: tutorialGroup.title }"></h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
             <div class="modal-body">
                 @if (capacityReached) {
-                    <div class="alert alert-warning" role="alert">
-                        {{ 'artemisApp.pages.registeredStudents.capacityWarning' | artemisTranslate: { capacity: tutorialGroup.capacity } }}
-                    </div>
+                    <div
+                        class="alert alert-warning"
+                        role="alert"
+                        jhiTranslate="artemisApp.pages.registeredStudents.capacityWarning"
+                        [translateValues]="{ capacity: tutorialGroup.capacity }"
+                    ></div>
                 }
                 <jhi-course-group
                     [tutorialGroup]="tutorialGroup"
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html
index f0f12f3eaf09..a810c1c0c46d 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component.html
@@ -2,7 +2,7 @@
     @if (isInitialized) {
         <div>
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'artemisApp.pages.createTutorialFreePeriod.title' | artemisTranslate }}</h4>
+                <h4 class="modal-title" jhiTranslate="artemisApp.pages.createTutorialFreePeriod.title"></h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
             <div class="modal-body">
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html
index b7f69a950451..9df0a8393f78 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/edit-tutorial-group-free-period/edit-tutorial-group-free-period.component.html
@@ -2,7 +2,7 @@
     @if (isInitialized) {
         <div>
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'artemisApp.pages.editTutorialFreePeriod.title' | artemisTranslate }}</h4>
+                <h4 class="modal-title" jhiTranslate="artemisApp.pages.editTutorialFreePeriod.title"></h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
             <div class="modal-body">
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html
index fe8fb59ae02b..59a45f3f20da 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-free-period-form/tutorial-group-free-period-form.component.html
@@ -1,8 +1,6 @@
 <div class="row">
     <div class="col-12 mb-2">
-        <div class="alert alert-info">
-            {{ 'artemisApp.generic.timeZone' | artemisTranslate: { timeZone } }}
-        </div>
+        <div class="alert alert-info" jhiTranslate="artemisApp.generic.timeZone" [translateValues]="{ timeZone }"></div>
     </div>
     <div class="col-12">
         @if (form) {
@@ -17,7 +15,7 @@
                         [checked]="timeFrame === TimeFrame.Period"
                         (click)="setTimeFrame(TimeFrame.Period)"
                     />
-                    <label class="btn btn-outline-primary" for="FreePeriod">{{ 'artemisApp.forms.tutorialFreePeriodForm.timeFrame.period' | artemisTranslate }}</label>
+                    <label class="btn btn-outline-primary" for="FreePeriod" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.timeFrame.period"></label>
 
                     <input
                         type="radio"
@@ -28,7 +26,7 @@
                         [checked]="timeFrame === TimeFrame.Day"
                         (click)="setTimeFrame(TimeFrame.Day)"
                     />
-                    <label class="btn btn-outline-primary" for="FreeDay">{{ 'artemisApp.forms.tutorialFreePeriodForm.timeFrame.day' | artemisTranslate }}</label>
+                    <label class="btn btn-outline-primary" for="FreeDay" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.timeFrame.day"></label>
 
                     <input
                         type="radio"
@@ -39,20 +37,20 @@
                         [checked]="timeFrame === TimeFrame.PeriodWithinDay"
                         (click)="setTimeFrame(TimeFrame.PeriodWithinDay)"
                     />
-                    <label class="btn btn-outline-primary" for="FreePeriodWithinDay">{{
-                        'artemisApp.forms.tutorialFreePeriodForm.timeFrame.periodWithinDay' | artemisTranslate
-                    }}</label>
+                    <label class="btn btn-outline-primary" for="FreePeriodWithinDay" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.timeFrame.periodWithinDay"></label>
                 </div>
 
                 <!-- Date -->
                 <div>
-                    <label class="form-label" for="startDate">
-                        {{
+                    <label
+                        class="form-label"
+                        for="startDate"
+                        [jhiTranslate]="
                             timeFrame !== TimeFrame.Period
-                                ? ('artemisApp.forms.tutorialFreePeriodForm.dateInput.label' | artemisTranslate)
-                                : ('artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStart' | artemisTranslate)
-                        }}
-                    </label>
+                                ? 'artemisApp.forms.tutorialFreePeriodForm.dateInput.label'
+                                : 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStart'
+                        "
+                    ></label>
                     <div class="input-group">
                         <input
                             name="startDate"
@@ -70,14 +68,12 @@
                         <owl-date-time [firstDayOfWeek]="1" datePickerInput [pickerType]="'calendar'" #startDatePicker [pickerMode]="'dialog'" />
                     </div>
                     @if (form.controls.startDate?.invalid && (form.controls.startDate?.dirty || form.controls.startDate?.touched) && form.controls.startDate?.errors?.required) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.requiredDateError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.requiredDateError"></div>
                     }
                 </div>
 
                 @if (timeFrame === TimeFrame.Period) {
-                    <label class="form-label" for="endDate">{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEnd' | artemisTranslate }}</label>
+                    <label class="form-label" for="endDate" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEnd"></label>
                     <div class="input-group">
                         <input
                             name="endDate"
@@ -95,21 +91,17 @@
                         <owl-date-time [firstDayOfWeek]="1" datePickerInput [pickerType]="'calendar'" #endDatePicker [pickerMode]="'dialog'" />
                     </div>
                     @if (form.controls.endDate?.invalid && (form.controls.endDate?.dirty || form.controls.endDate?.touched) && form.controls.endDate?.errors?.required) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.requiredEndDateError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.requiredEndDateError"></div>
                     } @else if (
                         form.controls.endDate?.touched &&
                         form.controls.startDate?.touched &&
                         (form.controls.endDate?.value | artemisDate: 'short-date' : false : timeZone) <=
                             (form.controls.startDate?.value | artemisDate: 'short-date' : false : timeZone)
                     ) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError"></div>
                     }
                 } @else if (timeFrame === TimeFrame.PeriodWithinDay) {
-                    <label class="form-label" for="startTime">{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime' | artemisTranslate }}</label>
+                    <label class="form-label" for="startTime" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime"></label>
                     <div class="input-group">
                         <input
                             name="startTime"
@@ -126,7 +118,7 @@
                         <owl-date-time timePickerInput [pickerType]="'timer'" #startTimePicker [pickerMode]="'dialog'" />
                     </div>
 
-                    <label class="form-label" for="endTime">{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime' | artemisTranslate }}</label>
+                    <label class="form-label" for="endTime" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime"></label>
                     <div class="input-group">
                         <input
                             name="endTime"
@@ -148,14 +140,12 @@
                         form.controls.startTime &&
                         (form.controls.endTime?.value | artemisDate: 'time' : false : timeZone) <= (form.controls.startTime?.value | artemisDate: 'time' : false : timeZone)
                     ) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.invalidEndDateError"></div>
                     }
                 }
                 <!-- Reason -->
                 <div class="form-group">
-                    <label for="reason">{{ 'artemisApp.forms.tutorialFreePeriodForm.reasonInput.label' | artemisTranslate }}</label>
+                    <label for="reason" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.reasonInput.label"></label>
                     <textarea
                         class="form-control"
                         id="reason"
@@ -164,15 +154,17 @@
                         [placeholder]="'artemisApp.forms.tutorialFreePeriodForm.reasonInput.placeholder' | artemisTranslate"
                     ></textarea>
                     @if (form.controls.reason?.invalid && (form.controls.reason?.dirty || (form.controls.reason?.touched && form.controls.reason?.errors?.maxlength))) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.forms.tutorialFreePeriodForm.reasonInput.maxLengthValidationError' | artemisTranslate: { max: '256' } }}
-                        </div>
+                        <div
+                            class="alert alert-danger"
+                            jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.reasonInput.maxLengthValidationError"
+                            [translateValues]="{ max: '256' }"
+                        ></div>
                     }
                 </div>
                 <div class="row mt-2">
                     <div class="col-12">
                         <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                            <span>{{ (isEditMode ? 'global.generic.edit' : 'global.generic.create') | artemisTranslate }}</span>
+                            <span jhiTranslate="{{ isEditMode ? 'global.generic.edit' : 'global.generic.create' }}"></span>
                         </button>
                     </div>
                 </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html
index 5b80e8513372..fca57919527d 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-period-row-buttons/tutorial-group-free-period-row-buttons.component.html
@@ -3,7 +3,7 @@
 
     <button type="button" [id]="'edit-' + tutorialFreePeriod.id" (click)="openEditFreePeriodDialog($event)" class="btn btn-warning btn-sm me-1">
         <fa-icon [icon]="faWrench" />
-        <span class="d-none d-md-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+        <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
     </button>
     <!-- Delete -->
     <button
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.html
index b7684866ba7c..1d142123bca5 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.html
@@ -3,19 +3,21 @@
         <div class="row">
             <div class="col-12">
                 <div class="d-flex justify-content-between">
-                    <h4>{{ 'artemisApp.pages.tutorialFreePeriodsManagement.title' | artemisTranslate }}</h4>
+                    <h4 jhiTranslate="artemisApp.pages.tutorialFreePeriodsManagement.title"></h4>
                     <div>
                         <button type="button" class="btn btn-primary" id="create-tutorial-free-day" (click)="openCreateFreePeriodDialog($event)">
                             <fa-icon [icon]="faPlus" />
-                            <span>{{ 'artemisApp.pages.tutorialFreePeriodsManagement.createFreePeriodButton' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.pages.tutorialFreePeriodsManagement.createFreePeriodButton"></span>
                         </button>
                     </div>
                 </div>
             </div>
             <div class="col-12 mb-2">
-                <div class="alert alert-info">
-                    {{ 'artemisApp.pages.tutorialFreePeriodsManagement.timeZoneExplanation' | artemisTranslate: { timeZone: course.timeZone } }}
-                </div>
+                <div
+                    class="alert alert-info"
+                    jhiTranslate="artemisApp.pages.tutorialFreePeriodsManagement.timeZoneExplanation"
+                    [translateValues]="{ timeZone: course.timeZone }"
+                ></div>
             </div>
 
             <!-- List of free Periods -->
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html
index 70611f9df79b..7c274032f21b 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component.html
@@ -3,12 +3,12 @@
     <table class="table table-sm table-hover">
         <thead>
             <tr>
-                <th class="col-1">{{ 'global.field.id' | artemisTranslate }}</th>
-                <th class="col-2">{{ 'artemisApp.entities.tutorialFreePeriod.startDate' | artemisTranslate }}</th>
-                <th class="col-2">{{ 'artemisApp.entities.tutorialFreePeriod.endDate' | artemisTranslate }}</th>
-                <th class="col-2">{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime' | artemisTranslate }}</th>
-                <th class="col-2">{{ 'artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime' | artemisTranslate }}</th>
-                <th class="col-2">{{ 'artemisApp.entities.tutorialFreePeriod.reason' | artemisTranslate }}</th>
+                <th class="col-1" jhiTranslate="global.field.id"></th>
+                <th class="col-2" jhiTranslate="artemisApp.entities.tutorialFreePeriod.startDate"></th>
+                <th class="col-2" jhiTranslate="artemisApp.entities.tutorialFreePeriod.endDate"></th>
+                <th class="col-2" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.labelStartTime"></th>
+                <th class="col-2" jhiTranslate="artemisApp.forms.tutorialFreePeriodForm.dateInput.labelEndTime"></th>
+                <th class="col-2" jhiTranslate="artemisApp.entities.tutorialFreePeriod.reason"></th>
                 <th class="col-1"></th>
             </tr>
         </thead>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html
index b2c5a5875541..a4637425d034 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/create-tutorial-group-session/create-tutorial-group-session.component.html
@@ -2,7 +2,7 @@
     @if (isInitialized) {
         <div>
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'artemisApp.pages.createTutorialSession.title' | artemisTranslate }}</h4>
+                <h4 class="modal-title" jhiTranslate="artemisApp.pages.createTutorialSession.title"></h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
             <div class="modal-body">
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html
index 41e95ab0fb46..bbd1add0ab9b 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/edit-tutorial-group-session/edit-tutorial-group-session.component.html
@@ -2,7 +2,7 @@
     @if (isInitialized) {
         <div>
             <div class="modal-header">
-                <h4 class="modal-title">{{ 'artemisApp.pages.editTutorialSession.title' | artemisTranslate }}</h4>
+                <h4 class="modal-title" jhiTranslate="artemisApp.pages.editTutorialSession.title"></h4>
                 <button type="button" class="btn-close" (click)="clear()"></button>
             </div>
             <div class="modal-body">
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html
index 818bd2dafafe..539ff442d0fe 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form/tutorial-group-session-form.component.html
@@ -1,15 +1,13 @@
 <div class="row">
     <div class="col-12 mb-2">
-        <div class="alert alert-info">
-            {{ 'artemisApp.generic.timeZone' | artemisTranslate: { timeZone } }}
-        </div>
+        <div class="alert alert-info" jhiTranslate="artemisApp.generic.timeZone" [translateValues]="{ timeZone }"></div>
     </div>
     <div class="col-12">
         @if (form) {
             <form class="row" [formGroup]="form" (ngSubmit)="submitForm()">
                 <!-- Date -->
                 <div>
-                    <label class="form-label" for="date">{{ 'artemisApp.forms.sessionForm.dateInput.label' | artemisTranslate }}</label>
+                    <label class="form-label" for="date" jhiTranslate="artemisApp.forms.sessionForm.dateInput.label"></label>
                     <div class="input-group">
                         <input formControlName="date" [owlDateTime]="date" class="d-none" />
                         <input
@@ -29,14 +27,10 @@
                     @if (dateControl?.invalid && (dateControl?.dirty || dateControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (dateControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.dateInput.requiredDateError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.dateInput.requiredDateError"></div>
                             }
                             @if (dateControl?.errors?.owlDateTimeParse) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.dateInput.parseError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.dateInput.parseError"></div>
                             }
                         </div>
                     }
@@ -45,13 +39,13 @@
                 <div>
                     <div class="row">
                         <div class="col-auto my-auto">
-                            <span>{{ 'artemisApp.forms.sessionForm.timeInput.from' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.forms.sessionForm.timeInput.from"></span>
                         </div>
                         <div class="col-auto">
                             <ngb-timepicker formControlName="startTime" [hourStep]="1" [minuteStep]="15" />
                         </div>
                         <div class="col-auto my-auto">
-                            <span>{{ 'artemisApp.forms.sessionForm.timeInput.to' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.forms.sessionForm.timeInput.to"></span>
                         </div>
                         <div class="col-auto my-auto">
                             <ngb-timepicker formControlName="endTime" [hourStep]="1" [minuteStep]="15" />
@@ -60,34 +54,28 @@
                     @if (startTimeControl?.invalid && (startTimeControl?.dirty || startTimeControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (startTimeControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.timeInput.invalidTimeRange"></div>
                             }
                         </div>
                     }
                     @if (endTimeControl?.invalid && (endTimeControl?.dirty || endTimeControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (endTimeControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.timeInput.invalidTimeRange"></div>
                             }
                         </div>
                     }
                     @if (form?.invalid && (form?.dirty || form?.touched)) {
                         <div>
                             @if (form?.errors?.invalidTimeRange) {
-                                <div class="alert alert-danger">
-                                    {{ 'artemisApp.forms.sessionForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                                </div>
+                                <div class="alert alert-danger" jhiTranslate="artemisApp.forms.sessionForm.timeInput.invalidTimeRange"></div>
                             }
                         </div>
                     }
                 </div>
                 <!-- Location -->
                 <div class="form-group">
-                    <label for="location">{{ 'artemisApp.forms.sessionForm.locationInput.labelOnline' | artemisTranslate }}</label>
+                    <label for="location" jhiTranslate="artemisApp.forms.sessionForm.locationInput.labelOnline"></label>
                     <textarea
                         class="form-control"
                         id="location"
@@ -98,14 +86,10 @@
                     @if (locationControl?.invalid && (locationControl?.dirty || locationControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (locationControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.locationInput.maxLengthValidationError' | artemisTranslate: { max: '2000' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.locationInput.maxLengthValidationError" [translateValues]="{ max: '2000' }"></div>
                             }
                             @if (locationControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.sessionForm.locationInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.sessionForm.locationInput.requiredValidationError"></div>
                             }
                         </div>
                     }
@@ -113,7 +97,7 @@
                 <div class="row mt-2">
                     <div class="col-12">
                         <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                            <span>{{ (isEditMode ? 'global.generic.edit' : 'global.generic.create') | artemisTranslate }}</span>
+                            <span jhiTranslate="{{ isEditMode ? 'global.generic.edit' : 'global.generic.create' }}"></span>
                         </button>
                     </div>
                 </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/cancellation-modal/cancellation-modal.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/cancellation-modal/cancellation-modal.component.html
index 84fedb444ecc..ec98d14c41ee 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/cancellation-modal/cancellation-modal.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/cancellation-modal/cancellation-modal.component.html
@@ -21,16 +21,15 @@ <h4 class="modal-title">
     @if (tutorialGroupSession.status === tutorialGroupSessionStatus.ACTIVE) {
         <form [formGroup]="form">
             <div class="form-group">
-                <label for="reason">{{ 'artemisApp.pages.tutorialGroupSessionManagement.cancelActivateModal.cancelSession.explanation' | artemisTranslate }}</label>
+                <label for="reason" jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.cancelActivateModal.cancelSession.explanation"></label>
                 <textarea class="form-control" id="reason" rows="2" formControlName="reason"></textarea>
                 @if (reasonControl?.invalid && (reasonControl?.dirty || reasonControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (reasonControl?.errors?.maxlength) {
-                            <div>
-                                {{
-                                    'artemisApp.pages.tutorialGroupSessionManagement.cancelActivateModal.cancelSession.maxLengthValidationError' | artemisTranslate: { max: '256' }
-                                }}
-                            </div>
+                            <div
+                                jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.cancelActivateModal.cancelSession.maxLengthValidationError"
+                                [translateValues]="{ max: '256' }"
+                            ></div>
                         }
                     </div>
                 }
@@ -39,8 +38,13 @@ <h4 class="modal-title">
     }
 </div>
 <div class="modal-footer">
-    <button id="dismiss-button" type="button" class="btn btn-outline-secondary" (click)="activeModal.dismiss()">{{ 'global.form.cancel' | artemisTranslate }}</button>
-    <button id="cancel-activate-button" type="button" class="btn btn-success" (click)="cancelOrActivate()" [disabled]="!isSubmitPossible">
-        {{ 'global.form.confirm' | artemisTranslate }}
-    </button>
+    <button id="dismiss-button" type="button" class="btn btn-outline-secondary" (click)="activeModal.dismiss()" jhiTranslate="global.form.cancel"></button>
+    <button
+        id="cancel-activate-button"
+        type="button"
+        class="btn btn-success"
+        (click)="cancelOrActivate()"
+        [disabled]="!isSubmitPossible"
+        jhiTranslate="global.form.confirm"
+    ></button>
 </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html
index 1552c89a7b4a..1ecd4247b138 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-session-row-buttons/tutorial-group-session-row-buttons.component.html
@@ -13,7 +13,7 @@
     <!-- Edit -->
     <button type="button" [id]="'edit-' + tutorialGroupSession.id" (click)="openEditSessionDialog($event)" class="btn btn-warning btn-sm me-1">
         <fa-icon [icon]="faWrench" />
-        <span class="d-none d-md-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+        <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
     </button>
     <!-- Delete -->
     <button
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-sessions-management.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-sessions-management.component.html
index eac33e8856c9..d2b64825b2bc 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-sessions-management.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/tutorial-group-sessions-management/tutorial-group-sessions-management.component.html
@@ -9,7 +9,7 @@ <h4>{{ 'artemisApp.pages.tutorialGroupSessionManagement.title' | artemisTranslat
                 <div class="col-12" class="modal-body">
                     <!-- Schedule -->
                     <dt>
-                        <span>{{ 'artemisApp.entities.tutorialGroup.schedule' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.entities.tutorialGroup.schedule"></span>
                     </dt>
                     <dd>
                         @if (tutorialGroup.tutorialGroupSchedule) {
@@ -22,10 +22,10 @@ <h4>{{ 'artemisApp.pages.tutorialGroupSessionManagement.title' | artemisTranslat
                             }}</span>
                             <br />
                             @if (tutorialGroup.isOnline) {
-                                <span>{{ 'artemisApp.forms.scheduleForm.locationInput.labelOnline' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.forms.scheduleForm.locationInput.labelOnline"></span>
                             }
                             @if (!tutorialGroup.isOnline) {
-                                <span>{{ 'artemisApp.forms.scheduleForm.locationInput.labelOffline' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.forms.scheduleForm.locationInput.labelOffline"></span>
                             }
                             : {{ tutorialGroup.tutorialGroupSchedule?.location }}
                             <br />
@@ -38,7 +38,7 @@ <h4>{{ 'artemisApp.pages.tutorialGroupSessionManagement.title' | artemisTranslat
                                 }}
                             </span>
                         } @else {
-                            <span>{{ 'artemisApp.pages.tutorialGroupDetail.scheduleNotSet' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.pages.tutorialGroupDetail.scheduleNotSet"></span>
                         }
                         <br />
                     </dd>
@@ -47,7 +47,7 @@ <h4>{{ 'artemisApp.pages.tutorialGroupSessionManagement.title' | artemisTranslat
             <div class="my-2">
                 <button type="button" id="create-session-button" class="btn btn-primary" (click)="openCreateSessionDialog($event)">
                     <fa-icon [icon]="faPlus" />
-                    <span>{{ 'artemisApp.pages.tutorialGroupSessionManagement.createSessionButton' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.pages.tutorialGroupSessionManagement.createSessionButton"></span>
                 </button>
             </div>
             <div class="scrollbar table-wrapper-scroll-y border border-lightgrey p-3 modal-body">
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html
index b1927166f463..0f537556c16a 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component.html
@@ -2,39 +2,33 @@
     @if (course) {
         <div class="row">
             <div class="col-12">
-                <h1>{{ 'artemisApp.pages.checklist.title' | artemisTranslate }}</h1>
-                <p>
-                    {{ 'artemisApp.pages.checklist.explanation' | artemisTranslate }}
-                </p>
+                <h1 jhiTranslate="artemisApp.pages.checklist.title"></h1>
+                <p jhiTranslate="artemisApp.pages.checklist.explanation"></p>
             </div>
             <hr />
             <div class="col-12">
-                <p>{{ 'artemisApp.pages.checklist.timeZoneExplanation' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.pages.checklist.timeZoneExplanation"></p>
                 <div>
                     <jhi-checklist-check id="timeZone" [checkAttribute]="isTimeZoneConfigured" />
-                    <label class="form-check-label pe-4" for="timeZone">
-                        {{ 'artemisApp.pages.checklist.timeZone' | artemisTranslate }}
-                    </label>
+                    <label class="form-check-label pe-4" for="timeZone" jhiTranslate="artemisApp.pages.checklist.timeZone"></label>
                     <a [routerLink]="['/course-management', course.id!, 'edit']" class="btn btn-warning btn-md my-2">
-                        <fa-icon [icon]="faWrench" />&nbsp;<span>{{ 'artemisApp.pages.checklist.editCourse' | artemisTranslate }}</span>
+                        <fa-icon [icon]="faWrench" />&nbsp;<span jhiTranslate="artemisApp.pages.checklist.editCourse"></span>
                     </a>
                 </div>
             </div>
             <hr />
             <div class="col-12">
-                <p>{{ 'artemisApp.pages.checklist.configurationExplanation' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.pages.checklist.configurationExplanation"></p>
                 <table>
                     <jhi-checklist-check id="configuration" [checkAttribute]="isTutorialGroupConfigurationCreated" />
-                    <label class="form-check-label pe-4" for="configuration">
-                        {{ 'artemisApp.pages.checklist.configuration' | artemisTranslate }}
-                    </label>
+                    <label class="form-check-label pe-4" for="configuration" jhiTranslate="artemisApp.pages.checklist.configuration"></label>
                     @if (isTutorialGroupConfigurationCreated) {
                         <a
                             [routerLink]="['/course-management', course.id!, 'tutorial-groups', 'configuration', course.tutorialGroupsConfiguration!.id!, 'edit']"
                             class="btn btn-primary btn-md my-2"
                             [class.disabled]="!isTimeZoneConfigured"
                         >
-                            <fa-icon [icon]="faPlus" />&nbsp;<span>{{ 'artemisApp.pages.tutorialGroupsManagement.editConfigurationButton' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faPlus" />&nbsp;<span jhiTranslate="artemisApp.pages.tutorialGroupsManagement.editConfigurationButton"></span>
                         </a>
                     }
                     @if (!isTutorialGroupConfigurationCreated) {
@@ -43,7 +37,7 @@ <h1>{{ 'artemisApp.pages.checklist.title' | artemisTranslate }}</h1>
                             class="btn btn-primary btn-md my-2"
                             [class.disabled]="!isTimeZoneConfigured"
                         >
-                            <fa-icon [icon]="faPlus" />&nbsp;<span>{{ 'artemisApp.pages.checklist.createConfiguration' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faPlus" />&nbsp;<span jhiTranslate="artemisApp.pages.checklist.createConfiguration"></span>
                         </a>
                     }
                 </table>
@@ -51,7 +45,7 @@ <h1>{{ 'artemisApp.pages.checklist.title' | artemisTranslate }}</h1>
             <hr />
             <div class="col-12">
                 <button [routerLink]="['/course-management', course.id!, 'tutorial-groups']" class="btn btn-primary btn-md my-2" [disabled]="!isFullyConfigured">
-                    <span>{{ 'artemisApp.pages.checklist.continueToManagement' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.pages.checklist.continueToManagement"></span>
                 </button>
             </div>
         </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html
index 8ff2c70883d0..57d838855af1 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/create-tutorial-groups-configuration/create-tutorial-groups-configuration.component.html
@@ -1,7 +1,5 @@
 <jhi-loading-indicator-container [isLoading]="isLoading">
-    <h3>{{ 'artemisApp.pages.createTutorialGroupsConfiguration.title' | artemisTranslate }}</h3>
-    <div class="alert alert-info" role="alert">
-        {{ 'artemisApp.pages.createTutorialGroupsConfiguration.explanation' | artemisTranslate }}
-    </div>
+    <h3 jhiTranslate="artemisApp.pages.createTutorialGroupsConfiguration.title"></h3>
+    <div class="alert alert-info" role="alert" jhiTranslate="artemisApp.pages.createTutorialGroupsConfiguration.explanation"></div>
     <jhi-tutorial-groups-configuration-form [isEditMode]="false" (formSubmitted)="createTutorialsGroupConfiguration($event)" [course]="course" />
 </jhi-loading-indicator-container>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html
index 9bd9a4cf4b68..383e1f597c22 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/edit-tutorial-groups-configuration/edit-tutorial-groups-configuration.component.html
@@ -1,4 +1,4 @@
 <jhi-loading-indicator-container [isLoading]="isLoading">
-    <h3>{{ 'artemisApp.pages.editTutorialGroupsConfiguration.title' | artemisTranslate }}</h3>
+    <h3 jhiTranslate="artemisApp.pages.editTutorialGroupsConfiguration.title"></h3>
     <jhi-tutorial-groups-configuration-form [formData]="formData" [isEditMode]="true" (formSubmitted)="updateTutorialGroupsConfiguration($event)" [course]="course" />
 </jhi-loading-indicator-container>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html
index 5f942391994b..981804efb514 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form/tutorial-groups-configuration-form.component.html
@@ -4,7 +4,7 @@
             <form class="row" [formGroup]="form" (ngSubmit)="submitForm()">
                 <!-- Period -->
                 <div class="col-auto">
-                    <label class="form-label" for="period">{{ 'artemisApp.forms.configurationForm.periodInput.label' | artemisTranslate }}</label>
+                    <label class="form-label" for="period" jhiTranslate="artemisApp.forms.configurationForm.periodInput.label"></label>
                     <div class="input-group">
                         <input
                             name="period"
@@ -23,25 +23,17 @@
                         </button>
                         <owl-date-time [firstDayOfWeek]="1" [pickerType]="'calendar'" #period />
                     </div>
-                    <div class="form-text">
-                        {{ 'artemisApp.forms.configurationForm.periodInput.explanation' | artemisTranslate }}
-                    </div>
+                    <div class="form-text" jhiTranslate="artemisApp.forms.configurationForm.periodInput.explanation"></div>
                     @if (periodControl?.invalid && (periodControl?.dirty || periodControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (periodControl?.errors?.owlRequiredDateTimeRange || periodControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.configurationForm.periodInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.configurationForm.periodInput.requiredValidationError"></div>
                             }
                             @if (periodControl?.errors?.owlDateTimeParse) {
-                                <div>
-                                    {{ 'artemisApp.forms.configurationForm.periodInput.parseError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.configurationForm.periodInput.parseError"></div>
                             }
                             @if (periodControl?.errors?.owlDateTimeRange) {
-                                <div>
-                                    {{ 'artemisApp.forms.configurationForm.periodInput.invalidRangeError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.configurationForm.periodInput.invalidRangeError"></div>
                             }
                         </div>
                     }
@@ -49,41 +41,46 @@
                     <div [hidden]="!isMessagingEnabled(course)">
                         <div class="form-check">
                             <input class="form-check-input" type="checkbox" formControlName="useTutorialGroupChannels" id="useTutorialGroupChannels" />
-                            <label class="form-check-label" for="useTutorialGroupChannels">
-                                {{ 'artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.label' | artemisTranslate }}
-                            </label>
-                            <small id="channelHelp" class="form-text text-body-secondary d-block">{{
-                                'artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.explanation' | artemisTranslate
-                            }}</small>
+                            <label
+                                class="form-check-label"
+                                for="useTutorialGroupChannels"
+                                jhiTranslate="artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.label"
+                            ></label>
+                            <small
+                                id="channelHelp"
+                                class="form-text text-body-secondary d-block"
+                                jhiTranslate="artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.explanation"
+                            ></small>
                             @if (showChannelDeletionWarning) {
-                                <div class="alert alert-danger" role="alert" id="channelDeletionWarning">
-                                    {{ 'artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.channelDeletionWarning' | artemisTranslate }}
-                                </div>
+                                <div
+                                    class="alert alert-danger"
+                                    role="alert"
+                                    id="channelDeletionWarning"
+                                    jhiTranslate="artemisApp.forms.configurationForm.useTutorialGroupChannelsInput.channelDeletionWarning"
+                                ></div>
                             }
                         </div>
                         <!--Public Channel / Private Channel -->
                         <div class="form-group" [hidden]="!useTutorialGroupChannelsControl?.value">
-                            <label class="d-block">{{ 'artemisApp.dialogs.createChannel.channelForm.isPublicInput.label' | artemisTranslate }}</label>
+                            <label class="d-block" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.label"></label>
                             <div class="btn-group" role="group">
                                 <input formControlName="usePublicTutorialGroupChannels" type="radio" class="btn-check" id="public" autocomplete="off" checked [value]="true" />
-                                <label class="btn btn-outline-secondary" for="public">{{
-                                    'artemisApp.dialogs.createChannel.channelForm.isPublicInput.public' | artemisTranslate
-                                }}</label>
+                                <label class="btn btn-outline-secondary" for="public" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.public"></label>
                                 <input formControlName="usePublicTutorialGroupChannels" type="radio" class="btn-check" id="private" autocomplete="off" [value]="false" />
-                                <label class="btn btn-outline-secondary" for="private">{{
-                                    'artemisApp.dialogs.createChannel.channelForm.isPublicInput.private' | artemisTranslate
-                                }}</label>
+                                <label class="btn btn-outline-secondary" for="private" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.private"></label>
                             </div>
-                            <small id="isPublicHelp" class="form-text text-body-secondary d-block">{{
-                                'artemisApp.dialogs.createChannel.channelForm.isPublicInput.explanation' | artemisTranslate
-                            }}</small>
+                            <small
+                                id="isPublicHelp"
+                                class="form-text text-body-secondary d-block"
+                                jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.explanation"
+                            ></small>
                         </div>
                     </div>
                 </div>
                 <div class="row mt-2">
                     <div class="col-12">
                         <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                            <span>{{ (isEditMode ? 'global.generic.edit' : 'global.generic.create') | artemisTranslate }}</span>
+                            <span jhiTranslate="{{ isEditMode ? 'global.generic.edit' : 'global.generic.create' }}"></span>
                         </button>
                     </div>
                 </div>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-management.module.ts b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-management.module.ts
index b649aa9613ee..257ea19ddd8d 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-management.module.ts
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-management.module.ts
@@ -38,6 +38,8 @@ import { TutorialGroupsChecklistComponent } from './tutorial-groups-checklist/tu
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { TutorialGroupFreePeriodsTableComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component';
 import { TutorialGroupsExportButtonComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-export-button.component/tutorial-groups-export-button.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
+
 @NgModule({
     imports: [
         RouterModule.forChild(tutorialGroupManagementRoutes),
@@ -50,6 +52,7 @@ import { TutorialGroupsExportButtonComponent } from 'app/course/tutorial-groups/
         ArtemisTutorialGroupsSharedModule,
         ArtemisSidePanelModule,
         ArtemisSharedComponentModule,
+        ArtemisMarkdownEditorModule,
     ],
     declarations: [
         TutorialGroupsManagementComponent,
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html
index 25250488c664..9dd9e8d60e8e 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/create-tutorial-group/create-tutorial-group.component.html
@@ -1,5 +1,5 @@
 <jhi-loading-indicator-container [isLoading]="isLoading">
-    <h3>{{ 'artemisApp.pages.createTutorialGroup.title' | artemisTranslate }}</h3>
+    <h3 jhiTranslate="artemisApp.pages.createTutorialGroup.title"></h3>
     @if (course) {
         <jhi-tutorial-group-form [isEditMode]="false" [course]="course" (formSubmitted)="createTutorialGroup($event)" />
     }
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html
index a6e1ba53502d..47c46d6b6a74 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/edit-tutorial-group/edit-tutorial-group.component.html
@@ -1,5 +1,5 @@
 <jhi-loading-indicator-container [isLoading]="isLoading">
-    <h3>{{ 'artemisApp.pages.editTutorialGroup.title' | artemisTranslate }}</h3>
+    <h3 jhiTranslate="artemisApp.pages.editTutorialGroup.title"></h3>
     @if (course) {
         <jhi-tutorial-group-form [formData]="formData" [course]="course" [isEditMode]="true" (formSubmitted)="updateTutorialGroup($event)" />
     }
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html
index 53c16975f8cb..997d0116c9b9 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/schedule-form/schedule-form.component.html
@@ -1,38 +1,32 @@
 <ng-container [formGroup]="parentFormGroup">
     <div formGroupName="schedule" style="border: 0">
         <div>
-            <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
+            <h3 jhiTranslate="artemisApp.forms.scheduleForm.formTitle"></h3>
         </div>
         <div>
             <!-- repetition frequency -->
-            <label for="repetitionFrequency">{{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.label' | artemisTranslate }}</label>
+            <label for="repetitionFrequency" jhiTranslate="artemisApp.forms.scheduleForm.repetitionFrequencyInput.label"></label>
             <div class="input-group small-input">
                 <input id="repetitionFrequency" type="number" class="form-control" formControlName="repetitionFrequency" />
-                <div class="input-group-text">{{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.weeks' | artemisTranslate }}</div>
+                <div class="input-group-text" jhiTranslate="artemisApp.forms.scheduleForm.repetitionFrequencyInput.weeks"></div>
             </div>
             @if (repetitionFrequencyControl?.invalid && (repetitionFrequencyControl?.dirty || repetitionFrequencyControl?.touched)) {
                 <div class="alert alert-danger">
                     @if (repetitionFrequencyControl?.errors?.min) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.minValidationError' | artemisTranslate: { min: 1 } }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.repetitionFrequencyInput.minValidationError" [translateValues]="{ min: 1 }"></div>
                     }
                     @if (repetitionFrequencyControl?.errors?.max) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.maxValidationError' | artemisTranslate: { max: 7 } }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.repetitionFrequencyInput.maxValidationError" [translateValues]="{ max: 7 }"></div>
                     }
                     @if (repetitionFrequencyControl?.errors?.required) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.repetitionFrequencyInput.requiredValidationError' | artemisTranslate }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.repetitionFrequencyInput.requiredValidationError"></div>
                     }
                 </div>
             }
             <!-- weekday -->
             <div>
                 <div>
-                    <label> {{ 'artemisApp.forms.scheduleForm.weekDayInput.label' | artemisTranslate }}</label>
+                    <label jhiTranslate="artemisApp.forms.scheduleForm.weekDayInput.label"></label>
                 </div>
                 @for (weekDay of weekDays; track weekDay) {
                     <input formControlName="dayOfWeek" type="radio" class="btn-check" name="dayOfWeek" id="{{ weekDay.id }}" autocomplete="off" [value]="weekDay.value" checked />
@@ -43,13 +37,13 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
             <div>
                 <div class="row">
                     <div class="col-auto my-auto">
-                        <span>{{ 'artemisApp.forms.scheduleForm.timeInput.from' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.forms.scheduleForm.timeInput.from"></span>
                     </div>
                     <div class="col-auto">
                         <ngb-timepicker formControlName="startTime" [hourStep]="1" [minuteStep]="15" />
                     </div>
                     <div class="col-auto my-auto">
-                        <span>{{ 'artemisApp.forms.scheduleForm.timeInput.to' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.forms.scheduleForm.timeInput.to"></span>
                     </div>
                     <div class="col-auto my-auto">
                         <ngb-timepicker formControlName="endTime" [hourStep]="1" [minuteStep]="15" />
@@ -58,27 +52,21 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
                 @if (startTimeControl?.invalid && (startTimeControl?.dirty || startTimeControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (startTimeControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.forms.scheduleForm.timeInput.invalidTimeRange"></div>
                         }
                     </div>
                 }
                 @if (endTimeControl?.invalid && (endTimeControl?.dirty || endTimeControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (endTimeControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.forms.scheduleForm.timeInput.invalidTimeRange"></div>
                         }
                     </div>
                 }
                 @if (formGroup?.invalid && (formGroup?.dirty || formGroup?.touched)) {
                     <div>
                         @if (formGroup?.errors?.invalidTimeRange) {
-                            <div class="alert alert-danger">
-                                {{ 'artemisApp.forms.scheduleForm.timeInput.invalidTimeRange' | artemisTranslate }}
-                            </div>
+                            <div class="alert alert-danger" jhiTranslate="artemisApp.forms.scheduleForm.timeInput.invalidTimeRange"></div>
                         }
                     </div>
                 }
@@ -87,10 +75,10 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
         <!-- Location -->
         <div class="form-group">
             @if (parentIsOnlineControl!.value) {
-                <label for="location">{{ 'artemisApp.forms.scheduleForm.locationInput.labelOnline' | artemisTranslate }}</label>
+                <label for="location" jhiTranslate="artemisApp.forms.scheduleForm.locationInput.labelOnline"></label>
             }
             @if (!parentIsOnlineControl!.value) {
-                <label for="location">{{ 'artemisApp.forms.scheduleForm.locationInput.labelOffline' | artemisTranslate }}</label>
+                <label for="location" jhiTranslate="artemisApp.forms.scheduleForm.locationInput.labelOffline"></label>
             }
             <textarea
                 class="form-control"
@@ -107,14 +95,10 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
             @if (locationControl?.invalid && (locationControl?.dirty || locationControl?.touched)) {
                 <div class="alert alert-danger">
                     @if (locationControl?.errors?.maxlength) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.locationInput.maxLengthValidationError' | artemisTranslate: { max: '2000' } }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.locationInput.maxLengthValidationError" [translateValues]="{ max: '2000' }"></div>
                     }
                     @if (locationControl?.errors?.required) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.locationInput.requiredValidationError' | artemisTranslate }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.locationInput.requiredValidationError"></div>
                     }
                 </div>
             }
@@ -122,11 +106,9 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
         <!-- Period -->
         <div>
             @if (defaultPeriodChanged) {
-                <div class="alert alert-warning" role="alert">
-                    {{ 'artemisApp.forms.scheduleForm.periodInput.periodWarning' | artemisTranslate }}
-                </div>
+                <div class="alert alert-warning" role="alert" jhiTranslate="artemisApp.forms.scheduleForm.periodInput.periodWarning"></div>
             }
-            <label class="form-label" for="period">{{ 'artemisApp.forms.scheduleForm.periodInput.label' | artemisTranslate }}</label>
+            <label class="form-label" for="period" jhiTranslate="artemisApp.forms.scheduleForm.periodInput.label"></label>
             <div class="input-group">
                 <input formControlName="period" [owlDateTime]="period" class="d-none" [selectMode]="'range'" />
                 <input
@@ -146,21 +128,17 @@ <h3>{{ 'artemisApp.forms.scheduleForm.formTitle' | artemisTranslate }}</h3>
             @if (periodControl?.invalid && (periodControl?.dirty || periodControl?.touched)) {
                 <div class="alert alert-danger">
                     @if (periodControl?.errors?.owlRequiredDateTimeRange || periodControl?.errors?.required) {
-                        <div>
-                            {{ 'artemisApp.createConfiguration.periodInput.requiredValidationError' | artemisTranslate }}
-                        </div>
+                        <div jhiTranslate="artemisApp.createConfiguration.periodInput.requiredValidationError"></div>
                     }
                     @if (periodControl?.errors?.owlDateTimeRange) {
-                        <div>
-                            {{ 'artemisApp.forms.scheduleForm.periodInput.invalidRangeError' | artemisTranslate }}
-                        </div>
+                        <div jhiTranslate="artemisApp.forms.scheduleForm.periodInput.invalidRangeError"></div>
                     }
                 </div>
             }
         </div>
         @if (createdSessions.length > 0) {
             <div>
-                <span>{{ 'artemisApp.forms.scheduleForm.sessionCreationInfo' | artemisTranslate }} </span>
+                <span jhiTranslate="artemisApp.forms.scheduleForm.sessionCreationInfo"></span>
                 @for (session of createdSessions; track session) {
                     <span class="badge bg-info m-1"> {{ session | artemisDate: 'long-date' : false : undefined : true }} </span>
                 }
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/tutorial-group-form.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/tutorial-group-form.component.html
index da0d1924c09d..881abff7acd5 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/tutorial-group-form.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form/tutorial-group-form.component.html
@@ -4,7 +4,7 @@
             <form [formGroup]="form" (ngSubmit)="submitForm()">
                 <!-- Title -->
                 <div class="form-group">
-                    <label class="required" for="title">{{ 'artemisApp.forms.tutorialGroupForm.titleInput.label' | artemisTranslate }}</label>
+                    <label class="required" for="title" jhiTranslate="artemisApp.forms.tutorialGroupForm.titleInput.label"></label>
                     <input
                         type="text"
                         class="form-control"
@@ -15,19 +15,13 @@
                     @if (titleControl?.invalid && (titleControl?.dirty || titleControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (titleControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.titleInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.titleInput.requiredValidationError"></div>
                             }
                             @if (titleControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.titleInput.maxLengthValidationError' | artemisTranslate: { max: '19' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.titleInput.maxLengthValidationError" [translateValues]="{ max: '19' }"></div>
                             }
                             @if (!titleControl?.errors?.required && !titleControl?.errors?.maxlength && titleControl?.errors?.pattern) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.titleInput.regexValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.titleInput.regexValidationError"></div>
                             }
                         </div>
                     }
@@ -35,27 +29,31 @@
                 @if (updateTutorialGroupChannelNameControl) {
                     <div class="form-check" [hidden]="!showUpdateChannelNameCheckbox">
                         <input class="form-check-input" type="checkbox" formControlName="updateTutorialGroupChannelName" id="updateTutorialGroupChannelNameControl" />
-                        <label class="form-check-label" for="updateTutorialGroupChannelNameControl">
-                            {{ 'artemisApp.forms.tutorialGroupForm.updateChannelNameInput.label' | artemisTranslate }}
-                        </label>
-                        <small id="updateChannelNameHelp" class="form-text text-body-secondary d-block">{{
-                            'artemisApp.forms.tutorialGroupForm.updateChannelNameInput.explanation' | artemisTranslate
-                        }}</small>
+                        <label
+                            class="form-check-label"
+                            for="updateTutorialGroupChannelNameControl"
+                            jhiTranslate="artemisApp.forms.tutorialGroupForm.updateChannelNameInput.label"
+                        ></label>
+                        <small
+                            id="updateChannelNameHelp"
+                            class="form-text text-body-secondary d-block"
+                            jhiTranslate="artemisApp.forms.tutorialGroupForm.updateChannelNameInput.explanation"
+                        ></small>
                     </div>
                 }
                 <!--Online / Offline -->
                 <div class="form-group">
-                    <label class="d-block">{{ 'artemisApp.forms.tutorialGroupForm.isOnlineInput.label' | artemisTranslate }}</label>
+                    <label class="d-block" jhiTranslate="artemisApp.forms.tutorialGroupForm.isOnlineInput.label"></label>
                     <div class="btn-group" role="group">
                         <input formControlName="isOnline" type="radio" class="btn-check" id="online" autocomplete="off" checked [value]="true" />
-                        <label class="btn btn-outline-primary" for="online">{{ 'artemisApp.generic.online' | artemisTranslate }}</label>
+                        <label class="btn btn-outline-primary" for="online" jhiTranslate="artemisApp.generic.online"></label>
                         <input formControlName="isOnline" type="radio" class="btn-check" id="offline" autocomplete="off" [value]="false" />
-                        <label class="btn btn-outline-primary" for="offline">{{ 'artemisApp.generic.offline' | artemisTranslate }}</label>
+                        <label class="btn btn-outline-primary" for="offline" jhiTranslate="artemisApp.generic.offline"></label>
                     </div>
                 </div>
                 <!-- Teaching Assistant -->
                 <div class="form-group">
-                    <label class="required" for="teachingAssistant">{{ 'artemisApp.forms.tutorialGroupForm.teachingAssistantInput.label' | artemisTranslate }}</label>
+                    <label class="required" for="teachingAssistant" jhiTranslate="artemisApp.forms.tutorialGroupForm.teachingAssistantInput.label"></label>
                     <input
                         id="teachingAssistant"
                         type="text"
@@ -70,20 +68,18 @@
                         (focus)="taFocus$.next($any($event).target.value)"
                         (click)="taClick$.next($any($event).target.value)"
                     />
-                    <small id="taHelp" class="form-text text-body-secondary">{{ 'artemisApp.forms.tutorialGroupForm.teachingAssistantInput.taHelp' | artemisTranslate }}</small>
+                    <small id="taHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.forms.tutorialGroupForm.teachingAssistantInput.taHelp"></small>
                     @if (teachingAssistantControl?.invalid && (teachingAssistantControl?.dirty || teachingAssistantControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (teachingAssistantControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.teachingAssistantInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.teachingAssistantInput.requiredValidationError"></div>
                             }
                         </div>
                     }
                 </div>
                 <!-- Campus -->
                 <div class="form-group">
-                    <label for="campus">{{ 'artemisApp.forms.tutorialGroupForm.campusInput.label' | artemisTranslate }}</label>
+                    <label for="campus" jhiTranslate="artemisApp.forms.tutorialGroupForm.campusInput.label"></label>
                     <input
                         id="campus"
                         type="text"
@@ -98,13 +94,11 @@
                         (focus)="campusFocus$.next($any($event).target.value)"
                         (click)="campusClick$.next($any($event).target.value)"
                     />
-                    <small id="campusHelp" class="form-text text-body-secondary">{{ 'artemisApp.forms.tutorialGroupForm.campusInput.campusHelp' | artemisTranslate }}</small>
+                    <small id="campusHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.forms.tutorialGroupForm.campusInput.campusHelp"></small>
                     @if (campusControl?.invalid && (campusControl?.dirty || campusControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (campusControl?.errors?.max) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.campusInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.campusInput.maxLengthValidationError" [translateValues]="{ max: '255' }"></div>
                             }
                         </div>
                     }
@@ -112,16 +106,16 @@
                 <!-- Capacity -->
                 <div class="row">
                     <div class="col-auto">
-                        <label for="capacity">{{ 'artemisApp.forms.tutorialGroupForm.capacityInput.label' | artemisTranslate }}</label>
+                        <label for="capacity" jhiTranslate="artemisApp.forms.tutorialGroupForm.capacityInput.label"></label>
                         <div class="input-group">
                             <input id="capacity" type="number" class="form-control" formControlName="capacity" />
-                            <div class="input-group-text">{{ 'artemisApp.forms.tutorialGroupForm.capacityInput.unit' | artemisTranslate }}</div>
+                            <div class="input-group-text" jhiTranslate="artemisApp.forms.tutorialGroupForm.capacityInput.unit"></div>
                         </div>
                     </div>
                 </div>
                 <!-- Language -->
                 <div class="form-group">
-                    <label for="language">{{ 'artemisApp.forms.tutorialGroupForm.languageInput.label' | artemisTranslate }}</label>
+                    <label for="language" jhiTranslate="artemisApp.forms.tutorialGroupForm.languageInput.label"></label>
                     <input
                         id="language"
                         type="text"
@@ -136,54 +130,44 @@
                         (focus)="languageFocus$.next($any($event).target.value)"
                         (click)="languageClick$.next($any($event).target.value)"
                     />
-                    <small id="languageHelp" class="form-text text-body-secondary">{{ 'artemisApp.forms.tutorialGroupForm.languageInput.languageHelp' | artemisTranslate }}</small>
+                    <small id="languageHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.forms.tutorialGroupForm.languageInput.languageHelp"></small>
                 </div>
                 <!-- Validation Errors for the smaller input from above-->
                 <div class="form-group">
                     @if (capacityControl?.invalid && (capacityControl?.dirty || capacityControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (capacityControl?.errors?.min) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.capacityInput.minValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.capacityInput.minValidationError"></div>
                             }
                         </div>
                     }
                     @if (languageControl?.invalid && (languageControl?.dirty || languageControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (languageControl?.errors?.max) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.languageInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.languageInput.maxLengthValidationError" [translateValues]="{ max: '255' }"></div>
                             }
                             @if (languageControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.forms.tutorialGroupForm.languageInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.forms.tutorialGroupForm.languageInput.requiredValidationError"></div>
                             }
                         </div>
                     }
                 </div>
                 <!-- Additional Information -->
                 <div class="form-group">
-                    <label class="d-block" for="additionalInfo">{{ 'artemisApp.forms.tutorialGroupForm.additionalInformationInput.label' | artemisTranslate }}</label>
+                    <label class="d-block" for="additionalInfo" jhiTranslate="artemisApp.forms.tutorialGroupForm.additionalInformationInput.label"></label>
                     <small id="additionalInfoHelp" class="form-text mb-1 text-body-secondary">
                         <a href="https://guides.github.com/features/mastering-markdown/"> GitHub Markdown Guide</a>
                     </small>
                     <!-- not included in reactive form -->
-                    <jhi-markdown-editor aria-describedby="additionalInfoHelp" id="additionalInfo" class="markdown-editor" [(markdown)]="additionalInformation" />
+                    <jhi-markdown-editor-monaco aria-describedby="additionalInfoHelp" id="additionalInfo" class="markdown-editor" [(markdown)]="additionalInformation" />
                 </div>
                 <hr />
                 <div class="form-check">
                     <input class="form-check-input" type="checkbox" [(ngModel)]="configureSchedule" id="configureSchedule" [ngModelOptions]="{ standalone: true }" />
-                    <label class="form-check-label" for="configureSchedule">
-                        {{ 'artemisApp.forms.scheduleForm.configureRecurringSchedule' | artemisTranslate }}
-                    </label>
+                    <label class="form-check-label" for="configureSchedule" jhiTranslate="artemisApp.forms.scheduleForm.configureRecurringSchedule"></label>
                 </div>
                 @if (showScheduledChangedWarning) {
-                    <div class="alert alert-danger" role="alert">
-                        {{ 'artemisApp.forms.scheduleForm.scheduleChangeWarning' | artemisTranslate }}
-                    </div>
+                    <div class="alert alert-danger" role="alert" jhiTranslate="artemisApp.forms.scheduleForm.scheduleChangeWarning"></div>
                 }
                 <hr />
                 <jhi-schedule-form [hidden]="!configureSchedule" #scheduleForm [parentFormGroup]="form" [course]="course" />
@@ -191,7 +175,7 @@
                 <!-- Optional Notification Message -->
                 @if (notificationControl) {
                     <div class="form-group border border-info rounded p-3">
-                        <label for="notificationText">{{ 'artemisApp.forms.tutorialGroupForm.notificationInput.label' | artemisTranslate }}</label>
+                        <label for="notificationText" jhiTranslate="artemisApp.forms.tutorialGroupForm.notificationInput.label"></label>
                         <textarea
                             class="form-control"
                             id="notificationText"
@@ -199,15 +183,11 @@
                             [placeholder]="'artemisApp.forms.tutorialGroupForm.notificationInput.placeholder' | artemisTranslate"
                             rows="3"
                         ></textarea>
-                        <small id="notificationHelp" class="form-text text-body-secondary">{{
-                            'artemisApp.forms.tutorialGroupForm.notificationInput.help' | artemisTranslate
-                        }}</small>
+                        <small id="notificationHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.forms.tutorialGroupForm.notificationInput.help"></small>
                         @if (notificationControl?.invalid && (notificationControl?.dirty || notificationControl?.touched)) {
                             <div class="alert alert-danger">
                                 @if (notificationControl?.errors?.maxlength) {
-                                    <div>
-                                        {{ 'artemisApp.forms.tutorialGroupForm.notificationInput.maxLengthValidationError' | artemisTranslate: { max: '1000' } }}
-                                    </div>
+                                    <div jhiTranslate="artemisApp.forms.tutorialGroupForm.notificationInput.maxLengthValidationError" [translateValues]="{ max: '1000' }"></div>
                                 }
                             </div>
                         }
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html
index a052ec715cf5..a8b564078cf0 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-group-row-buttons/tutorial-group-row-buttons.component.html
@@ -4,21 +4,21 @@
         @if (isAtLeastInstructor || tutorialGroup.isUserTutor) {
             <button type="button" [id]="'sessions-' + tutorialGroup.id" (click)="openSessionDialog($event)" class="btn btn-primary btn-sm me-1">
                 <fa-icon [icon]="faCalendar" />
-                <span class="d-none d-md-inline">{{ 'artemisApp.pages.tutorialGroupsManagement.rowButtons.sessions' | artemisTranslate }}</span>
+                <span class="d-none d-md-inline" jhiTranslate="artemisApp.pages.tutorialGroupsManagement.rowButtons.sessions"></span>
             </button>
         }
         <!-- Registered Students -->
         @if (isAtLeastInstructor || tutorialGroup.isUserTutor) {
             <button [id]="'registrations-' + tutorialGroup.id" class="btn btn-primary btn-sm me-1" (click)="openRegistrationDialog($event)">
                 <fa-icon [icon]="faUsers" />
-                <span class="d-none d-md-inline">{{ 'artemisApp.pages.registeredStudents.title' | artemisTranslate }}</span>
+                <span class="d-none d-md-inline" jhiTranslate="artemisApp.pages.registeredStudents.title"></span>
             </button>
         }
         <!-- Edit -->
         @if (isAtLeastInstructor) {
             <a [id]="'edit-' + tutorialGroup.id" [routerLink]="['/course-management', course.id!, 'tutorial-groups', tutorialGroup.id, 'edit']" class="btn btn-warning btn-sm me-1">
                 <fa-icon [icon]="faWrench" />
-                <span class="d-none d-md-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+                <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
             </a>
         }
         <!-- Delete -->
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html
index 7052e8afe23a..538b169cad14 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-course-information/tutorial-groups-course-information.component.html
@@ -1,10 +1,10 @@
 <jhi-side-panel [panelHeader]="'artemisApp.pages.courseTutorialGroupOverview.sidePanel.header' | artemisTranslate">
     <div class="row mb-1">
-        <div class="col-8">{{ 'artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfGroups' | artemisTranslate }}</div>
+        <div class="col-8" jhiTranslate="artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfGroups"></div>
         <div class="col-4">{{ tutorialGroups ? tutorialGroups.length : 0 }}</div>
     </div>
     <div class="row mb-1">
-        <div class="col-8">{{ 'artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfRegistrations' | artemisTranslate }}</div>
+        <div class="col-8" jhiTranslate="artemisApp.pages.courseTutorialGroupOverview.sidePanel.numberOfRegistrations"></div>
         <div class="col-4">{{ totalNumberOfRegistrations }}</div>
     </div>
 </jhi-side-panel>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html
index 2294f0c94397..ad2e2fa9e64f 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-button/tutorial-groups-import-button.component.html
@@ -1,13 +1,13 @@
 <button id="importDialogButton" (click)="openTutorialGroupImportDialog($event)" ngbDropdownItem>
-    <span>{{ 'artemisApp.tutorialGroupImportDialog.importButton' | artemisTranslate }}</span>
+    <span jhiTranslate="artemisApp.tutorialGroupImportDialog.importButton"></span>
 </button>
 
 <ng-template #warning let-warning>
     <div class="modal-header">
-        <h4 class="modal-title">{{ 'artemisApp.tutorialGroupImportDialog.warning' | artemisTranslate }}</h4>
+        <h4 class="modal-title" jhiTranslate="artemisApp.tutorialGroupImportDialog.warning"></h4>
     </div>
     <div class="modal-body">
-        <p>{{ 'artemisApp.tutorialGroupImportDialog.finishedWarning' | artemisTranslate }}</p>
+        <p jhiTranslate="artemisApp.tutorialGroupImportDialog.finishedWarning"></p>
     </div>
     <div class="modal-footer">
         <button type="button" class="btn btn-light" (click)="warning.close()">Ok</button>
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html
index de2055dd82ab..cf676a9cbe75 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component.html
@@ -264,9 +264,10 @@ <h4 class="modal-title">
                     @if (statusHeaderControl?.invalid && (statusHeaderControl?.dirty || statusHeaderControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (statusHeaderControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.tutorialGroupImportDialog.fixedPlaceForm.statusHeaderInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }}
-                                </div>
+                                <div
+                                    jhiTranslate="artemisApp.tutorialGroupImportDialog.fixedPlaceForm.statusHeaderInput.maxLengthValidationError"
+                                    [translateValues]="{ max: '255' }"
+                                ></div>
                             }
                         </div>
                     }
@@ -284,9 +285,10 @@ <h4 class="modal-title">
                     @if (fixedPlaceValueControl?.invalid && (fixedPlaceValueControl?.dirty || fixedPlaceValueControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (fixedPlaceValueControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.tutorialGroupImportDialog.fixedPlaceForm.fixedPlaceValueInput.maxLengthValidationError' | artemisTranslate: { max: '255' } }}
-                                </div>
+                                <div
+                                    jhiTranslate="artemisApp.tutorialGroupImportDialog.fixedPlaceForm.fixedPlaceValueInput.maxLengthValidationError"
+                                    [translateValues]="{ max: '255' }"
+                                ></div>
                             }
                         </div>
                     }
@@ -429,14 +431,17 @@ <h4 class="modal-title">
             <div class="flex-shrink-0 me-2 d-flex">
                 @if (!isImportDone) {
                     <div>
-                        <strong>{{ 'artemisApp.tutorialGroupImportDialog.table.footer.total' | artemisTranslate: { count: allRegistrations.length } }}</strong>
+                        <strong jhiTranslate="artemisApp.tutorialGroupImportDialog.table.footer.total" [translateValues]="{ count: allRegistrations.length }"></strong>
                     </div>
                 } @else {
                     <div>
-                        <strong>{{ 'artemisApp.tutorialGroupImportDialog.table.footer.imported' | artemisTranslate: { count: numberOfImportedRegistrations } }}</strong>
+                        <strong jhiTranslate="artemisApp.tutorialGroupImportDialog.table.footer.imported" [translateValues]="{ count: numberOfImportedRegistrations }"></strong>
                     </div>
                     <div class="ms-2">
-                        <strong>{{ 'artemisApp.tutorialGroupImportDialog.table.footer.notImported' | artemisTranslate: { count: numberOfNotImportedRegistration } }}</strong>
+                        <strong
+                            jhiTranslate="artemisApp.tutorialGroupImportDialog.table.footer.notImported"
+                            [translateValues]="{ count: numberOfNotImportedRegistration }"
+                        ></strong>
                     </div>
                 }
             </div>
@@ -450,7 +455,7 @@ <h4 class="modal-title">
             @if (!isImportDone) {
                 <button type="submit" id="import" name="importButton" class="btn btn-primary" [disabled]="isSubmitDisabled" (click)="import()">
                     <fa-icon [icon]="faFileImport" class="me-2" />
-                    <span>{{ 'entity.action.to-import' | artemisTranslate }}</span>
+                    <span jhiTranslate="entity.action.to-import"></span>
                     <fa-icon class="ms-1" [hidden]="!isImporting" animation="spin" [icon]="faCircleNotch" />
                 </button>
             } @else {
diff --git a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html
index 07bb83d83ec0..989af8120b65 100644
--- a/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html
+++ b/src/main/webapp/app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-management.component.html
@@ -15,17 +15,15 @@ <h4>
                                 [routerLink]="['/course-management', courseId, 'tutorial-groups', 'configuration', course!.tutorialGroupsConfiguration!.id, 'tutorial-free-days']"
                             >
                                 <fa-icon [icon]="faUmbrellaBeach" />
-                                <span class="d-none d-md-inline">{{ 'artemisApp.pages.tutorialGroupsManagement.freePeriodsButtons' | artemisTranslate }}</span>
+                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.pages.tutorialGroupsManagement.freePeriodsButtons"></span>
                             </a>
                         }
                         <a class="btn btn-primary" [routerLink]="['/course-management', courseId, 'tutorial-groups', 'create']">
                             <fa-icon [icon]="faPlus" />
-                            <span class="d-none d-md-inline">{{ 'artemisApp.pages.tutorialGroupsManagement.creatTutorialGroupButton' | artemisTranslate }}</span>
+                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.pages.tutorialGroupsManagement.creatTutorialGroupButton"></span>
                         </a>
                         <div ngbDropdown class="d-inline-block">
-                            <button type="button" class="btn btn-primary" id="dropdownBasic1" ngbDropdownToggle>
-                                {{ 'artemisApp.generic.more' | artemisTranslate }}
-                            </button>
+                            <button type="button" class="btn btn-primary" id="dropdownBasic1" ngbDropdownToggle jhiTranslate="artemisApp.generic.more"></button>
                             <div ngbDropdownMenu>
                                 @if (course?.tutorialGroupsConfiguration) {
                                     <a
@@ -33,7 +31,7 @@ <h4>
                                         class="btn"
                                         [routerLink]="['/course-management', courseId, 'tutorial-groups', 'configuration', course!.tutorialGroupsConfiguration!.id, 'edit']"
                                     >
-                                        <span>{{ 'artemisApp.pages.tutorialGroupsManagement.editConfigurationButton' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.pages.tutorialGroupsManagement.editConfigurationButton"></span>
                                     </a>
                                 }
                                 <jhi-tutorial-groups-import-button
diff --git a/src/main/webapp/app/detail-overview-list/components/boolean-detail.component.html b/src/main/webapp/app/detail-overview-list/components/boolean-detail/boolean-detail.component.html
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/boolean-detail.component.html
rename to src/main/webapp/app/detail-overview-list/components/boolean-detail/boolean-detail.component.html
diff --git a/src/main/webapp/app/detail-overview-list/components/boolean-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/boolean-detail/boolean-detail.component.ts
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/boolean-detail.component.ts
rename to src/main/webapp/app/detail-overview-list/components/boolean-detail/boolean-detail.component.ts
diff --git a/src/main/webapp/app/detail-overview-list/components/date-detail.component.html b/src/main/webapp/app/detail-overview-list/components/date-detail/date-detail.component.html
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/date-detail.component.html
rename to src/main/webapp/app/detail-overview-list/components/date-detail/date-detail.component.html
diff --git a/src/main/webapp/app/detail-overview-list/components/date-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/date-detail/date-detail.component.ts
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/date-detail.component.ts
rename to src/main/webapp/app/detail-overview-list/components/date-detail/date-detail.component.ts
diff --git a/src/main/webapp/app/detail-overview-list/components/link-detail.component.html b/src/main/webapp/app/detail-overview-list/components/link-detail/link-detail.component.html
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/link-detail.component.html
rename to src/main/webapp/app/detail-overview-list/components/link-detail/link-detail.component.html
diff --git a/src/main/webapp/app/detail-overview-list/components/link-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/link-detail/link-detail.component.ts
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/link-detail.component.ts
rename to src/main/webapp/app/detail-overview-list/components/link-detail/link-detail.component.ts
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.html b/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.html
new file mode 100644
index 000000000000..c22ec3d50039
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.html
@@ -0,0 +1,25 @@
+<ul>
+    @for (auxiliaryRepository of detail.data.auxiliaryRepositories; track auxiliaryRepository) {
+        @if (auxiliaryRepository.id && auxiliaryRepository.repositoryUri && detail.data.exerciseId) {
+            <li class="mt-2">
+                <span>Repository: {{ auxiliaryRepository.name }}</span>
+                <jhi-code-button class="ms-2" [smallButtons]="true" [repositoryUri]="auxiliaryRepository.repositoryUri" />
+                <jhi-programming-exercise-instructor-repo-download
+                    class="ms-2"
+                    [exerciseId]="detail.data.exerciseId"
+                    [repositoryType]="'AUXILIARY'"
+                    [auxiliaryRepositoryId]="auxiliaryRepository.id"
+                />
+                <div class="auxiliaryRepositoryDescription">
+                    @if (!auxiliaryRepository.checkoutDirectory) {
+                        <fa-icon [icon]="faExclamationTriangle" class="text-warning me-1" [ngbTooltip]="noCheckoutDirectorySetTooltip" />
+                        <span jhiTranslate="artemisApp.programmingExercise.noCheckoutDirectorySet"></span>
+                    }
+                    <ng-template #noCheckoutDirectorySetTooltip>
+                        <span jhiTranslate="artemisApp.programmingExercise.noCheckoutDirectorySetTooltip"></span>
+                    </ng-template>
+                </div>
+            </li>
+        }
+    }
+</ul>
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.ts
new file mode 100644
index 000000000000..e44170601ac7
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component.ts
@@ -0,0 +1,20 @@
+import { Component, Input } from '@angular/core';
+import { NoDataComponent } from 'app/shared/no-data-component';
+import { RouterModule } from '@angular/router';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { ArtemisProgrammingExerciseActionsModule } from 'app/exercises/programming/shared/actions/programming-exercise-actions.module';
+import { ProgrammingAuxiliaryRepositoryButtonsDetail } from 'app/detail-overview-list/detail.model';
+import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+
+@Component({
+    selector: 'jhi-programming-auxiliary-repository-buttons-detail',
+    templateUrl: 'programming-auxiliary-repository-buttons-detail.component.html',
+    standalone: true,
+    imports: [NoDataComponent, RouterModule, ArtemisSharedComponentModule, ArtemisProgrammingExerciseActionsModule, ArtemisSharedModule],
+})
+export class ProgrammingAuxiliaryRepositoryButtonsDetailComponent {
+    @Input() detail: ProgrammingAuxiliaryRepositoryButtonsDetail;
+
+    readonly faExclamationTriangle = faExclamationTriangle;
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.html b/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.html
new file mode 100644
index 000000000000..5b7834c51b5a
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.html
@@ -0,0 +1,24 @@
+<span jhiTranslate="artemisApp.programmingExercise.diffReport.shortDescription"></span>
+<div class="fw-bold">
+    <jhi-git-diff-line-stat
+        [addedLineCount]="detail.data.addedLineCount"
+        [removedLineCount]="detail.data.removedLineCount"
+        ngbTooltip="{{ 'artemisApp.programmingExercise.diffReport.lineStatTooltipDetailPage' | artemisTranslate }}"
+        placement="right"
+    />
+</div>
+@if (detail.data.addedLineCount > 0 || detail.data.removedLineCount > 0) {
+    <div class="mt-1">
+        <jhi-button
+            [featureToggle]="FeatureToggle.ProgrammingExercises"
+            [isLoading]="detail.data.isLoadingDiffReport ?? false"
+            [btnSize]="ButtonSize.SMALL"
+            [icon]="faCodeCompare"
+            [title]="'artemisApp.programmingExercise.diffReport.button'"
+            [tooltip]="'artemisApp.programmingExercise.diffReport.tooltip'"
+            (onClick)="showGitDiff(detail.data.gitDiffReport)"
+            [btnType]="WARNING"
+            [tooltipPlacement]="TooltipPlacement.RIGHT"
+        />
+    </div>
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.ts
new file mode 100644
index 000000000000..b108a561d7c5
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component.ts
@@ -0,0 +1,39 @@
+import { Component, Input, inject } from '@angular/core';
+import type { ProgrammingDiffReportDetail } from 'app/detail-overview-list/detail.model';
+import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
+import { ButtonSize, ButtonType, TooltipPlacement } from 'app/shared/components/button.component';
+import { faCodeCompare } from '@fortawesome/free-solid-svg-icons';
+import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
+import { GitDiffReportModalComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component';
+import { GitDiffReportModule } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report.module';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+
+@Component({
+    selector: 'jhi-programming-diff-report-detail',
+    templateUrl: 'programming-diff-report-detail.component.html',
+    standalone: true,
+    imports: [ArtemisSharedModule, ArtemisSharedComponentModule, GitDiffReportModule],
+})
+export class ProgrammingDiffReportDetailComponent {
+    protected readonly FeatureToggle = FeatureToggle;
+    protected readonly ButtonSize = ButtonSize;
+    protected readonly TooltipPlacement = TooltipPlacement;
+    protected readonly WARNING = ButtonType.WARNING;
+
+    protected readonly faCodeCompare = faCodeCompare;
+
+    private readonly modalService = inject(NgbModal);
+
+    @Input({ required: true }) detail: ProgrammingDiffReportDetail;
+
+    showGitDiff(gitDiff?: ProgrammingExerciseGitDiffReport) {
+        if (!gitDiff) {
+            return;
+        }
+
+        const modalRef = this.modalService.open(GitDiffReportModalComponent, { windowClass: 'diff-view-modal' });
+        modalRef.componentInstance.report = gitDiff;
+    }
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.html b/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.html
new file mode 100644
index 000000000000..95f0a53976b1
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.html
@@ -0,0 +1,8 @@
+@if (detail.data.participation?.repositoryUri && detail.data.exerciseId) {
+    <div class="clone-buttons">
+        <jhi-code-button [smallButtons]="true" [routerLinkForRepositoryView]="['.', 'repository', detail.data.type]" [repositoryUri]="detail.data.participation?.repositoryUri!" />
+        <jhi-programming-exercise-instructor-repo-download class="ms-2" [exerciseId]="detail.data.exerciseId" [repositoryType]="detail.data.type" />
+    </div>
+} @else {
+    <jhi-no-data />
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.ts
new file mode 100644
index 000000000000..21676685fed1
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component.ts
@@ -0,0 +1,16 @@
+import { Component, Input } from '@angular/core';
+import type { ProgrammingRepositoryButtonsDetail } from 'app/detail-overview-list/detail.model';
+import { NoDataComponent } from 'app/shared/no-data-component';
+import { RouterModule } from '@angular/router';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { ArtemisProgrammingExerciseActionsModule } from 'app/exercises/programming/shared/actions/programming-exercise-actions.module';
+
+@Component({
+    selector: 'jhi-programming-repository-buttons-detail',
+    templateUrl: 'programming-repository-buttons-detail.component.html',
+    standalone: true,
+    imports: [NoDataComponent, RouterModule, ArtemisSharedComponentModule, ArtemisProgrammingExerciseActionsModule],
+})
+export class ProgrammingRepositoryButtonsDetailComponent {
+    @Input() detail: ProgrammingRepositoryButtonsDetail;
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.html b/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.html
new file mode 100644
index 000000000000..366ecdb77efd
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.html
@@ -0,0 +1,38 @@
+@if (detail.data.participation) {
+    <div class="d-flex align-items-center">
+        @if (!detail.data.loading) {
+            <jhi-updating-result
+                [exercise]="detail.data.exercise"
+                [participation]="detail.data.participation"
+                [showUngradedResults]="true"
+                [personalParticipation]="false"
+                [short]="false"
+                (onParticipationChange)="detail.data.onParticipationChange()"
+                class="me-2"
+            />
+        }
+        @if (detail.data.participation.results?.length) {
+            <jhi-programming-exercise-instructor-status
+                class="repository-status-icon me-2"
+                [participationType]="detail.data.type"
+                [participation]="detail.data.participation"
+                [exercise]="detail.data.exercise"
+            />
+            @if (detail.data.exercise.isAtLeastEditor) {
+                <jhi-programming-exercise-instructor-trigger-build-button [exercise]="detail.data.exercise" [participation]="detail.data.participation" />
+            }
+        }
+        @if (detail.data.exercise.isAtLeastEditor && detail.data.participation.id) {
+            <a [routerLink]="detail.data.submissionRouterLink" [queryParams]="{ isTmpOrSolutionProgrParticipation: true }" class="ms-2">
+                @switch (detail.data.type) {
+                    @case (ProgrammingExerciseParticipationType.TEMPLATE) {
+                        <span jhiTranslate="artemisApp.programmingExercise.detail.showTemplateSubmissions"></span>
+                    }
+                    @case (ProgrammingExerciseParticipationType.SOLUTION) {
+                        <span jhiTranslate="artemisApp.programmingExercise.detail.showSolutionSubmissions"></span>
+                    }
+                }
+            </a>
+        }
+    </div>
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.ts
new file mode 100644
index 000000000000..89a43fb9aee3
--- /dev/null
+++ b/src/main/webapp/app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component.ts
@@ -0,0 +1,20 @@
+import { Component, Input } from '@angular/core';
+import type { ProgrammingTestStatusDetail } from 'app/detail-overview-list/detail.model';
+import { RouterModule } from '@angular/router';
+import { ArtemisProgrammingExerciseActionsModule } from 'app/exercises/programming/shared/actions/programming-exercise-actions.module';
+import { SubmissionResultStatusModule } from 'app/overview/submission-result-status.module';
+import { ArtemisProgrammingExerciseStatusModule } from 'app/exercises/programming/manage/status/programming-exercise-status.module';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
+
+@Component({
+    selector: 'jhi-programming-test-status-detail',
+    templateUrl: 'programming-test-status-detail.component.html',
+    standalone: true,
+    imports: [RouterModule, ArtemisProgrammingExerciseActionsModule, SubmissionResultStatusModule, ArtemisProgrammingExerciseStatusModule, TranslateDirective],
+})
+export class ProgrammingTestStatusDetailComponent {
+    protected readonly ProgrammingExerciseParticipationType = ProgrammingExerciseParticipationType;
+
+    @Input({ required: true }) detail: ProgrammingTestStatusDetail;
+}
diff --git a/src/main/webapp/app/detail-overview-list/components/text-detail.component.html b/src/main/webapp/app/detail-overview-list/components/text-detail/text-detail.component.html
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/text-detail.component.html
rename to src/main/webapp/app/detail-overview-list/components/text-detail/text-detail.component.html
diff --git a/src/main/webapp/app/detail-overview-list/components/text-detail.component.ts b/src/main/webapp/app/detail-overview-list/components/text-detail/text-detail.component.ts
similarity index 100%
rename from src/main/webapp/app/detail-overview-list/components/text-detail.component.ts
rename to src/main/webapp/app/detail-overview-list/components/text-detail/text-detail.component.ts
diff --git a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html
index 29ec5888ceae..54cc218a7f3b 100644
--- a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html
+++ b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.html
@@ -15,124 +15,6 @@ <h3 class="section-headline" [id]="headlinesRecord[section.headline]">{{ section
                     </dt>
                 }
                 @switch (detail.type) {
-                    @case (DetailType.ProgrammingRepositoryButtons) {
-                        <dd id="detail-value-{{ detail.title }}">
-                            @if (detail.data.participation?.repositoryUri && detail.data.exerciseId) {
-                                <div class="clone-buttons">
-                                    <jhi-code-button
-                                        [smallButtons]="true"
-                                        [routerLinkForRepositoryView]="['.', 'repository', detail.data.type]"
-                                        [repositoryUri]="detail.data.participation?.repositoryUri!"
-                                    />
-                                    <jhi-programming-exercise-instructor-repo-download class="ms-2" [exerciseId]="detail.data.exerciseId" [repositoryType]="detail.data.type" />
-                                </div>
-                            } @else {
-                                <ng-container *ngTemplateOutlet="noData" />
-                            }
-                        </dd>
-                    }
-                    @case (DetailType.ProgrammingAuxiliaryRepositoryButtons) {
-                        <dd id="detail-value-{{ detail.title }}">
-                            <ul>
-                                @for (auxiliaryRepository of detail.data.auxiliaryRepositories; track auxiliaryRepository) {
-                                    @if (auxiliaryRepository.id && auxiliaryRepository.repositoryUri && detail.data.exerciseId) {
-                                        <li class="mt-2">
-                                            <span>Repository: {{ auxiliaryRepository.name }}</span>
-                                            <jhi-code-button class="ms-2" [smallButtons]="true" [repositoryUri]="auxiliaryRepository.repositoryUri" />
-                                            <jhi-programming-exercise-instructor-repo-download
-                                                class="ms-2"
-                                                [exerciseId]="detail.data.exerciseId"
-                                                [repositoryType]="'AUXILIARY'"
-                                                [auxiliaryRepositoryId]="auxiliaryRepository.id"
-                                            />
-                                            <div class="auxiliaryRepositoryDescription">
-                                                @if (!auxiliaryRepository.checkoutDirectory) {
-                                                    <fa-icon [icon]="faExclamationTriangle" class="text-warning me-1" [ngbTooltip]="noCheckoutDirectorySetTooltip" />
-                                                    <span jhiTranslate="artemisApp.programmingExercise.noCheckoutDirectorySet"></span>
-                                                }
-                                                <ng-template #noCheckoutDirectorySetTooltip>
-                                                    <span jhiTranslate="artemisApp.programmingExercise.noCheckoutDirectorySetTooltip"></span>
-                                                </ng-template>
-                                            </div>
-                                        </li>
-                                    }
-                                }
-                            </ul>
-                        </dd>
-                    }
-                    @case (DetailType.ProgrammingTestStatus) {
-                        <dd id="detail-value-{{ detail.title }}">
-                            @if (detail.data.participation) {
-                                <div class="d-flex align-items-center">
-                                    @if (!detail.data.loading) {
-                                        <jhi-updating-result
-                                            [exercise]="detail.data.exercise"
-                                            [participation]="detail.data.participation"
-                                            [showUngradedResults]="true"
-                                            [personalParticipation]="false"
-                                            [short]="false"
-                                            (onParticipationChange)="detail.data.onParticipationChange()"
-                                            class="me-2"
-                                        />
-                                    }
-                                    @if (detail.data.participation.results?.length) {
-                                        <jhi-programming-exercise-instructor-status
-                                            class="repository-status-icon me-2"
-                                            [participationType]="detail.data.type"
-                                            [participation]="detail.data.participation"
-                                            [exercise]="detail.data.exercise"
-                                        />
-                                        @if (detail.data.exercise.isAtLeastEditor) {
-                                            <jhi-programming-exercise-instructor-trigger-build-button
-                                                [exercise]="detail.data.exercise"
-                                                [participation]="detail.data.participation"
-                                            />
-                                        }
-                                    }
-                                    @if (detail.data.exercise.isAtLeastEditor && detail.data.participation.id) {
-                                        <a [routerLink]="detail.data.submissionRouterLink" [queryParams]="{ isTmpOrSolutionProgrParticipation: true }" class="ms-2">
-                                            @switch (detail.data.type) {
-                                                @case (ProgrammingExerciseParticipationType.TEMPLATE) {
-                                                    <span jhiTranslate="artemisApp.programmingExercise.detail.showTemplateSubmissions"></span>
-                                                }
-                                                @case (ProgrammingExerciseParticipationType.SOLUTION) {
-                                                    <span jhiTranslate="artemisApp.programmingExercise.detail.showSolutionSubmissions"></span>
-                                                }
-                                            }
-                                        </a>
-                                    }
-                                </div>
-                            }
-                        </dd>
-                    }
-                    @case (DetailType.ProgrammingDiffReport) {
-                        <dd id="detail-value-{{ detail.title }}">
-                            <span jhiTranslate="artemisApp.programmingExercise.diffReport.shortDescription"></span>
-                            <div class="fw-bold">
-                                <jhi-git-diff-line-stat
-                                    [addedLineCount]="detail.data.addedLineCount"
-                                    [removedLineCount]="detail.data.removedLineCount"
-                                    ngbTooltip="{{ 'artemisApp.programmingExercise.diffReport.lineStatTooltipDetailPage' | artemisTranslate }}"
-                                    placement="right"
-                                />
-                            </div>
-                            @if (detail.data.addedLineCount > 0 || detail.data.removedLineCount > 0) {
-                                <div class="mt-1">
-                                    <jhi-button
-                                        [featureToggle]="FeatureToggle.ProgrammingExercises"
-                                        [isLoading]="detail.data.isLoadingDiffReport ?? false"
-                                        [btnSize]="ButtonSize.SMALL"
-                                        [icon]="faCodeCompare"
-                                        [title]="'artemisApp.programmingExercise.diffReport.button'"
-                                        [tooltip]="'artemisApp.programmingExercise.diffReport.tooltip'"
-                                        (onClick)="showGitDiff(detail.data.gitDiffReport)"
-                                        [btnType]="WARNING"
-                                        [tooltipPlacement]="TooltipPlacement.RIGHT"
-                                    />
-                                </div>
-                            }
-                        </dd>
-                    }
                     @case (DetailType.ProgrammingProblemStatement) {
                         @if (detail.data.exercise?.templateParticipation) {
                             <dd class="p-3 border" id="detail-value-{{ detail.title }}">
diff --git a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts
index b7532ea79cb9..60ed25bd572a 100644
--- a/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts
+++ b/src/main/webapp/app/detail-overview-list/detail-overview-list.component.ts
@@ -1,15 +1,11 @@
 import { Component, Input, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
-import { faArrowUpRightFromSquare, faCodeBranch, faCodeCompare, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { isEmpty } from 'lodash-es';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ButtonSize, ButtonType, TooltipPlacement } from 'app/shared/components/button.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { GitDiffReportModalComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component';
-import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
+import { ButtonSize, TooltipPlacement } from 'app/shared/components/button.component';
 import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model';
 import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service';
 import { AlertService } from 'app/core/util/alert.service';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { Detail } from 'app/detail-overview-list/detail.model';
 import { UMLModel } from '@ls1intum/apollon';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
@@ -52,6 +48,7 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy {
     protected readonly FeatureToggle = FeatureToggle;
     protected readonly ButtonSize = ButtonSize;
     protected readonly ProgrammingExerciseParticipationType = ProgrammingExerciseParticipationType;
+
     readonly CHAT = IrisSubSettingsType.CHAT;
 
     @Input()
@@ -62,19 +59,10 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy {
     // headline record to avoid function call in html
     headlinesRecord: Record<string, string>;
 
-    // icons
-    readonly faExclamationTriangle = faExclamationTriangle;
-    readonly faCodeCompare = faCodeCompare;
-    readonly faArrowUpRightFromSquare = faArrowUpRightFromSquare;
-    readonly faCodeBranch = faCodeBranch;
-
-    WARNING = ButtonType.WARNING;
-
     profileSubscription: Subscription;
     isLocalVC = false;
 
     constructor(
-        private modalService: NgbModal,
         private modelingExerciseService: ModelingExerciseService,
         private alertService: AlertService,
         private profileService: ProfileService,
@@ -95,15 +83,6 @@ export class DetailOverviewListComponent implements OnInit, OnDestroy {
         }, {});
     }
 
-    showGitDiff(gitDiff?: ProgrammingExerciseGitDiffReport) {
-        if (!gitDiff) {
-            return;
-        }
-
-        const modalRef = this.modalService.open(GitDiffReportModalComponent, { windowClass: 'diff-view-modal' });
-        modalRef.componentInstance.report = gitDiff;
-    }
-
     downloadApollonDiagramAsPDf(umlModel?: UMLModel, title?: string) {
         if (umlModel) {
             this.modelingExerciseService.convertToPdf(JSON.stringify(umlModel), `${title}-example-solution`).subscribe({
diff --git a/src/main/webapp/app/detail-overview-list/detail.model.ts b/src/main/webapp/app/detail-overview-list/detail.model.ts
index 52c7012821aa..4e80437fe3d2 100644
--- a/src/main/webapp/app/detail-overview-list/detail.model.ts
+++ b/src/main/webapp/app/detail-overview-list/detail.model.ts
@@ -1,12 +1,12 @@
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
-import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { ProgrammingExerciseInstructorRepositoryType } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
-import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto';
+import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
 import { DetailType } from 'app/detail-overview-list/detail-overview-list.component';
 import { SafeHtml } from '@angular/platform-browser';
 import { UMLDiagramType, UMLModel } from '@ls1intum/apollon';
@@ -83,7 +83,7 @@ interface ProgrammingIrisEnabledDetail extends DetailBase {
     data: { exercise?: ProgrammingExercise; course?: Course; disabled: boolean; subSettingsType: IrisSubSettingsType };
 }
 
-interface ProgrammingRepositoryButtonsDetail extends DetailBase {
+export interface ProgrammingRepositoryButtonsDetail extends DetailBase {
     type: DetailType.ProgrammingRepositoryButtons;
     data: {
         exerciseId?: number;
@@ -92,12 +92,12 @@ interface ProgrammingRepositoryButtonsDetail extends DetailBase {
     };
 }
 
-interface ProgrammingAuxiliaryRepositoryButtonsDetail extends DetailBase {
+export interface ProgrammingAuxiliaryRepositoryButtonsDetail extends DetailBase {
     type: DetailType.ProgrammingAuxiliaryRepositoryButtons;
     data: { auxiliaryRepositories: AuxiliaryRepository[]; exerciseId?: number };
 }
 
-interface ProgrammingTestStatusDetail extends DetailBase {
+export interface ProgrammingTestStatusDetail extends DetailBase {
     type: DetailType.ProgrammingTestStatus;
     data: {
         participation?: TemplateProgrammingExerciseParticipation | SolutionProgrammingExerciseParticipation;
@@ -108,7 +108,7 @@ interface ProgrammingTestStatusDetail extends DetailBase {
         submissionRouterLink?: (string | number | undefined)[];
     };
 }
-interface ProgrammingDiffReportDetail extends DetailBase {
+export interface ProgrammingDiffReportDetail extends DetailBase {
     type: DetailType.ProgrammingDiffReport;
     data: { addedLineCount: number; removedLineCount: number; isLoadingDiffReport?: boolean; gitDiffReport?: ProgrammingExerciseGitDiffReport };
 }
diff --git a/src/main/webapp/app/detail-overview-list/exercise-detail.directive.ts b/src/main/webapp/app/detail-overview-list/exercise-detail.directive.ts
index 069882e56eb4..2bacb55c076b 100644
--- a/src/main/webapp/app/detail-overview-list/exercise-detail.directive.ts
+++ b/src/main/webapp/app/detail-overview-list/exercise-detail.directive.ts
@@ -1,10 +1,14 @@
 import { ComponentRef, Directive, Input, OnDestroy, OnInit, Type, ViewContainerRef } from '@angular/core';
 import type { Detail, ShownDetail } from 'app/detail-overview-list/detail.model';
 import { DetailType } from 'app/detail-overview-list/detail-overview-list.component';
-import { TextDetailComponent } from 'app/detail-overview-list/components/text-detail.component';
-import { DateDetailComponent } from 'app/detail-overview-list/components/date-detail.component';
-import { LinkDetailComponent } from 'app/detail-overview-list/components/link-detail.component';
-import { BooleanDetailComponent } from 'app/detail-overview-list/components/boolean-detail.component';
+import { TextDetailComponent } from 'app/detail-overview-list/components/text-detail/text-detail.component';
+import { DateDetailComponent } from 'app/detail-overview-list/components/date-detail/date-detail.component';
+import { LinkDetailComponent } from 'app/detail-overview-list/components/link-detail/link-detail.component';
+import { BooleanDetailComponent } from 'app/detail-overview-list/components/boolean-detail/boolean-detail.component';
+import { ProgrammingRepositoryButtonsDetailComponent } from 'app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component';
+import { ProgrammingAuxiliaryRepositoryButtonsDetailComponent } from 'app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component';
+import { ProgrammingTestStatusDetailComponent } from 'app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component';
+import { ProgrammingDiffReportDetailComponent } from 'app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component';
 
 @Directive({
     selector: '[jhiExerciseDetail]',
@@ -23,11 +27,26 @@ export class ExerciseDetailDirective implements OnInit, OnDestroy {
         }
         this.detail = this.detail as ShownDetail;
 
-        const detailTypeToComponent: { [key in DetailType]?: Type<TextDetailComponent | DateDetailComponent | LinkDetailComponent | BooleanDetailComponent> } = {
+        const detailTypeToComponent: {
+            [key in DetailType]?: Type<
+                | TextDetailComponent
+                | DateDetailComponent
+                | LinkDetailComponent
+                | BooleanDetailComponent
+                | ProgrammingRepositoryButtonsDetailComponent
+                | ProgrammingAuxiliaryRepositoryButtonsDetailComponent
+                | ProgrammingTestStatusDetailComponent
+                | ProgrammingDiffReportDetailComponent
+            >;
+        } = {
             [DetailType.Text]: TextDetailComponent,
             [DetailType.Date]: DateDetailComponent,
             [DetailType.Link]: LinkDetailComponent,
             [DetailType.Boolean]: BooleanDetailComponent,
+            [DetailType.ProgrammingRepositoryButtons]: ProgrammingRepositoryButtonsDetailComponent,
+            [DetailType.ProgrammingAuxiliaryRepositoryButtons]: ProgrammingAuxiliaryRepositoryButtonsDetailComponent,
+            [DetailType.ProgrammingTestStatus]: ProgrammingTestStatusDetailComponent,
+            [DetailType.ProgrammingDiffReport]: ProgrammingDiffReportDetailComponent,
         };
 
         const detailComponent = detailTypeToComponent[this.detail.type];
diff --git a/src/main/webapp/app/entities/consistency-check-result.model.ts b/src/main/webapp/app/entities/consistency-check-result.model.ts
index b887135572b7..67b23aeb1193 100644
--- a/src/main/webapp/app/entities/consistency-check-result.model.ts
+++ b/src/main/webapp/app/entities/consistency-check-result.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export const enum ErrorType {
     TEMPLATE_REPO_MISSING = 'TEMPLATE_REPO_MISSING',
diff --git a/src/main/webapp/app/entities/course.model.ts b/src/main/webapp/app/entities/course.model.ts
index 77abadd7a640..4f179de3a687 100644
--- a/src/main/webapp/app/entities/course.model.ts
+++ b/src/main/webapp/app/entities/course.model.ts
@@ -3,11 +3,11 @@ import dayjs from 'dayjs/esm';
 import { Lecture } from 'app/entities/lecture.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Competency } from 'app/entities/competency.model';
 import { Organization } from 'app/entities/organization.model';
 import { Post } from 'app/entities/metis/post.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { OnlineCourseConfiguration } from 'app/entities/online-course-configuration.model';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 import { TutorialGroupsConfiguration } from 'app/entities/tutorial-group/tutorial-groups-configuration.model';
diff --git a/src/main/webapp/app/entities/exam-checklist.model.ts b/src/main/webapp/app/entities/exam/exam-checklist.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-checklist.model.ts
rename to src/main/webapp/app/entities/exam/exam-checklist.model.ts
diff --git a/src/main/webapp/app/entities/exam-exercise-overview-item.model.ts b/src/main/webapp/app/entities/exam/exam-exercise-overview-item.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-exercise-overview-item.model.ts
rename to src/main/webapp/app/entities/exam/exam-exercise-overview-item.model.ts
diff --git a/src/main/webapp/app/entities/exam-information.model.ts b/src/main/webapp/app/entities/exam/exam-information.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-information.model.ts
rename to src/main/webapp/app/entities/exam/exam-information.model.ts
diff --git a/src/main/webapp/app/entities/exam-page.model.ts b/src/main/webapp/app/entities/exam/exam-page.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-page.model.ts
rename to src/main/webapp/app/entities/exam/exam-page.model.ts
diff --git a/src/main/webapp/app/entities/exam-session.model.ts b/src/main/webapp/app/entities/exam/exam-session.model.ts
similarity index 97%
rename from src/main/webapp/app/entities/exam-session.model.ts
rename to src/main/webapp/app/entities/exam/exam-session.model.ts
index feb4670ac5c9..96fc05c9b400 100644
--- a/src/main/webapp/app/entities/exam-session.model.ts
+++ b/src/main/webapp/app/entities/exam/exam-session.model.ts
@@ -1,6 +1,6 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
 import dayjs from 'dayjs/esm';
-import { StudentExam } from './student-exam.model';
+import { StudentExam } from '../student-exam.model';
 
 export enum SuspiciousSessionReason {
     DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS = 'DIFFERENT_STUDENT_EXAMS_SAME_IP_ADDRESS',
diff --git a/src/main/webapp/app/entities/exam-user-dto.model.ts b/src/main/webapp/app/entities/exam/exam-user-dto.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-user-dto.model.ts
rename to src/main/webapp/app/entities/exam/exam-user-dto.model.ts
diff --git a/src/main/webapp/app/entities/exam-user.model.ts b/src/main/webapp/app/entities/exam/exam-user.model.ts
similarity index 93%
rename from src/main/webapp/app/entities/exam-user.model.ts
rename to src/main/webapp/app/entities/exam/exam-user.model.ts
index 53a46e26e36d..e1d3edae6fb1 100644
--- a/src/main/webapp/app/entities/exam-user.model.ts
+++ b/src/main/webapp/app/entities/exam/exam-user.model.ts
@@ -1,5 +1,5 @@
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export class ExamUser implements BaseEntity {
diff --git a/src/main/webapp/app/entities/exam-users-attendance-check-dto.model.ts b/src/main/webapp/app/entities/exam/exam-users-attendance-check-dto.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/exam-users-attendance-check-dto.model.ts
rename to src/main/webapp/app/entities/exam/exam-users-attendance-check-dto.model.ts
diff --git a/src/main/webapp/app/entities/exam.model.ts b/src/main/webapp/app/entities/exam/exam.model.ts
similarity index 97%
rename from src/main/webapp/app/entities/exam.model.ts
rename to src/main/webapp/app/entities/exam/exam.model.ts
index f8c813558467..4ebd6fea578f 100644
--- a/src/main/webapp/app/entities/exam.model.ts
+++ b/src/main/webapp/app/entities/exam/exam.model.ts
@@ -1,4 +1,4 @@
-import { ExamUser } from 'app/entities/exam-user.model';
+import { ExamUser } from 'app/entities/exam/exam-user.model';
 import dayjs from 'dayjs/esm';
 import { Course } from 'app/entities/course.model';
 import { StudentExam } from 'app/entities/student-exam.model';
diff --git a/src/main/webapp/app/entities/exercise-category.model.ts b/src/main/webapp/app/entities/exercise-category.model.ts
index bc134d0b7f29..68f09c914d2d 100644
--- a/src/main/webapp/app/entities/exercise-category.model.ts
+++ b/src/main/webapp/app/entities/exercise-category.model.ts
@@ -1,6 +1,30 @@
 export class ExerciseCategory {
     public color?: string;
+
+    // TODO should be renamed to "name" -> accessing variable via "category.name" instead of "category.category" - requires database migration (stored as json in database, see the table "exercise_categories")
     public category?: string;
 
-    constructor() {}
+    constructor(category: string | undefined, color: string | undefined) {
+        this.color = color;
+        this.category = category;
+    }
+
+    equals(otherExerciseCategory: ExerciseCategory): boolean {
+        return this.color === otherExerciseCategory.color && this.category === otherExerciseCategory.category;
+    }
+
+    /**
+     * @param otherExerciseCategory
+     * @returns the alphanumerical order of the two exercise categories based on their display text
+     */
+    compare(otherExerciseCategory: ExerciseCategory): number {
+        if (this.category === otherExerciseCategory.category) {
+            return 0;
+        }
+
+        const displayText = this.category?.toLowerCase() ?? '';
+        const otherCategoryDisplayText = otherExerciseCategory.category?.toLowerCase() ?? '';
+
+        return displayText < otherCategoryDisplayText ? -1 : 1;
+    }
 }
diff --git a/src/main/webapp/app/entities/exercise-group.model.ts b/src/main/webapp/app/entities/exercise-group.model.ts
index 65c14544f2e4..aeca98ee9109 100644
--- a/src/main/webapp/app/entities/exercise-group.model.ts
+++ b/src/main/webapp/app/entities/exercise-group.model.ts
@@ -1,5 +1,5 @@
 import { Exercise } from 'app/entities/exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export class ExerciseGroup implements BaseEntity {
diff --git a/src/main/webapp/app/entities/feedback.model.ts b/src/main/webapp/app/entities/feedback.model.ts
index 7666973744e9..7c6809e6e2f3 100644
--- a/src/main/webapp/app/entities/feedback.model.ts
+++ b/src/main/webapp/app/entities/feedback.model.ts
@@ -1,9 +1,9 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { Result } from 'app/entities/result.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model';
 import { convertToHtmlLinebreaks, escapeString } from 'app/utils/text.utils';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export enum FeedbackHighlightColor {
     RED = 'rgba(219, 53, 69, 0.6)',
diff --git a/src/main/webapp/app/entities/grading-scale.model.ts b/src/main/webapp/app/entities/grading-scale.model.ts
index 7652eb6e9248..2042535aab54 100644
--- a/src/main/webapp/app/entities/grading-scale.model.ts
+++ b/src/main/webapp/app/entities/grading-scale.model.ts
@@ -1,7 +1,7 @@
 import { GradeStep } from 'app/entities/grade-step.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 export class GradingScale implements BaseEntity {
     public static readonly DEFAULT_PLAGIARISM_GRADE = 'U'; // This should be the same as the corresponding constant in GradingScale.java
diff --git a/src/main/webapp/app/entities/hestia/exercise-hint.model.ts b/src/main/webapp/app/entities/hestia/exercise-hint.model.ts
index d48c828adba2..fa61b885b7ec 100644
--- a/src/main/webapp/app/entities/hestia/exercise-hint.model.ts
+++ b/src/main/webapp/app/entities/hestia/exercise-hint.model.ts
@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
 
diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts
index 4471eb472fce..5fccf4e2f4aa 100644
--- a/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts
+++ b/src/main/webapp/app/entities/hestia/programming-exercise-git-diff-report.model.ts
@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseGitDiffEntry } from 'app/entities/hestia/programming-exercise-git-diff-entry.model';
 
diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts
index eb1ee53e4ec2..9380ec858a4f 100644
--- a/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts
+++ b/src/main/webapp/app/entities/hestia/programming-exercise-solution-entry.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 
 export class ProgrammingExerciseSolutionEntry implements BaseEntity {
diff --git a/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts b/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts
index d83351b2883b..43d4a5b5d144 100644
--- a/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts
+++ b/src/main/webapp/app/entities/hestia/programming-exercise-task.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class ProgrammingExerciseServerSideTask implements BaseEntity {
     public id?: number;
diff --git a/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts b/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts
index 47c49d57483d..59234fffbcfe 100644
--- a/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts
+++ b/src/main/webapp/app/entities/hestia/testwise-coverage-report-entry.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class TestwiseCoverageReportEntry implements BaseEntity {
     public id?: number;
diff --git a/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts b/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts
index 752551cb58c7..c86342e1d332 100644
--- a/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts
+++ b/src/main/webapp/app/entities/iris/iris-exercise-chat-session.model.ts
@@ -1,5 +1,5 @@
 import { IrisSession } from 'app/entities/iris/iris-session.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class IrisExerciseChatSession extends IrisSession {
     exercise?: ProgrammingExercise;
diff --git a/src/main/webapp/app/entities/metis/conversation/channel.model.ts b/src/main/webapp/app/entities/metis/conversation/channel.model.ts
index 450cfc266691..dbcc9bb3aac1 100644
--- a/src/main/webapp/app/entities/metis/conversation/channel.model.ts
+++ b/src/main/webapp/app/entities/metis/conversation/channel.model.ts
@@ -1,7 +1,7 @@
 import { Conversation, ConversationDTO, ConversationType } from 'app/entities/metis/conversation/conversation.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { Lecture } from 'app/entities/lecture.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 // IMPORTANT NOTICE: The following strings have to be consistent with
 // the types defined in ChannelSubType.java
diff --git a/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts b/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts
index d9db5fc2b9d3..80bad35f24db 100644
--- a/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts
+++ b/src/main/webapp/app/entities/participation/solution-programming-exercise-participation.model.ts
@@ -1,5 +1,5 @@
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class SolutionProgrammingExerciseParticipation extends Participation {
     public programmingExercise?: ProgrammingExercise;
diff --git a/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts b/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts
index 248a30b3e3f4..d6db1617acec 100644
--- a/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts
+++ b/src/main/webapp/app/entities/participation/template-programming-exercise-participation.model.ts
@@ -1,5 +1,5 @@
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class TemplateProgrammingExerciseParticipation extends Participation {
     public programmingExercise?: ProgrammingExercise;
diff --git a/src/main/webapp/app/entities/programming/aeolus.result.ts b/src/main/webapp/app/entities/programming/aeolus.result.ts
new file mode 100644
index 000000000000..593a09df693e
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/aeolus.result.ts
@@ -0,0 +1,7 @@
+export class AeolusResult {
+    name: string;
+    path: string;
+    ignore: string;
+    type?: string;
+    before?: boolean;
+}
diff --git a/src/main/webapp/app/entities/build-agent.model.ts b/src/main/webapp/app/entities/programming/build-agent.model.ts
similarity index 84%
rename from src/main/webapp/app/entities/build-agent.model.ts
rename to src/main/webapp/app/entities/programming/build-agent.model.ts
index bb33b3a4dd4e..172a8596b299 100644
--- a/src/main/webapp/app/entities/build-agent.model.ts
+++ b/src/main/webapp/app/entities/programming/build-agent.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { BuildJob } from 'app/entities/build-job.model';
+import { BuildJob } from 'app/entities/programming/build-job.model';
 
 export class BuildAgent implements BaseEntity {
     public id?: number;
diff --git a/src/main/webapp/app/entities/build-config.model.ts b/src/main/webapp/app/entities/programming/build-config.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/build-config.model.ts
rename to src/main/webapp/app/entities/programming/build-config.model.ts
diff --git a/src/main/webapp/app/entities/build-job.model.ts b/src/main/webapp/app/entities/programming/build-job.model.ts
similarity index 93%
rename from src/main/webapp/app/entities/build-job.model.ts
rename to src/main/webapp/app/entities/programming/build-job.model.ts
index 55155414cc8d..a36bb9756091 100644
--- a/src/main/webapp/app/entities/build-job.model.ts
+++ b/src/main/webapp/app/entities/programming/build-job.model.ts
@@ -1,7 +1,7 @@
 import { StringBaseEntity } from 'app/shared/model/base-entity';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
 
diff --git a/src/main/webapp/app/entities/build-log-statistics-dto.ts b/src/main/webapp/app/entities/programming/build-log-statistics-dto.ts
similarity index 100%
rename from src/main/webapp/app/entities/build-log-statistics-dto.ts
rename to src/main/webapp/app/entities/programming/build-log-statistics-dto.ts
diff --git a/src/main/webapp/app/entities/build-log.model.ts b/src/main/webapp/app/entities/programming/build-log.model.ts
similarity index 99%
rename from src/main/webapp/app/entities/build-log.model.ts
rename to src/main/webapp/app/entities/programming/build-log.model.ts
index db33d9a63412..fd4135a005cd 100644
--- a/src/main/webapp/app/entities/build-log.model.ts
+++ b/src/main/webapp/app/entities/programming/build-log.model.ts
@@ -1,6 +1,6 @@
 import { safeUnescape } from 'app/shared/util/security.util';
 import { Annotation } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 
 export enum BuildLogType {
     ERROR = 'ERROR',
diff --git a/src/main/webapp/app/entities/build-plan-checkout-directories-dto.ts b/src/main/webapp/app/entities/programming/build-plan-checkout-directories-dto.ts
similarity index 100%
rename from src/main/webapp/app/entities/build-plan-checkout-directories-dto.ts
rename to src/main/webapp/app/entities/programming/build-plan-checkout-directories-dto.ts
diff --git a/src/main/webapp/app/entities/build-plan.model.ts b/src/main/webapp/app/entities/programming/build-plan.model.ts
similarity index 71%
rename from src/main/webapp/app/entities/build-plan.model.ts
rename to src/main/webapp/app/entities/programming/build-plan.model.ts
index f1f79e0e1e9f..cb6abecf235d 100644
--- a/src/main/webapp/app/entities/build-plan.model.ts
+++ b/src/main/webapp/app/entities/programming/build-plan.model.ts
@@ -1,5 +1,5 @@
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class BuildPlan implements BaseEntity {
     public id?: number;
diff --git a/src/main/webapp/app/entities/programming/build.action.ts b/src/main/webapp/app/entities/programming/build.action.ts
new file mode 100644
index 000000000000..5e9e3e4463a1
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/build.action.ts
@@ -0,0 +1,19 @@
+import { AeolusResult } from 'app/entities/programming/aeolus.result';
+
+export class BuildAction {
+    name: string;
+    runAlways: boolean;
+    workdir: string;
+    results?: AeolusResult[];
+    platform?: string;
+    parameters: Map<string, string | boolean | number> = new Map<string, string | boolean | number>();
+}
+
+export class ScriptAction extends BuildAction {
+    script: string;
+}
+
+export class PlatformAction extends BuildAction {
+    type: string;
+    kind: string;
+}
diff --git a/src/main/webapp/app/entities/checkout-directories-dto.ts b/src/main/webapp/app/entities/programming/checkout-directories-dto.ts
similarity index 63%
rename from src/main/webapp/app/entities/checkout-directories-dto.ts
rename to src/main/webapp/app/entities/programming/checkout-directories-dto.ts
index 71b05a32d187..657fbce65f6f 100644
--- a/src/main/webapp/app/entities/checkout-directories-dto.ts
+++ b/src/main/webapp/app/entities/programming/checkout-directories-dto.ts
@@ -1,4 +1,4 @@
-import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/build-plan-checkout-directories-dto';
+import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto';
 
 export class CheckoutDirectoriesDto {
     submissionBuildPlanCheckoutDirectories?: BuildPlanCheckoutDirectoriesDTO;
diff --git a/src/main/webapp/app/entities/programming/docker.configuration.ts b/src/main/webapp/app/entities/programming/docker.configuration.ts
new file mode 100644
index 000000000000..edc08214185c
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/docker.configuration.ts
@@ -0,0 +1,6 @@
+export class DockerConfiguration {
+    image: string;
+    tag?: string;
+    volumes: Map<string, string>;
+    parameters: Map<string, string>;
+}
diff --git a/src/main/webapp/app/entities/programming-exercise-auxiliary-repository-model.ts b/src/main/webapp/app/entities/programming/programming-exercise-auxiliary-repository-model.ts
similarity index 100%
rename from src/main/webapp/app/entities/programming-exercise-auxiliary-repository-model.ts
rename to src/main/webapp/app/entities/programming/programming-exercise-auxiliary-repository-model.ts
diff --git a/src/main/webapp/app/entities/programming/programming-exercise-build.config.ts b/src/main/webapp/app/entities/programming/programming-exercise-build.config.ts
new file mode 100644
index 000000000000..eaa526406e08
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/programming-exercise-build.config.ts
@@ -0,0 +1,19 @@
+import { WindFile } from 'app/entities/programming/wind.file';
+
+export class ProgrammingExerciseBuildConfig {
+    public sequentialTestRuns?: boolean;
+    public buildPlanConfiguration?: string;
+    public buildScript?: string;
+    public checkoutSolutionRepository?: boolean;
+    public checkoutPath?: string;
+    public timeoutSeconds?: number;
+    public dockerFlags?: string;
+    public windfile?: WindFile;
+    public testwiseCoverageEnabled?: boolean;
+    public theiaImage?: string;
+
+    constructor() {
+        this.checkoutSolutionRepository = false; // default value
+        this.testwiseCoverageEnabled = false; // default value
+    }
+}
diff --git a/src/main/webapp/app/entities/programming-exercise-participation.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-participation.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/programming-exercise-participation.model.ts
rename to src/main/webapp/app/entities/programming/programming-exercise-participation.model.ts
diff --git a/src/main/webapp/app/entities/programming-exercise-test-case-statistics.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-test-case-statistics.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/programming-exercise-test-case-statistics.model.ts
rename to src/main/webapp/app/entities/programming/programming-exercise-test-case-statistics.model.ts
diff --git a/src/main/webapp/app/entities/programming-exercise-test-case.model.ts b/src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts
similarity index 92%
rename from src/main/webapp/app/entities/programming-exercise-test-case.model.ts
rename to src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts
index 7b0cdfa37311..2d6822dc7ce4 100644
--- a/src/main/webapp/app/entities/programming-exercise-test-case.model.ts
+++ b/src/main/webapp/app/entities/programming/programming-exercise-test-case.model.ts
@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { TestCaseStats } from './programming-exercise-test-case-statistics.model';
diff --git a/src/main/webapp/app/entities/programming-exercise.model.ts b/src/main/webapp/app/entities/programming/programming-exercise.model.ts
similarity index 75%
rename from src/main/webapp/app/entities/programming-exercise.model.ts
rename to src/main/webapp/app/entities/programming/programming-exercise.model.ts
index 7b72d222cfc4..3d47a8320bd2 100644
--- a/src/main/webapp/app/entities/programming-exercise.model.ts
+++ b/src/main/webapp/app/entities/programming/programming-exercise.model.ts
@@ -1,79 +1,16 @@
-import dayjs from 'dayjs/esm';
-import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
-import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
-import { Exercise, ExerciseType, resetForImport } from 'app/entities/exercise.model';
+import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
-import { SubmissionPolicy } from 'app/entities/submission-policy.model';
-import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
+import { Exercise, ExerciseType, resetForImport } from 'app/entities/exercise.model';
 import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
-import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto';
-import { AssessmentType } from 'app/entities/assessment-type.model';
-
-export class BuildAction {
-    name: string;
-    runAlways: boolean;
-    workdir: string;
-    results?: AeolusResult[];
-    platform?: string;
-    parameters: Map<string, string | boolean | number> = new Map<string, string | boolean | number>();
-}
-
-export class AeolusResult {
-    name: string;
-    path: string;
-    ignore: string;
-    type?: string;
-    before?: boolean;
-}
-
-export class ScriptAction extends BuildAction {
-    script: string;
-}
-
-export class PlatformAction extends BuildAction {
-    type: string;
-    kind: string;
-}
-
-export class WindMetadata {
-    author: string | any;
-    description: string;
-    id: string;
-    name: string;
-    docker: DockerConfiguration;
-}
-
-export class DockerConfiguration {
-    image: string;
-    tag?: string;
-    volumes: Map<string, string>;
-    parameters: Map<string, string>;
-}
-
-export class WindFile {
-    api: string;
-    metadata: WindMetadata;
-    actions: BuildAction[];
-}
-
-export class ProgrammingExerciseBuildConfig {
-    public sequentialTestRuns?: boolean;
-    public buildPlanConfiguration?: string;
-    public buildScript?: string;
-    public checkoutSolutionRepository?: boolean;
-    public checkoutPath?: string;
-    public timeoutSeconds?: number;
-    public dockerFlags?: string;
-    public windFile?: WindFile;
-    public testwiseCoverageEnabled?: boolean;
-
-    constructor() {
-        this.checkoutSolutionRepository = false; // default value
-        this.testwiseCoverageEnabled = false; // default value
-    }
-}
+import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
+import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
+import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
+import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
+import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config';
+import { SubmissionPolicy } from 'app/entities/submission-policy.model';
+import dayjs from 'dayjs/esm';
 
 export enum ProgrammingLanguage {
     JAVA = 'JAVA',
@@ -86,6 +23,7 @@ export enum ProgrammingLanguage {
     SWIFT = 'SWIFT',
     OCAML = 'OCAML',
     EMPTY = 'EMPTY',
+    RUST = 'RUST',
 }
 
 export enum ProjectType {
@@ -113,6 +51,7 @@ export class ProgrammingExercise extends Exercise {
      */
     public maxStaticCodeAnalysisPenalty?: number;
     public allowOfflineIde?: boolean;
+    public allowOnlineIde?: boolean;
     public programmingLanguage?: ProgrammingLanguage;
     public packageName?: string;
     public showTestNamesToStudents?: boolean;
@@ -147,6 +86,7 @@ export class ProgrammingExercise extends Exercise {
         this.templateParticipation = new TemplateProgrammingExerciseParticipation();
         this.solutionParticipation = new SolutionProgrammingExerciseParticipation();
         this.allowOnlineEditor = false; // default value
+        this.allowOnlineIde = false; // default value
         this.staticCodeAnalysisEnabled = false; // default value
         this.allowOfflineIde = true; // default value
         this.programmingLanguage = ProgrammingLanguage.JAVA; // default value
@@ -176,7 +116,7 @@ export function copyBuildConfigFromExerciseJson(exerciseJson: ProgrammingExercis
     buildConfig.buildPlanConfiguration = exerciseJson.buildPlanConfiguration ?? '';
     buildConfig.checkoutSolutionRepository = exerciseJson.checkoutSolutionRepository ?? false;
     buildConfig.timeoutSeconds = exerciseJson.timeoutSeconds ?? 0;
-    buildConfig.windFile = exerciseJson.windFile ?? undefined;
+    buildConfig.windfile = exerciseJson.windfile ?? undefined;
     buildConfig.buildScript = exerciseJson.buildScript ?? '';
     buildConfig.testwiseCoverageEnabled = exerciseJson.testwiseCoverageEnabled ?? false;
     buildConfig.dockerFlags = exerciseJson.dockerFlags ?? '';
diff --git a/src/main/webapp/app/entities/programming-submission.model.ts b/src/main/webapp/app/entities/programming/programming-submission.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/programming-submission.model.ts
rename to src/main/webapp/app/entities/programming/programming-submission.model.ts
diff --git a/src/main/webapp/app/entities/repository-info.model.ts b/src/main/webapp/app/entities/programming/repository-info.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/repository-info.model.ts
rename to src/main/webapp/app/entities/programming/repository-info.model.ts
diff --git a/src/main/webapp/app/entities/static-code-analysis-category.model.ts b/src/main/webapp/app/entities/programming/static-code-analysis-category.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/static-code-analysis-category.model.ts
rename to src/main/webapp/app/entities/programming/static-code-analysis-category.model.ts
diff --git a/src/main/webapp/app/entities/static-code-analysis-issue.model.ts b/src/main/webapp/app/entities/programming/static-code-analysis-issue.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/static-code-analysis-issue.model.ts
rename to src/main/webapp/app/entities/programming/static-code-analysis-issue.model.ts
diff --git a/src/main/webapp/app/entities/test-case-result.model.ts b/src/main/webapp/app/entities/programming/test-case-result.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/test-case-result.model.ts
rename to src/main/webapp/app/entities/programming/test-case-result.model.ts
diff --git a/src/main/webapp/app/entities/programming/wind.file.ts b/src/main/webapp/app/entities/programming/wind.file.ts
new file mode 100644
index 000000000000..6e960c30c44c
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/wind.file.ts
@@ -0,0 +1,8 @@
+import { BuildAction } from 'app/entities/programming/build.action';
+import { WindMetadata } from 'app/entities/programming/wind.metadata';
+
+export class WindFile {
+    api: string;
+    metadata: WindMetadata;
+    actions: BuildAction[];
+}
diff --git a/src/main/webapp/app/entities/programming/wind.metadata.ts b/src/main/webapp/app/entities/programming/wind.metadata.ts
new file mode 100644
index 000000000000..6ef6f1abc38e
--- /dev/null
+++ b/src/main/webapp/app/entities/programming/wind.metadata.ts
@@ -0,0 +1,9 @@
+import { DockerConfiguration } from 'app/entities/programming/docker.configuration';
+
+export class WindMetadata {
+    author: string | any;
+    description: string;
+    id: string;
+    name: string;
+    docker: DockerConfiguration;
+}
diff --git a/src/main/webapp/app/entities/quiz/quiz-pool.model.ts b/src/main/webapp/app/entities/quiz/quiz-pool.model.ts
index b6d7f82b7a83..8b59ba5473c3 100644
--- a/src/main/webapp/app/entities/quiz/quiz-pool.model.ts
+++ b/src/main/webapp/app/entities/quiz/quiz-pool.model.ts
@@ -1,6 +1,6 @@
 import { QuizGroup } from 'app/entities/quiz/quiz-group.model';
 import { QuizQuestion } from 'app/entities/quiz/quiz-question.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export class QuizPool implements BaseEntity {
diff --git a/src/main/webapp/app/entities/student-exam.model.ts b/src/main/webapp/app/entities/student-exam.model.ts
index 1b15503b27cd..b7eb32c151d6 100644
--- a/src/main/webapp/app/entities/student-exam.model.ts
+++ b/src/main/webapp/app/entities/student-exam.model.ts
@@ -1,9 +1,9 @@
 import dayjs from 'dayjs/esm';
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
-import { ExamSession } from 'app/entities/exam-session.model';
+import { ExamSession } from 'app/entities/exam/exam-session.model';
 
 export class StudentExam implements BaseEntity {
     public id?: number;
diff --git a/src/main/webapp/app/entities/submission-policy.model.ts b/src/main/webapp/app/entities/submission-policy.model.ts
index 9ae55f0d465e..c6f0d9620f4b 100644
--- a/src/main/webapp/app/entities/submission-policy.model.ts
+++ b/src/main/webapp/app/entities/submission-policy.model.ts
@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BaseEntity } from 'app/shared/model/base-entity';
 
 export enum SubmissionPolicyType {
diff --git a/src/main/webapp/app/entities/text-assesment-event.model.ts b/src/main/webapp/app/entities/text/text-assesment-event.model.ts
similarity index 95%
rename from src/main/webapp/app/entities/text-assesment-event.model.ts
rename to src/main/webapp/app/entities/text/text-assesment-event.model.ts
index c0b04482f1a2..478f39d62ccf 100644
--- a/src/main/webapp/app/entities/text-assesment-event.model.ts
+++ b/src/main/webapp/app/entities/text/text-assesment-event.model.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs/esm';
 import { BaseEntity } from 'app/shared/model/base-entity';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
 
 export enum TextAssessmentEventType {
     ADD_FEEDBACK_AUTOMATICALLY_SELECTED_BLOCK = 'ADD_FEEDBACK_AUTOMATICALLY_SELECTED_BLOCK',
diff --git a/src/main/webapp/app/entities/text-block-ref.model.ts b/src/main/webapp/app/entities/text/text-block-ref.model.ts
similarity index 91%
rename from src/main/webapp/app/entities/text-block-ref.model.ts
rename to src/main/webapp/app/entities/text/text-block-ref.model.ts
index b31b08353cf3..b643652a939e 100644
--- a/src/main/webapp/app/entities/text-block-ref.model.ts
+++ b/src/main/webapp/app/entities/text/text-block-ref.model.ts
@@ -1,4 +1,4 @@
-import { TextBlock, TextBlockType } from 'app/entities/text-block.model';
+import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 
 export class TextBlockRef {
diff --git a/src/main/webapp/app/entities/text-block.model.ts b/src/main/webapp/app/entities/text/text-block.model.ts
similarity index 96%
rename from src/main/webapp/app/entities/text-block.model.ts
rename to src/main/webapp/app/entities/text/text-block.model.ts
index 4267639950e8..034c590439b1 100644
--- a/src/main/webapp/app/entities/text-block.model.ts
+++ b/src/main/webapp/app/entities/text/text-block.model.ts
@@ -1,5 +1,5 @@
 import { sha1Hex } from 'app/shared/util/crypto.utils';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 
 export enum TextBlockType {
     AUTOMATIC = 'AUTOMATIC',
diff --git a/src/main/webapp/app/entities/text-change.model.ts b/src/main/webapp/app/entities/text/text-change.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/text-change.model.ts
rename to src/main/webapp/app/entities/text/text-change.model.ts
diff --git a/src/main/webapp/app/entities/text-exercise.model.ts b/src/main/webapp/app/entities/text/text-exercise.model.ts
similarity index 100%
rename from src/main/webapp/app/entities/text-exercise.model.ts
rename to src/main/webapp/app/entities/text/text-exercise.model.ts
diff --git a/src/main/webapp/app/entities/text-submission.model.ts b/src/main/webapp/app/entities/text/text-submission.model.ts
similarity index 84%
rename from src/main/webapp/app/entities/text-submission.model.ts
rename to src/main/webapp/app/entities/text/text-submission.model.ts
index 941e239a1a1f..922987ed7a5b 100644
--- a/src/main/webapp/app/entities/text-submission.model.ts
+++ b/src/main/webapp/app/entities/text/text-submission.model.ts
@@ -1,4 +1,4 @@
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { Submission, SubmissionExerciseType } from 'app/entities/submission.model';
 import { Language } from 'app/entities/course.model';
 
diff --git a/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html b/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html
index 47e15fab1953..35ab48c1854a 100644
--- a/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html
+++ b/src/main/webapp/app/exam/exam-scores/exam-scores-average-scores-graph.component.html
@@ -1,6 +1,6 @@
 <div class="row d-flex justify-content-center mb-1">
     <div #containerRef class="col-md-8 col-11 align-items-center px-0">
-        <h6 class="text-center">{{ 'artemisApp.examScores.exerciseGroupTitle' | artemisTranslate: { groupTitle: this.averageScores.title } }}</h6>
+        <h6 class="text-center" jhiTranslate="artemisApp.examScores.exerciseGroupTitle" [translateValues]="{ groupTitle: this.averageScores.title }"></h6>
         <ngx-charts-bar-horizontal
             [roundEdges]="false"
             [view]="[containerRef.offsetWidth, 100]"
diff --git a/src/main/webapp/app/exam/exam-scores/exam-scores.component.html b/src/main/webapp/app/exam/exam-scores/exam-scores.component.html
index 00e0d35e6eae..2fe2e07c3e3a 100644
--- a/src/main/webapp/app/exam/exam-scores/exam-scores.component.html
+++ b/src/main/webapp/app/exam/exam-scores/exam-scores.component.html
@@ -11,12 +11,12 @@
             @if (!exerciseGroups) {
                 <div class="alert alert-warning">
                     <fa-icon [icon]="faExclamationTriangle" />
-                    <span>{{ 'artemisApp.examScores.noExerciseGroupAvailable' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.examScores.noExerciseGroupAvailable"></span>
                 </div>
             }
             @if (!studentResults) {
                 <div class="alert alert-info">
-                    <span>{{ 'artemisApp.examScores.noStudentResultAvailable' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.examScores.noStudentResultAvailable"></span>
                 </div>
             }
         </div>
@@ -58,7 +58,7 @@ <h4>
                         [checked]="filterForSubmittedExams"
                         (change)="toggleFilterForSubmittedExam()"
                     />
-                    <label for="toggleFilterForSubmittedExam" class="form-check-label">{{ 'artemisApp.examScores.filterForSubmittedExams' | artemisTranslate }}</label>
+                    <label for="toggleFilterForSubmittedExam" class="form-check-label" jhiTranslate="artemisApp.examScores.filterForSubmittedExams"></label>
                 </div>
                 <div class="form-check form-check-inline">
                     <input
@@ -68,7 +68,7 @@ <h4>
                         [checked]="filterForNonEmptySubmissions"
                         (change)="toggleFilterForNonEmptySubmission()"
                     />
-                    <label for="toggleFilterForNonEmptySubmission" class="form-check-label">{{ 'artemisApp.examScores.filterForNonEmptySubmissions' | artemisTranslate }}</label>
+                    <label for="toggleFilterForNonEmptySubmission" class="form-check-label" jhiTranslate="artemisApp.examScores.filterForNonEmptySubmissions"></label>
                 </div>
             </div>
             <!-- Exam Point Statistics -->
@@ -78,24 +78,16 @@ <h4>
                         <tr>
                             <th></th>
                             @if (gradingScaleExists && !isBonus) {
-                                <th colspan="3">
-                                    {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }}
-                                </th>
+                                <th colspan="3" jhiTranslate="artemisApp.examScores.secondCorrectionColumn"></th>
                             }
                             @if (gradingScaleExists && !isBonus) {
-                                <th colspan="3" style="border-left: 3px solid grey">
-                                    {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }}
-                                </th>
+                                <th colspan="3" style="border-left: 3px solid grey" jhiTranslate="artemisApp.examScores.firstCorrectionColumn"></th>
                             }
                             @if (!gradingScaleExists || isBonus) {
-                                <th colspan="2">
-                                    {{ 'artemisApp.examScores.secondCorrectionColumn' | artemisTranslate }}
-                                </th>
+                                <th colspan="2" jhiTranslate="artemisApp.examScores.secondCorrectionColumn"></th>
                             }
                             @if (!gradingScaleExists || isBonus) {
-                                <th colspan="2" style="border-left: 3px solid grey">
-                                    {{ 'artemisApp.examScores.firstCorrectionColumn' | artemisTranslate }}
-                                </th>
+                                <th colspan="2" style="border-left: 3px solid grey" jhiTranslate="artemisApp.examScores.firstCorrectionColumn"></th>
                             }
                         </tr>
                     </thead>
@@ -104,36 +96,24 @@ <h4>
                     <tr>
                         <th></th>
                         @if (gradingScaleExists && !isBonus) {
-                            <th>
-                                {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }}
-                            </th>
+                            <th jhiTranslate="artemisApp.examScores.passedColumn"></th>
                         }
-                        <th>
-                            {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }}
-                        </th>
-                        <th>
-                            {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }}
-                        </th>
+                        <th jhiTranslate="artemisApp.examScores.submittedColumn"></th>
+                        <th jhiTranslate="artemisApp.examScores.totalColumn"></th>
                         @if (hasSecondCorrectionAndStarted && gradingScaleExists && !isBonus) {
-                            <th style="border-left: 3px solid grey">
-                                {{ 'artemisApp.examScores.passedColumn' | artemisTranslate }}
-                            </th>
+                            <th style="border-left: 3px solid grey" jhiTranslate="artemisApp.examScores.passedColumn"></th>
                         }
                         @if (hasSecondCorrectionAndStarted) {
-                            <th [ngStyle]="!gradingScaleExists || isBonus ? { 'border-left': '3px solid grey' } : {}">
-                                {{ 'artemisApp.examScores.submittedColumn' | artemisTranslate }}
-                            </th>
+                            <th [ngStyle]="!gradingScaleExists || isBonus ? { 'border-left': '3px solid grey' } : {}" jhiTranslate="artemisApp.examScores.submittedColumn"></th>
                         }
                         @if (hasSecondCorrectionAndStarted) {
-                            <th>
-                                {{ 'artemisApp.examScores.totalColumn' | artemisTranslate }}
-                            </th>
+                            <th jhiTranslate="artemisApp.examScores.totalColumn"></th>
                         }
                     </tr>
                 </thead>
                 <tbody>
                     <tr>
-                        <th scope="row">{{ 'artemisApp.examScores.noOfExams' | artemisTranslate }}</th>
+                        <th scope="row" jhiTranslate="artemisApp.examScores.noOfExams"></th>
                         @if (gradingScaleExists && !isBonus) {
                             <td>
                                 {{ aggregatedExamResults.noOfExamsFilteredForPassed }}
@@ -158,7 +138,7 @@ <h4>
                         }
                     </tr>
                     <tr>
-                        <th scope="row">{{ 'artemisApp.examScores.averagePointsColumn' | artemisTranslate }}</th>
+                        <th scope="row" jhiTranslate="artemisApp.examScores.averagePointsColumn"></th>
                         @if (gradingScaleExists && !isBonus) {
                             <td>
                                 {{ aggregatedExamResults.meanPointsPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.meanPointsPassed) : '-' }}
@@ -200,9 +180,7 @@ <h4>
                     </tr>
                     @if (gradingScaleExists) {
                         <tr>
-                            <th scope="row">
-                                {{ isBonus ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate) : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate) }}
-                            </th>
+                            <th scope="row" jhiTranslate="{{ isBonus ? 'artemisApp.examScores.averageBonusColumn' : 'artemisApp.examScores.averageGradeColumn' }}"></th>
                             @if (!isBonus) {
                                 <td>{{ aggregatedExamResults.meanGradePassed !== null ? aggregatedExamResults.meanGradePassed : '-' }}</td>
                             }
@@ -226,7 +204,7 @@ <h4>
                         </tr>
                     }
                     <tr>
-                        <th scope="row">{{ 'artemisApp.examScores.medianColumn' | artemisTranslate }}</th>
+                        <th scope="row" jhiTranslate="artemisApp.examScores.medianColumn"></th>
                         @if (gradingScaleExists && !isBonus) {
                             <td>
                                 {{ aggregatedExamResults.medianPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.medianPassed) : '-' }}
@@ -272,9 +250,7 @@ <h4>
                     </tr>
                     @if (gradingScaleExists) {
                         <tr>
-                            <th scope="row">
-                                {{ isBonus ? ('artemisApp.examScores.medianBonusColumn' | artemisTranslate) : ('artemisApp.examScores.medianGradeColumn' | artemisTranslate) }}
-                            </th>
+                            <th scope="row" jhiTranslate="{{ isBonus ? 'artemisApp.examScores.medianBonusColumn' : 'artemisApp.examScores.medianGradeColumn' }}"></th>
                             @if (!isBonus) {
                                 <td>{{ aggregatedExamResults.medianGradePassed !== null ? aggregatedExamResults.medianGradePassed : '-' }}</td>
                             }
@@ -298,7 +274,7 @@ <h4>
                         </tr>
                     }
                     <tr>
-                        <th scope="row">{{ 'artemisApp.examScores.standardDeviationColumn' | artemisTranslate }}</th>
+                        <th scope="row" jhiTranslate="artemisApp.examScores.standardDeviationColumn"></th>
                         @if (gradingScaleExists && !isBonus) {
                             <td>
                                 {{ aggregatedExamResults.standardDeviationPassed !== null ? roundAndPerformLocalConversion(aggregatedExamResults.standardDeviationPassed) : '-' }}
@@ -330,7 +306,7 @@ <h4>
                     </tr>
                     @if (gradingScaleExists && hasNumericGrades) {
                         <tr>
-                            <th scope="row">{{ 'artemisApp.examScores.standardGradeDeviationColumn' | artemisTranslate }}</th>
+                            <th scope="row" jhiTranslate="artemisApp.examScores.standardGradeDeviationColumn"></th>
                             @if (!isBonus) {
                                 <td>
                                     {{
@@ -373,30 +349,30 @@ <h4>
                 @if (gradingScaleExists && this.aggregatedExamResults.medianRelativePassed !== null) {
                     <div class="form-check">
                         <input id="toggleMedianPassed" class="form-check-input" type="checkbox" [checked]="showPassedMedian" (change)="toggleMedian(medianType.PASSED)" />
-                        <label for="toggleMedianPassed" class="form-check-label">
-                            {{
-                                'artemisApp.examScores.highlightPassedMedian'
-                                    | artemisTranslate
-                                        : {
-                                              median: this.aggregatedExamResults.medianRelativePassed
-                                                  ? roundScoreSpecifiedByCourseSettings(this.aggregatedExamResults.medianRelativePassed, course)
-                                                  : 0,
-                                          }
-                            }}
-                        </label>
+                        <label
+                            for="toggleMedianPassed"
+                            class="form-check-label"
+                            jhiTranslate="artemisApp.examScores.highlightPassedMedian"
+                            [translateValues]="{
+                                median: this.aggregatedExamResults.medianRelativePassed
+                                    ? roundScoreSpecifiedByCourseSettings(this.aggregatedExamResults.medianRelativePassed, course)
+                                    : 0,
+                            }"
+                        ></label>
                     </div>
                 }
                 <div class="form-check">
                     <input id="toggleMedianOverall" class="form-check-input" type="checkbox" [checked]="showOverallMedian" (change)="toggleMedian(overallChartMedianType)" />
-                    <label for="toggleMedianOverall" class="form-check-label">
-                        {{ 'artemisApp.examScores.highlightOverallMedian' | artemisTranslate: { median: this.overallChartMedian } }}
-                    </label>
+                    <label
+                        for="toggleMedianOverall"
+                        class="form-check-label"
+                        jhiTranslate="artemisApp.examScores.highlightOverallMedian"
+                        [translateValues]="{ median: this.overallChartMedian }"
+                    ></label>
                 </div>
                 <!-- Histogram -->
                 @if (hasBonus) {
-                    <h4 class="text-center mb-0">
-                        {{ 'artemisApp.examScores.gradesBeforeBonus' | artemisTranslate }}
-                    </h4>
+                    <h4 class="text-center mb-0" jhiTranslate="artemisApp.examScores.gradesBeforeBonus"></h4>
                 }
                 <div class="row d-flex justify-content-center">
                     <jhi-participant-scores-distribution
@@ -410,9 +386,7 @@ <h4 class="text-center mb-0">
                 </div>
                 <!-- Histogram with bonus -->
                 @if (hasBonus) {
-                    <h4 class="text-center mt-5 mb-0">
-                        {{ 'artemisApp.examScores.gradesAfterBonus' | artemisTranslate }}
-                    </h4>
+                    <h4 class="text-center mt-5 mb-0" jhiTranslate="artemisApp.examScores.gradesAfterBonus"></h4>
                 }
                 @if (hasBonus) {
                     <div class="row d-flex justify-content-center">
@@ -448,9 +422,7 @@ <h4 class="mt-3">
                             <thead class="table-dark">
                                 <tr>
                                     <th>#</th>
-                                    <th>
-                                        {{ 'artemisApp.examScores.titleExerciseGroupColumn' | artemisTranslate }}
-                                    </th>
+                                    <th jhiTranslate="artemisApp.examScores.titleExerciseGroupColumn"></th>
                                     <th>
                                         {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }}
                                         <jhi-help-icon text="artemisApp.examScores.participantsExerciseGroupTooltip" />
@@ -460,17 +432,9 @@ <h4 class="mt-3">
                                         <jhi-help-icon text="artemisApp.examScores.averageExerciseGroupTooltip" />
                                     </th>
                                     @if (gradingScaleExists) {
-                                        <th>
-                                            {{
-                                                isBonus
-                                                    ? ('artemisApp.examScores.averageBonusColumn' | artemisTranslate)
-                                                    : ('artemisApp.examScores.averageGradeColumn' | artemisTranslate)
-                                            }}
-                                        </th>
+                                        <th jhiTranslate="{{ isBonus ? 'artemisApp.examScores.averageBonusColumn' : 'artemisApp.examScores.averageGradeColumn' }}"></th>
                                     }
-                                    <th>
-                                        {{ 'artemisApp.examScores.titleExerciseColumn' | artemisTranslate }}
-                                    </th>
+                                    <th jhiTranslate="artemisApp.examScores.titleExerciseColumn"></th>
                                     <th>
                                         {{ 'artemisApp.examScores.participantsColumn' | artemisTranslate }}
                                         <jhi-help-icon text="artemisApp.examScores.participantsExerciseTooltip" />
@@ -585,44 +549,43 @@ <h4>
                             </th>
                             @if (gradingScaleExists) {
                                 <th jhiSortBy="overallScoreAchieved">
-                                    <span>{{
-                                        isBonus ? ('artemisApp.examScores.overallBonusColumn' | artemisTranslate) : ('artemisApp.examScores.overallGradeColumn' | artemisTranslate)
-                                    }}</span>
+                                    <span jhiTranslate="{{ isBonus ? 'artemisApp.examScores.overallBonusColumn' : 'artemisApp.examScores.overallGradeColumn' }}"></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
                             @if (hasBonus) {
                                 @if (presentationScoreThreshold !== undefined) {
                                     <th jhiSortBy="gradeWithBonus.achievedPresentationScore">
-                                        <span>{{ 'artemisApp.examScores.presentationScoreThresholdColumn' | artemisTranslate: { threshold: presentationScoreThreshold } }}</span>
+                                        <span
+                                            jhiTranslate="artemisApp.examScores.presentationScoreThresholdColumn"
+                                            [translateValues]="{ threshold: presentationScoreThreshold }"
+                                        ></span>
                                         <fa-icon [icon]="faSort" />
                                     </th>
                                 }
                                 <th jhiSortBy="gradeWithBonus.bonusGrade">
-                                    <span>{{
-                                        hasBonus === BonusStrategy.POINTS
-                                            ? ('artemisApp.examScores.bonusPointsColumn' | artemisTranslate)
-                                            : ('artemisApp.examScores.bonusGradeColumn' | artemisTranslate)
-                                    }}</span>
+                                    <span
+                                        [jhiTranslate]="hasBonus === BonusStrategy.POINTS ? 'artemisApp.examScores.bonusPointsColumn' : 'artemisApp.examScores.bonusGradeColumn'"
+                                    ></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                                 <th jhiSortBy="gradeWithBonus.finalGrade">
-                                    <span>{{ 'artemisApp.examScores.finalGradeColumn' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examScores.finalGradeColumn"></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
                             @if (gradingScaleExists && !isBonus) {
-                                <th>{{ 'artemisApp.examScores.passedColumn' | artemisTranslate }}</th>
+                                <th jhiTranslate="artemisApp.examScores.passedColumn"></th>
                             }
                             @if (hasPlagiarismVerdicts) {
                                 <th jhiSortBy="mostSeverePlagiarismVerdict">
-                                    <span>{{ 'artemisApp.examScores.mostSeverePlagiarismVerdictColumn' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examScores.mostSeverePlagiarismVerdictColumn"></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
                             @if (hasPlagiarismVerdictsInBonusSource) {
                                 <th jhiSortBy="gradeWithBonus.mostSeverePlagiarismVerdict">
-                                    <span>{{ 'artemisApp.examScores.mostSeverePlagiarismVerdictInBonusColumn' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examScores.mostSeverePlagiarismVerdictInBonusColumn"></span>
                                     <fa-icon [icon]="faSort" />
                                 </th>
                             }
diff --git a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts
index 49a8462bc98d..e33354d96359 100644
--- a/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts
+++ b/src/main/webapp/app/exam/manage/exam-management-resolve.service.ts
@@ -1,5 +1,5 @@
 import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
diff --git a/src/main/webapp/app/exam/manage/exam-management.component.html b/src/main/webapp/app/exam/manage/exam-management.component.html
index f7689477c83e..d56b14cda7f6 100644
--- a/src/main/webapp/app/exam/manage/exam-management.component.html
+++ b/src/main/webapp/app/exam/manage/exam-management.component.html
@@ -7,11 +7,11 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                 <div class="ms-auto text-truncate justify-content-end">
                     <a class="btn btn-primary me-1" (click)="openImportModal()">
                         <fa-icon [icon]="faFileImport" />
-                        <span>{{ 'artemisApp.examManagement.importExam' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.examManagement.importExam"></span>
                     </a>
                     <a class="btn btn-primary jh-create-entity create-exam" id="create-exam" [routerLink]="['new']">
                         <fa-icon [icon]="faPlus" />
-                        <span>{{ 'artemisApp.examManagement.createExam' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.examManagement.createExam"></span>
                     </a>
                 </div>
             }
@@ -24,15 +24,15 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                     <thead>
                         <tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="sortRows()">
                             <th class="d-md-table-cell" jhiSortBy="id">
-                                <span>{{ 'global.field.id' | artemisTranslate }}</span>
+                                <span jhiTranslate="global.field.id"></span>
                                 <fa-icon [icon]="faSort" />
                             </th>
                             <th jhiSortBy="title">
-                                <span>{{ 'artemisApp.exam.title' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.exam.title"></span>
                                 <fa-icon [icon]="faSort" />
                             </th>
                             <th class="d-md-table-cell">
-                                <span>{{ 'artemisApp.examStatus.columnTitle' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examStatus.columnTitle"></span>
                             </th>
                             <th></th>
                         </tr>
@@ -61,10 +61,10 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                             </span>
                                         }
                                         @if (!exam.testExam) {
-                                            <div class="badge bg-success">{{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}</div>
+                                            <div class="badge bg-success" jhiTranslate="artemisApp.examManagement.testExam.realExam"></div>
                                         }
                                         @if (exam.testExam) {
-                                            <div class="badge bg-primary">{{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}</div>
+                                            <div class="badge bg-primary" jhiTranslate="artemisApp.examManagement.testExam.testExam"></div>
                                         }
                                     </ng-container>
                                 </td>
@@ -82,7 +82,7 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                                 >
                                                     <div>
                                                         <fa-icon [icon]="faListAlt" />
-                                                        <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }}</span>
+                                                        <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.exerciseGroups"></span>
                                                     </div>
                                                 </a>
                                             }
@@ -94,7 +94,7 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                                 >
                                                     <div>
                                                         <fa-icon [icon]="faEye" />
-                                                        <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.studentExams' | artemisTranslate }}</span>
+                                                        <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.studentExams"></span>
                                                     </div>
                                                 </a>
                                             }
@@ -106,7 +106,7 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                                 >
                                                     <div>
                                                         <fa-icon [icon]="faThList" />
-                                                        <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }}</span>
+                                                        <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.assessmentDashboard"></span>
                                                     </div>
                                                 </a>
                                             }
@@ -114,7 +114,7 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                                 <a [routerLink]="[exam.id, 'edit']" class="btn btn-warning btn-sm me-1 mb-1 d-flex align-items-center justify-content-center">
                                                     <div>
                                                         <fa-icon [icon]="faWrench" />
-                                                        <span class="d-none d-md-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+                                                        <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
                                                     </div>
                                                 </a>
                                             }
@@ -123,7 +123,7 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                             @if (course.isAtLeastInstructor) {
                                                 <a [routerLink]="[exam.id, 'test-runs']" class="btn btn-info btn-sm me-1 mb-1 assessment-dashboard">
                                                     <fa-icon [icon]="faUser" />
-                                                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }}</span>
+                                                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.testRun.testRun"></span>
                                                 </a>
                                             }
                                             @if (!exam.testExam && course.isAtLeastInstructor) {
@@ -133,19 +133,19 @@ <h4 id="course-page-heading" jhiTranslate="artemisApp.examManagement.title"></h4
                                                     id="student-button-{{ exam.id }}"
                                                 >
                                                     <fa-icon [icon]="faUser" />
-                                                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.students' | artemisTranslate }}</span>
+                                                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.students"></span>
                                                 </a>
                                             }
                                             @if (course.isAtLeastInstructor) {
                                                 <a [routerLink]="['/course-management', course.id, 'exams', exam.id, 'scores']" class="btn btn-info btn-sm me-1 mb-1">
                                                     <fa-icon [icon]="faEye" />
-                                                    <span class="d-none d-md-inline">{{ 'entity.action.scores' | artemisTranslate }}</span>
+                                                    <span class="d-none d-md-inline" jhiTranslate="entity.action.scores"></span>
                                                 </a>
                                             }
                                             @if (course.isAtLeastInstructor) {
                                                 <a [routerLink]="[exam.id]" class="btn btn-info btn-sm me-1 mb-1" id="checklist-button-{{ exam.id }}">
                                                     <fa-icon [icon]="faThList" />
-                                                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.examChecklist' | artemisTranslate }}</span>
+                                                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.examChecklist"></span>
                                                 </a>
                                             }
                                         </div>
diff --git a/src/main/webapp/app/exam/manage/exam-management.component.ts b/src/main/webapp/app/exam/manage/exam-management.component.ts
index 73b0b4c6ed85..bd55ca990c1c 100644
--- a/src/main/webapp/app/exam/manage/exam-management.component.ts
+++ b/src/main/webapp/app/exam/manage/exam-management.component.ts
@@ -3,14 +3,14 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subject, Subscription } from 'rxjs';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { onError } from 'app/shared/util/global.utils';
 import { AlertService } from 'app/core/util/alert.service';
 import { Course } from 'app/entities/course.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { SortService } from 'app/shared/service/sort.service';
-import { ExamInformationDTO } from 'app/entities/exam-information.model';
+import { ExamInformationDTO } from 'app/entities/exam/exam-information.model';
 import dayjs from 'dayjs/esm';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { faClipboard, faEye, faFileImport, faListAlt, faPlus, faSort, faThList, faTimes, faUser, faWrench } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/main/webapp/app/exam/manage/exam-management.service.ts b/src/main/webapp/app/exam/manage/exam-management.service.ts
index 351453dde320..e76db716af82 100644
--- a/src/main/webapp/app/exam/manage/exam-management.service.ts
+++ b/src/main/webapp/app/exam/manage/exam-management.service.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@angular/core';
-import { ExamUserDTO } from 'app/entities/exam-user-dto.model';
-import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model';
+import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model';
+import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model';
 import { filter, map, tap } from 'rxjs/operators';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import dayjs from 'dayjs/esm';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { createRequestOption } from 'app/shared/util/request.util';
 import { StudentDTO } from 'app/entities/student-dto.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExamScoreDTO } from 'app/exam/exam-scores/exam-score-dtos.model';
-import { ExamInformationDTO } from 'app/entities/exam-information.model';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
+import { ExamInformationDTO } from 'app/entities/exam/exam-information.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
 import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model';
 import { Submission, reconnectSubmissions } from 'app/entities/submission.model';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/exam/manage/exam-status.component.html b/src/main/webapp/app/exam/manage/exam-status.component.html
index 8e51dc8bc66b..a308dd071108 100644
--- a/src/main/webapp/app/exam/manage/exam-status.component.html
+++ b/src/main/webapp/app/exam/manage/exam-status.component.html
@@ -12,12 +12,13 @@
                 }
             </div>
             <div class="status-step-content">
-                <h6 class="text-center">{{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }}</h6>
+                <h6 class="text-center" jhiTranslate="artemisApp.examStatus.preparation.{{ isTestExam ? 'testExam.' : '' }}examPreparation"></h6>
                 <ol>
                     <li class="d-flex align-items-center">
-                        <span>{{
-                            'artemisApp.examStatus.preparation.configureExercises' | artemisTranslate: { amount: exam.exerciseGroups ? exam.exerciseGroups.length : 0 }
-                        }}</span>
+                        <span
+                            jhiTranslate="artemisApp.examStatus.preparation.configureExercises"
+                            [translateValues]="{ amount: exam.exerciseGroups ? exam.exerciseGroups.length : 0 }"
+                        ></span>
                         @if (configuredExercises) {
                             <fa-icon [icon]="faCheckCircle" class="check" />
                         }
@@ -32,14 +33,14 @@ <h6 class="text-center">{{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
                                 <fa-icon [icon]="faCheckCircle" class="check" />
                             }
                             @if (maxPointExercises !== exam.examMaxPoints) {
-                                <span>{{ 'artemisApp.examStatus.preparation.testExam.maxPointsWrong' | artemisTranslate: { points: maxPointExercises } }} </span>
+                                <span jhiTranslate="artemisApp.examStatus.preparation.testExam.maxPointsWrong" [translateValues]="{ points: maxPointExercises }"></span>
                                 <fa-icon [icon]="faTimes" class="cross" />
                             }
                         </li>
                     }
                     @if (!isTestExam) {
                         <li class="d-flex align-items-center">
-                            <span>{{ 'artemisApp.examStatus.preparation.registerStudents' | artemisTranslate: { registered: exam.numberOfExamUsers } }} </span>
+                            <span jhiTranslate="artemisApp.examStatus.preparation.registerStudents" [translateValues]="{ registered: exam.numberOfExamUsers }"></span>
                             @if (registeredStudents) {
                                 <fa-icon [icon]="faCheckCircle" class="check" />
                             }
@@ -50,22 +51,19 @@ <h6 class="text-center">{{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
                     }
                     @if (!isTestExam) {
                         <li class="d-flex align-items-center">
-                            <span>{{ 'artemisApp.examStatus.preparation.generateStudentExams' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examStatus.preparation.generateStudentExams"></span>
                             <!-- If no students are registered yet, we do not want to display "0 of 0" -->
                             @if (!registeredStudents) {
-                                <span>{{ 'artemisApp.examStatus.preparation.notRegistered' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examStatus.preparation.notRegistered"></span>
                             }
                             @if (registeredStudents) {
-                                <span>
-                                    {{
-                                        'artemisApp.examStatus.preparation.registered'
-                                            | artemisTranslate
-                                                : {
-                                                      generated: numberOfGeneratedStudentExams,
-                                                      total: exam.numberOfExamUsers,
-                                                  }
-                                    }}
-                                </span>
+                                <span
+                                    jhiTranslate="artemisApp.examStatus.preparation.registered"
+                                    [translateValues]="{
+                                        generated: numberOfGeneratedStudentExams,
+                                        total: exam.numberOfExamUsers,
+                                    }"
+                                ></span>
                             }
                             @if (generatedStudentExams) {
                                 <fa-icon [icon]="faCheckCircle" class="check" />
@@ -77,7 +75,7 @@ <h6 class="text-center">{{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
                     }
                     @if (!isTestExam) {
                         <li class="d-flex align-items-center">
-                            <span>{{ 'artemisApp.examStatus.preparation.prepareExerciseStart' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examStatus.preparation.prepareExerciseStart"></span>
                             @if (preparedExerciseStart) {
                                 <fa-icon [icon]="faCheckCircle" class="check" />
                             }
@@ -115,13 +113,13 @@ <h6 class="text-center">{{ 'artemisApp.examStatus.preparation.' + (isTestExam ?
         </div>
         <div class="status-step-content">
             <div class="text-center mb-1">
-                <h6>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}</h6>
+                <h6 jhiTranslate="artemisApp.examStatus.conduction.{{ isTestExam ? 'testExam.' : '' }}examConduction"></h6>
                 <b>{{ exam.startDate | artemisDate }} - {{ exam.endDate | artemisDate }}</b>
             </div>
             <!-- In case the exercise configuration is wrong, but the test eam already started, students are not able to start a test eam -->
             @if (examConductionState === examConductionStateEnum.ERROR) {
                 <div class="text-center mb-1">
-                    <h6>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'conductionSuspended' | artemisTranslate }}</h6>
+                    <h6 jhiTranslate="artemisApp.examStatus.conduction.{{ isTestExam ? 'testExam.' : '' }}conductionSuspended"></h6>
                 </div>
             }
             @if (course?.isAtLeastInstructor && examChecklist && examConductionState !== examConductionStateEnum.ERROR) {
@@ -179,7 +177,7 @@ <h6>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
                 }
             </div>
             <div class="status-step-content">
-                <h6 class="text-center">{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</h6>
+                <h6 class="text-center" jhiTranslate="artemisApp.examStatus.correction.examCorrection"></h6>
                 @if (examChecklist) {
                     <ol>
                         @if (examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) {
@@ -215,9 +213,7 @@ <h6 class="text-center">{{ 'artemisApp.examStatus.correction.examCorrection' | a
                                 </b>
                             }
                             @if (!exam.publishResultsDate) {
-                                <b class="unset">
-                                    {{ 'artemisApp.examStatus.correction.notSet' | artemisTranslate }}
-                                </b>
+                                <b class="unset" jhiTranslate="artemisApp.examStatus.correction.notSet"></b>
                             }
                             <br />
                         </li>
diff --git a/src/main/webapp/app/exam/manage/exam-status.component.ts b/src/main/webapp/app/exam/manage/exam-status.component.ts
index 268e12d47d66..fafa2f201137 100644
--- a/src/main/webapp/app/exam/manage/exam-status.component.ts
+++ b/src/main/webapp/app/exam/manage/exam-status.component.ts
@@ -1,8 +1,8 @@
 import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
 import { faArrowRight, faCheckCircle, faCircleExclamation, faDotCircle, faTimes, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamChecklistService } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.service';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
 import dayjs from 'dayjs/esm';
 import { round } from 'app/shared/util/utils';
 import { Course } from 'app/entities/course.model';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts
index 1abff9c1f9ea..826a85b0a83d 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-button.component.ts
@@ -4,7 +4,7 @@ import { faBullhorn } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
 import { Subscription, from } from 'rxjs';
 
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { ExamLiveAnnouncementCreateModalComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component';
 
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html
index 0b05bacb6172..d6ec36ee35e0 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.html
@@ -9,15 +9,14 @@ <h4 class="modal-title" jhiTranslate="artemisApp.examManagement.announcementCrea
         <div class="modal-body">
             <div class="form-group">
                 <div class="mb-4" jhiTranslate="artemisApp.examManagement.announcementCreate.task"></div>
-                <jhi-markdown-editor
-                    #markdownEditor
+                <jhi-markdown-editor-monaco
                     class="markdown-editor"
                     [markdown]="textContent"
                     [showPreviewButton]="false"
                     [showEditButton]="false"
                     [enableFileUpload]="false"
-                    [colorCommands]="[]"
-                    [defaultCommands]="COMMANDS"
+                    [colorAction]="undefined"
+                    [defaultActions]="actions"
                     (markdownChange)="textContentChanged($event)"
                 />
             </div>
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts
index d76862155c27..fb9414672e52 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-announcement-dialog/exam-live-announcement-create-modal.component.ts
@@ -1,18 +1,17 @@
 import { Component } from '@angular/core';
 import { SafeHtml } from '@angular/platform-browser';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { BoldCommand } from 'app/shared/markdown-editor/commands/bold.command';
-import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command';
-import { UnderlineCommand } from 'app/shared/markdown-editor/commands/underline.command';
-import { CodeCommand } from 'app/shared/markdown-editor/commands/code.command';
-import { CodeBlockCommand } from 'app/shared/markdown-editor/commands/codeblock.command';
-import { OrderedListCommand } from 'app/shared/markdown-editor/commands/orderedListCommand';
-import { UnorderedListCommand } from 'app/shared/markdown-editor/commands/unorderedListCommand';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExamLiveEventType, ExamWideAnnouncementEvent } from 'app/exam/participate/exam-participation-live-events.service';
 import { faCheckCircle, faSpinner } from '@fortawesome/free-solid-svg-icons';
 import { AccountService } from 'app/core/auth/account.service';
 import dayjs from 'dayjs/esm';
+import { MonacoBoldAction } from 'app/shared/monaco-editor/model/actions/monaco-bold.action';
+import { MonacoItalicAction } from 'app/shared/monaco-editor/model/actions/monaco-italic.action';
+import { MonacoUnderlineAction } from 'app/shared/monaco-editor/model/actions/monaco-underline.action';
+import { MonacoCodeAction } from 'app/shared/monaco-editor/model/actions/monaco-code.action';
+import { MonacoCodeBlockAction } from 'app/shared/monaco-editor/model/actions/monaco-code-block.action';
+import { MonacoOrderedListAction } from 'app/shared/monaco-editor/model/actions/monaco-ordered-list.action';
 
 @Component({
     selector: 'jhi-exam-live-announcement-create-modal',
@@ -20,7 +19,15 @@ import dayjs from 'dayjs/esm';
     styleUrls: ['./exam-live-announcement-create-modal.component.scss'],
 })
 export class ExamLiveAnnouncementCreateModalComponent {
-    COMMANDS = [new BoldCommand(), new ItalicCommand(), new UnderlineCommand(), new CodeCommand(), new CodeBlockCommand(), new OrderedListCommand(), new UnorderedListCommand()];
+    actions = [
+        new MonacoBoldAction(),
+        new MonacoItalicAction(),
+        new MonacoUnderlineAction(),
+        new MonacoCodeAction(),
+        new MonacoCodeBlockAction(),
+        new MonacoOrderedListAction(),
+        new MonacoOrderedListAction(),
+    ];
 
     courseId: number;
     examId: number;
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html
index 62378895923a..d0525ddc1928 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.html
@@ -1,13 +1,13 @@
 @if (exam?.course?.isAtLeastInstructor) {
     <div>
         <h2>
-            <span>{{ 'artemisApp.examManagement.checklist.' + (isTestExam ? 'testExam.' : '') + 'title' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.examManagement.checklist.{{ isTestExam ? 'testExam.' : '' }}title"></span>
         </h2>
         @if (!isTestExam) {
             <p>
                 <span>
                     {{ 'artemisApp.examManagement.checklist.introduction' | artemisTranslate }}
-                    <a href="https://docs.artemis.cit.tum.de/user/exams/instructors_guide/">{{ 'artemisApp.examManagement.checklist.linkDescription' | artemisTranslate }}</a>
+                    <a href="https://docs.artemis.cit.tum.de/user/exams/instructors_guide/" jhiTranslate="artemisApp.examManagement.checklist.linkDescription"></a>
                     {{ 'artemisApp.examManagement.checklist.introductionPart2' | artemisTranslate }}
                 </span>
             </p>
@@ -15,13 +15,11 @@ <h2>
         @if (isTestExam) {
             <p>
                 <!-- documentation currently missing. -->
-                <span> {{ 'artemisApp.examManagement.checklist.testExam.introduction' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.examManagement.checklist.testExam.introduction"></span>
             </p>
         }
         <br />
-        <h3>
-            {{ 'artemisApp.examStatus.preparation.' + (isTestExam ? 'testExam.' : '') + 'examPreparation' | artemisTranslate }}
-        </h3>
+        <h3 jhiTranslate="artemisApp.examStatus.preparation.{{ isTestExam ? 'testExam.' : '' }}examPreparation"></h3>
         <div class="table-responsive">
             <table class="table table-striped">
                 <thead>
@@ -30,13 +28,13 @@ <h3>
                             <span>#</span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.checklistItem"></span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.description"></span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.goTo"></span>
                         </th>
                     </tr>
                 </thead>
@@ -44,16 +42,16 @@ <h3>
                     <tr>
                         <td>1</td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.tableItem.exerciseGroups' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.exerciseGroups"></span>
                         </td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.exerciseGroups' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.exerciseGroups"></span>
                             <hr />
                             <ul class="list-unstyled">
                                 <li class="list-group-item border-1">
                                     <span>
                                         <jhi-checklist-check [checkAttribute]="exam.exerciseGroups && exam.exerciseGroups.length > 0" />
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.leastoneexercisegroup' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.leastoneexercisegroup"></span>
                                     </span>
                                 </li>
                                 <li class="list-group-item border-1">
@@ -66,30 +64,31 @@ <h3>
                                                 (exam.numberOfExercisesInExam ?? 0) <= exam.exerciseGroups.length
                                             "
                                         />
-                                        <span>{{
-                                            (!hasOptionalExercises
-                                                ? 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsequal'
-                                                : 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsinbetween'
-                                            ) | artemisTranslate
-                                        }}</span>
+                                        <span
+                                            jhiTranslate="{{
+                                                !hasOptionalExercises
+                                                    ? 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsequal'
+                                                    : 'artemisApp.examManagement.checklist.textitems.numberofexercisegroupsinbetween'
+                                            }}"
+                                        ></span>
                                     </span>
                                 </li>
                                 <li class="list-group-item border-1">
                                     <span>
                                         <jhi-checklist-check [checkAttribute]="allGroupsContainExercise" />
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.eachexercisegroup' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.eachexercisegroup"></span>
                                     </span>
                                 </li>
                                 <li class="list-group-item border-1">
                                     <span>
                                         <jhi-checklist-check [checkAttribute]="pointsExercisesEqual" />
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.pointsexercisegroupequal' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.pointsexercisegroupequal"></span>
                                     </span>
                                 </li>
                                 <li class="list-group-item border-1">
                                     <span>
                                         <jhi-checklist-check [checkAttribute]="totalPoints" />
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.totalpointspossible' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.totalpointspossible"></span>
                                     </span>
                                 </li>
                             </ul>
@@ -100,22 +99,22 @@ <h3>
                         <td>
                             <a type="submit" [routerLink]="getExamRoutesByIdentifier('exercise-groups')" class="btn btn-primary" id="exercises-button-groups-table">
                                 <fa-icon [icon]="faListAlt" />
-                                <span>{{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.exerciseGroups"></span>
                             </a>
                         </td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.tableItem.testRun' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.testRun"></span>
                         </td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.testRun' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.testRun"></span>
                             <hr />
                             <ul class="list-unstyled">
                                 @if (examChecklist) {
                                     <li class="list-group-item border-1">
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.testruns' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.testruns"></span>
                                         {{ examChecklist.numberOfTestRuns }}
                                     </li>
                                 }
@@ -124,7 +123,7 @@ <h3>
                         <td>
                             <a [routerLink]="getExamRoutesByIdentifier('test-runs')" class="btn btn-info">
                                 <fa-icon [icon]="faUser" />
-                                <span>{{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.testRun.testRun"></span>
                             </a>
                         </td>
                     </tr>
@@ -132,20 +131,20 @@ <h3>
                         <tr>
                             <td>3</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.register' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.register"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.register' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.register"></span>
                                 <hr />
                                 <ul class="list-unstyled">
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="!!exam.numberOfExamUsers && exam.numberOfExamUsers! > 0" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.textitems.leastonestudent' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.textitems.leastonestudent"></span>
                                         </span>
                                     </li>
                                     <li class="list-group-item border-1">
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.studentsregistered' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.studentsregistered"></span>
                                         <span> {{ exam.numberOfExamUsers }} </span>
                                     </li>
                                 </ul>
@@ -153,23 +152,23 @@ <h3>
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('students')" class="btn btn-info">
                                     <fa-icon [icon]="faUser" />
-                                    <span>{{ 'artemisApp.examManagement.students' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.students"></span>
                                 </a>
                             </td>
                         </tr>
                         <tr>
                             <td>4</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.generateStudentExams' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.generateStudentExams"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.generateStudentExams' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.generateStudentExams"></span>
                                 <hr />
                                 <ul class="list-unstyled">
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="allExamsGenerated" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.textitems.allexamsgenerated' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.textitems.allexamsgenerated"></span>
                                         </span>
                                     </li>
                                 </ul>
@@ -177,23 +176,23 @@ <h3>
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('student-exams')" class="btn btn-primary">
                                     <fa-icon [icon]="faEye" />
-                                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.studentExams' | artemisTranslate }}</span>
+                                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.studentExams"></span>
                                 </a>
                             </td>
                         </tr>
                         <tr>
                             <td>5</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.prepareExerciseStart' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.prepareExerciseStart"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.prepareExerciseStart' | artemisTranslate }} </span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.prepareExerciseStart"></span>
                                 <hr />
                                 <ul class="list-unstyled">
                                     @if (examChecklist) {
                                         <li class="list-group-item border-1">
                                             <jhi-checklist-check [checkAttribute]="!!examChecklist.allExamExercisesAllStudentsPrepared && this.allExamsGenerated" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.textitems.allExercisesPrepared' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.textitems.allExercisesPrepared"></span>
                                         </li>
                                     }
                                 </ul>
@@ -201,7 +200,7 @@ <h3>
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('student-exams')" class="btn btn-primary">
                                     <fa-icon [icon]="faEye" />
-                                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.studentExams' | artemisTranslate }}</span>
+                                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.studentExams"></span>
                                 </a>
                             </td>
                         </tr>
@@ -209,10 +208,10 @@ <h3>
                     <tr>
                         <td>{{ isTestExam ? 3 : 6 }}</td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.tableItem.examDetails' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.examDetails"></span>
                         </td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.examDetails' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.examDetails"></span>
                             @if (isTestExam) {
                                 <hr />
                                 <span>{{ 'artemisApp.examManagement.checklist.testExam.detailsHintForTestExams' | artemisTranslate }} :</span>
@@ -221,19 +220,19 @@ <h3>
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="true" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.testExam.studentRegistration' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.testExam.studentRegistration"></span>
                                         </span>
                                     </li>
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="true" />
-                                            <span>{{ 'artemisApp.studentExams.studentExamStatusTestExam' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.studentExams.studentExamStatusTestExam"></span>
                                         </span>
                                     </li>
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="true" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.testExam.instantResults' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.testExam.instantResults"></span>
                                         </span>
                                     </li>
                                 </ul>
@@ -249,15 +248,14 @@ <h3>
             </table>
         </div>
         <hr />
-        <h3>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + 'examConduction' | artemisTranslate }}</h3>
-        <b>{{
-            'artemisApp.examManagement.checklist.conductionPlannedFromTo'
-                | artemisTranslate
-                    : {
-                          from: exam.startDate! | artemisDate,
-                          to: exam.endDate! | artemisDate,
-                      }
-        }}</b>
+        <h3 jhiTranslate="artemisApp.examStatus.conduction.{{ isTestExam ? 'testExam.' : '' }}examConduction"></h3>
+        <b
+            jhiTranslate="artemisApp.examManagement.checklist.conductionPlannedFromTo"
+            [translateValues]="{
+                from: exam.startDate! | artemisDate,
+                to: exam.endDate! | artemisDate,
+            }"
+        ></b>
         <div class="table-responsive">
             <table class="table table-striped">
                 <thead>
@@ -266,13 +264,13 @@ <h3>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
                             <span>#</span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.checklistItem"></span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.description"></span>
                         </th>
                         <th>
-                            <span>{{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.goTo"></span>
                         </th>
                     </tr>
                 </thead>
@@ -280,10 +278,10 @@ <h3>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
                     <tr>
                         <td>1</td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.tableItem.conductExam' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.conductExam"></span>
                         </td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.conductExam' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.conductExam"></span>
                             <hr />
                             <!-- Display number of registered students -->
                             @if (exam.numberOfExamUsers) {
@@ -326,24 +324,24 @@ <h3>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
                             }
                             @if (examChecklist && numberOfSubmitted! === 0) {
                                 <div>
-                                    <span>{{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.checklist.textitems.noSubmissions"></span>
                                 </div>
                             }
                         </td>
                         <td>
                             <a [routerLink]="getExamRoutesByIdentifier('student-exams')" class="btn btn-primary">
                                 <fa-icon [icon]="faEye" />
-                                <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.studentExams' | artemisTranslate }}</span>
+                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.studentExams"></span>
                             </a>
                         </td>
                     </tr>
                     <tr>
                         <td>2</td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.tableItem.editWorkingTime' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.editWorkingTime"></span>
                         </td>
                         <td>
-                            <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.editWorkingTime' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.editWorkingTime"></span>
                         </td>
                         <td>
                             <jhi-exam-edit-working-time [(exam)]="exam" />
@@ -368,7 +366,7 @@ <h3>{{ 'artemisApp.examStatus.conduction.' + (isTestExam ? 'testExam.' : '') + '
         </div>
         <hr />
         @if (!isTestExam) {
-            <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</h3>
+            <h3 jhiTranslate="artemisApp.examStatus.correction.examCorrection"></h3>
             <div class="table-responsive">
                 <table class="table table-striped">
                     <thead>
@@ -377,13 +375,13 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                                 <span>#</span>
                             </th>
                             <th>
-                                <span>{{ 'artemisApp.examManagement.checklist.checklistItem' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.checklistItem"></span>
                             </th>
                             <th>
-                                <span>{{ 'artemisApp.examManagement.checklist.description' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.description"></span>
                             </th>
                             <th>
-                                <span>{{ 'artemisApp.examManagement.checklist.goTo' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.goTo"></span>
                             </th>
                         </tr>
                     </thead>
@@ -391,27 +389,27 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                         <tr>
                             <td>1</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.suspiciousBehavior' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.suspiciousBehavior"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.suspiciousBehavior' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.suspiciousBehavior"></span>
                                 <hr />
                                 <br />
                             </td>
                             <td>
                                 <a [routerLink]="['suspicious-behavior']" class="btn btn-info">
                                     <fa-icon [icon]="faChartBar" />
-                                    <span>{{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.suspiciousBehavior.title"></span>
                                 </a>
                             </td>
                         </tr>
                         <tr>
                             <td>2</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.assessAllSubmissions' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.assessAllSubmissions"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.assessAllSubmissions' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.assessAllSubmissions"></span>
                                 <hr />
                                 <!-- Display assessment progress summed up over all exercises, by correction round -->
                                 @if (examChecklist && examChecklist.numberOfTotalExamAssessmentsFinishedByCorrectionRound !== null && numberOfSubmitted !== 0) {
@@ -439,7 +437,7 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                                 }
                                 @if (examChecklist && numberOfSubmitted === 0) {
                                     <div>
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.noSubmissions' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.noSubmissions"></span>
                                     </div>
                                 }
                                 <br />
@@ -447,24 +445,24 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('assessment-dashboard')" class="btn btn-primary">
                                     <fa-icon [icon]="faThList" />
-                                    <span>{{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.assessmentDashboard"></span>
                                 </a>
                             </td>
                         </tr>
                         <tr>
                             <td>3</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.publishResults' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.publishResults"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.publishResults' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.publishResults"></span>
                                 <hr />
                                 <ul class="list-unstyled">
                                     <li class="list-group-item border-1">
                                         <span>
                                             <li class="list-group-item border-1">
                                                 <jhi-checklist-check [checkAttribute]="!!exam.publishResultsDate" />
-                                                <span>{{ 'artemisApp.examManagement.checklist.textitems.pulishingdateset' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.examManagement.checklist.textitems.pulishingdateset"></span>
                                             </li>
                                             @if (exam.publishResultsDate) {
                                                 <hr />
@@ -574,22 +572,22 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                         <tr>
                             <td>4</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.examReview' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.examReview"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.examReview' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.examReview"></span>
                                 <hr />
                                 <ul class="list-unstyled">
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="!!exam.examStudentReviewStart" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.textitems.startdatereviewset' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.textitems.startdatereviewset"></span>
                                         </span>
                                     </li>
                                     <li class="list-group-item border-1">
                                         <span>
                                             <jhi-checklist-check [checkAttribute]="!!exam.examStudentReviewEnd" />
-                                            <span>{{ 'artemisApp.examManagement.checklist.textitems.enddatereviewset' | artemisTranslate }}</span>
+                                            <span jhiTranslate="artemisApp.examManagement.checklist.textitems.enddatereviewset"></span>
                                         </span>
                                     </li>
                                 </ul>
@@ -603,10 +601,10 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                         <tr>
                             <td>5</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.resolveComplaints' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.resolveComplaints"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.resolveComplaints' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.resolveComplaints"></span>
                                 <hr />
                                 @if (examChecklist && examChecklist.numberOfAllComplaintsDone !== null && examChecklist.numberOfAllComplaints !== 0) {
                                     <div>
@@ -621,7 +619,7 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                                 }
                                 @if (examChecklist && examChecklist.numberOfAllComplaints === 0) {
                                     <div>
-                                        <span>{{ 'artemisApp.examManagement.checklist.textitems.noComplaints' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.examManagement.checklist.textitems.noComplaints"></span>
                                     </div>
                                 }
                                 <br />
@@ -629,22 +627,22 @@ <h3>{{ 'artemisApp.examStatus.correction.examCorrection' | artemisTranslate }}</
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('assessment-dashboard')" class="btn btn-primary" id="tutor-exam-dashboard-button_table_complaints">
                                     <fa-icon [icon]="faThList" />
-                                    <span>{{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.assessmentDashboard"></span>
                                 </a>
                             </td>
                         </tr>
                         <tr>
                             <td>6</td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.tableItem.exportResults' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.tableItem.exportResults"></span>
                             </td>
                             <td>
-                                <span>{{ 'artemisApp.examManagement.checklist.descriptionItem.exportResults' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.checklist.descriptionItem.exportResults"></span>
                             </td>
                             <td>
                                 <a [routerLink]="getExamRoutesByIdentifier('scores')" class="btn btn-info" id="scores-button_publish_result">
                                     <fa-icon [icon]="faEye" />
-                                    <span>{{ 'entity.action.scores' | artemisTranslate }}</span>
+                                    <span jhiTranslate="entity.action.scores"></span>
                                 </a>
                             </td>
                         </tr>
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts
index 5a2a236c2396..f873b396b058 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
-import { Exam } from 'app/entities/exam.model';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
+import { Exam } from 'app/entities/exam/exam.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
 import { faChartBar, faEye, faListAlt, faThList, faUser, faWrench } from '@fortawesome/free-solid-svg-icons';
 import { ExamChecklistService } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.service';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts
index fc85375c8e28..ac6133a43d76 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-checklist.service.ts
@@ -1,7 +1,7 @@
 import { HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { Observable } from 'rxjs';
 import { filter, map } from 'rxjs/operators';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts
index 8eb453d1a091..a1bb4e17c565 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time-dialog.component.ts
@@ -3,7 +3,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { faBan, faCheck, faSpinner } from '@fortawesome/free-solid-svg-icons';
 
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { examWorkingTime } from 'app/exam/participate/exam.utils';
 
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html
index 0145161f28b6..e0cd3e78705c 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.html
@@ -1,4 +1,4 @@
 <button id="edit-working-time-button" class="btn btn-md btn-warning" [disabled]="!workingTimeChangeAllowed" (click)="openDialog($event)">
     <fa-icon [icon]="faHourglassHalf" />
-    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.editWorkingTime.title' | artemisTranslate }}</span>
+    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.editWorkingTime.title"></span>
 </button>
diff --git a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts
index 5433a4e48887..4024634666c9 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-checklist-component/exam-edit-workingtime-dialog/exam-edit-working-time.component.ts
@@ -4,7 +4,7 @@ import { faHourglassHalf } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
 import { Subscription, from } from 'rxjs';
 
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { ExamEditWorkingTimeDialogComponent } from './exam-edit-working-time-dialog.component';
 
diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html
index e3744b67e4a5..18dfd2f261a6 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.html
@@ -4,10 +4,10 @@
             <div>
                 <h2 id="exam-detail-title">
                     @if (!exam.testExam) {
-                        <span class="badge bg-success">{{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}</span>
+                        <span class="badge bg-success" jhiTranslate="artemisApp.examManagement.testExam.realExam"></span>
                     }
                     @if (exam.testExam) {
-                        <span class="badge bg-primary">{{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}</span>
+                        <span class="badge bg-primary" jhiTranslate="artemisApp.examManagement.testExam.testExam"></span>
                     }
                     {{ exam.title }}
                 </h2>
@@ -16,50 +16,50 @@ <h2 id="exam-detail-title">
                     <div>
                         <a id="exercises-button-groups" type="submit" [routerLink]="getExamRoutesByIdentifier('exercise-groups')" class="btn btn-primary mt-1">
                             <fa-icon [icon]="faListAlt" />
-                            <span>{{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.exerciseGroups"></span>
                         </a>
                         <!-- Remove ngIf when Quiz Exam feature is fully implemented -->
                         @if (false) {
                             <a id="quiz-pool" type="submit" [routerLink]="getExamRoutesByIdentifier('quiz-pool')" class="btn btn-primary mt-1">
                                 <fa-icon [icon]="faListAlt" />
-                                <span>{{ 'artemisApp.examManagement.quizPool' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.quizPool"></span>
                             </a>
                         }
                         @if (!exam.testExam) {
                             <a id="students-button" [routerLink]="getExamRoutesByIdentifier('students')" class="btn btn-info mt-1">
                                 <fa-icon [icon]="faUser" />
-                                <span>{{ 'artemisApp.examManagement.students' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.students"></span>
                             </a>
                         }
                         <a id="studentExamsButton" [routerLink]="getExamRoutesByIdentifier('student-exams')" class="btn btn-info mt-1">
                             <fa-icon [icon]="faEye" />
-                            <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.studentExams' | artemisTranslate }}</span>
+                            <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.studentExams"></span>
                         </a>
                         <a id="testrun-button" [routerLink]="getExamRoutesByIdentifier('test-runs')" class="btn btn-info mt-1">
                             <fa-icon [icon]="faFlaskVial" />
-                            <span>{{ 'artemisApp.examManagement.testRun.testRun' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.testRun.testRun"></span>
                         </a>
                         @if (!exam.testExam) {
                             <a id="assessment-dashboard-button" [routerLink]="getExamRoutesByIdentifier('assessment-dashboard')" class="btn btn-primary mt-1">
                                 <fa-icon [icon]="faThList" />
-                                <span>{{ 'artemisApp.examManagement.assessmentDashboard' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.assessmentDashboard"></span>
                             </a>
                         }
                         @if (!exam.testExam) {
                             <a [routerLink]="getExamRoutesByIdentifier('grading-system')" class="btn btn-info mt-1">
                                 <fa-icon [icon]="faClipboard" />
-                                <span>{{ 'artemisApp.examManagement.gradingSystem' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.gradingSystem"></span>
                             </a>
                         }
                         @if (canHaveBonus) {
                             <a [routerLink]="getExamRoutesByIdentifier('bonus')" class="btn btn-info mt-1">
                                 <fa-icon [icon]="faAward" />
-                                <span>{{ 'artemisApp.examManagement.bonus' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.examManagement.bonus"></span>
                             </a>
                         }
                         <a id="scores-button" [routerLink]="getExamRoutesByIdentifier('scores')" class="btn btn-info mt-1">
                             <fa-icon [icon]="faEye" />
-                            <span>{{ 'entity.action.scores' | artemisTranslate }}</span>
+                            <span jhiTranslate="entity.action.scores"></span>
                         </a>
                         <a [routerLink]="getExamRoutesByIdentifier('plagiarism-cases')" class="tab-item btn btn-info btn-md mt-1">
                             <fa-icon [icon]="faHeartBroken" />
diff --git a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts
index f182ca3b0a58..c0f4130e83c1 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-detail.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { SafeHtml } from '@angular/platform-browser';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Observable, Subject, map } from 'rxjs';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ActionType, EntitySummary } from 'app/shared/delete-dialog/delete-dialog.model';
 import { ButtonSize } from 'app/shared/components/button.component';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts
index 342c7b6fb1c1..9739343cb687 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { faCheckDouble, faFont } from '@fortawesome/free-solid-svg-icons';
 import { Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts
index e9b8976146f3..ca9bcbf3f1fc 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import-paging.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { PagingService } from 'app/exercises/shared/manage/paging.service';
 import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table';
 import { Observable } from 'rxjs';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html
index cc6e19353695..04c0f2e4ae7c 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.html
@@ -1,10 +1,10 @@
 <form>
     <div class="modal-header">
         @if (!subsequentExerciseGroupSelection) {
-            <h4 class="modal-title">{{ 'artemisApp.examManagement.importExam' | artemisTranslate }}</h4>
+            <h4 class="modal-title" jhiTranslate="artemisApp.examManagement.importExam"></h4>
         }
         @if (subsequentExerciseGroupSelection) {
-            <h4 class="modal-title">{{ 'artemisApp.examManagement.exerciseGroup.import' | artemisTranslate }}</h4>
+            <h4 class="modal-title" jhiTranslate="artemisApp.examManagement.exerciseGroup.import"></h4>
         }
         <button type="button" class="btn-close" data-dismiss="modal" aria-hidden="true" (click)="clear()"></button>
     </div>
@@ -54,10 +54,10 @@ <h4 class="modal-title">{{ 'artemisApp.examManagement.exerciseGroup.import' | ar
                             </td>
                             <td class="text-break col-2">
                                 @if (!exam.testExam) {
-                                    <span class="badge bg-success">{{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}</span>
+                                    <span class="badge bg-success" jhiTranslate="artemisApp.examManagement.testExam.realExam"></span>
                                 }
                                 @if (exam.testExam) {
-                                    <span class="badge bg-primary">{{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}</span>
+                                    <span class="badge bg-primary" jhiTranslate="artemisApp.examManagement.testExam.testExam"></span>
                                 }
                             </td>
                             <td class="col-1">
diff --git a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts
index 35a04a6c96cc..f97c8c3d537b 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-import/exam-import.component.ts
@@ -3,7 +3,7 @@ import { Component, Input, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component';
diff --git a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html
index 49ee3579c49e..fe55d21b62a8 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.html
@@ -1,8 +1,14 @@
 <div id="exam-mode-picker" class="d-flex align-items-start">
     <div class="btn-group" [ngClass]="{ disabled: disableInput }">
-        <div id="standard-mode" class="btn" [class.btn-success]="!exam.testExam" [class.btn-default]="exam.testExam" [class.disabled]="disableInput" (click)="setExamMode(false)">
-            {{ 'artemisApp.examManagement.testExam.realExam' | artemisTranslate }}
-        </div>
+        <div
+            id="standard-mode"
+            class="btn"
+            [class.btn-success]="!exam.testExam"
+            [class.btn-default]="exam.testExam"
+            [class.disabled]="disableInput"
+            (click)="setExamMode(false)"
+            jhiTranslate="artemisApp.examManagement.testExam.realExam"
+        ></div>
         <div
             id="test-mode"
             class="btn btn-default"
@@ -10,8 +16,7 @@
             [class.btn-default]="!exam.testExam"
             [class.disabled]="disableInput"
             (click)="setExamMode(true)"
-        >
-            {{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}
-        </div>
+            jhiTranslate="artemisApp.examManagement.testExam.testExam"
+        ></div>
     </div>
 </div>
diff --git a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts
index 946654f067f4..c022b55ec428 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-mode-picker/exam-mode-picker.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 @Component({
     selector: 'jhi-exam-mode-picker',
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.html b/src/main/webapp/app/exam/manage/exams/exam-update.component.html
index 3fdb6a1dfe4e..780e07a92c40 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-update.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.html
@@ -4,15 +4,15 @@
             @if (!exam.id) {
                 <div class="d-flex align-items-center">
                     @if (!isImport) {
-                        <h4>{{ 'artemisApp.examManagement.createExam' | artemisTranslate }}</h4>
+                        <h4 jhiTranslate="artemisApp.examManagement.createExam"></h4>
                     }
                     @if (isImport) {
-                        <h4>{{ 'artemisApp.examManagement.importExam' | artemisTranslate }}</h4>
+                        <h4 jhiTranslate="artemisApp.examManagement.importExam"></h4>
                     }
                     <jhi-documentation-button [type]="documentationType" />
                 </div>
             } @else {
-                <h4>{{ 'artemisApp.examManagement.editExam' | artemisTranslate }}</h4>
+                <h4 jhiTranslate="artemisApp.examManagement.editExam"></h4>
             }
             <!-- Section exam configuration -->
             <div>
@@ -102,7 +102,7 @@ <h5 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.conduction"></
                         id="startDate"
                     />
                     @if (isStartDateSet && isValidStartDateValue && !isValidStartDate) {
-                        <span class="invalid-feedback"> {{ 'entity.startDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="entity.startDateError"></span>
                     }
                 </div>
                 <div class="col-sm-4">
@@ -118,7 +118,7 @@ <h5 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.conduction"></
                         id="endDate"
                     />
                     @if (isEndDateSet && isValidEndDateValue && !isValidEndDate) {
-                        <span class="invalid-feedback"> {{ 'entity.endDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="entity.endDateError"></span>
                     }
                 </div>
             </div>
@@ -232,7 +232,7 @@ <h6 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.assessmentEmpt
                                 id="examStudentReviewEnd"
                             />
                             @if (!isValidExamStudentReviewEnd) {
-                                <span class="invalid-feedback"> {{ 'artemisApp.examManagement.reviewDatesInvalidWarning' | artemisTranslate }}</span>
+                                <span class="invalid-feedback" jhiTranslate="artemisApp.examManagement.reviewDatesInvalidWarning"></span>
                             }
                         </div>
                     </div>
@@ -257,19 +257,19 @@ <h5 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.examSolutions"
             <h5 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.text"></h5>
             <div class="form-group">
                 <label for="startText" jhiTranslate="artemisApp.examManagement.startText"></label>
-                <jhi-markdown-editor id="startText" class="markdown-editor" [(markdown)]="exam.startText" />
+                <jhi-markdown-editor-monaco id="startText" class="markdown-editor" [(markdown)]="exam.startText" />
             </div>
             <div class="form-group">
                 <label for="startText" jhiTranslate="artemisApp.examManagement.endText"></label>
-                <jhi-markdown-editor id="endText" class="markdown-editor" [(markdown)]="exam.endText" />
+                <jhi-markdown-editor-monaco id="endText" class="markdown-editor" [(markdown)]="exam.endText" />
             </div>
             <div class="form-group">
                 <label for="startText" jhiTranslate="artemisApp.examManagement.confirmationStartText"></label>
-                <jhi-markdown-editor id="confirmationStartText" class="markdown-editor" [(markdown)]="exam.confirmationStartText" />
+                <jhi-markdown-editor-monaco id="confirmationStartText" class="markdown-editor" [(markdown)]="exam.confirmationStartText" />
             </div>
             <div class="form-group">
                 <label for="startText" jhiTranslate="artemisApp.examManagement.confirmationEndText"></label>
-                <jhi-markdown-editor id="confirmationEndText" class="markdown-editor" [(markdown)]="exam.confirmationEndText" />
+                <jhi-markdown-editor-monaco id="confirmationEndText" class="markdown-editor" [(markdown)]="exam.confirmationEndText" />
             </div>
             <div>
                 <button type="button" class="btn btn-secondary" (click)="resetToPreviousState()">
@@ -279,7 +279,7 @@ <h5 class="pb-1" jhiTranslate="artemisApp.examManagement.sections.text"></h5>
                     <fa-icon [icon]="faSave" />&nbsp;{{ 'entity.action.' + (isImport ? 'import' : 'save') | artemisTranslate }}
                 </button>
                 <ng-template #renderedWarning>
-                    <div>{{ 'artemisApp.examManagement.reviewDatesInvalidExplanation' | artemisTranslate }}</div>
+                    <div jhiTranslate="artemisApp.examManagement.reviewDatesInvalidExplanation"></div>
                 </ng-template>
                 @if (!isValidExamStudentReviewEnd) {
                     <span class="badge bg-warning" [ngbTooltip]="renderedWarning" placement="right auto">
diff --git a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
index d9068bff7473..ea4d3a510ec4 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
+++ b/src/main/webapp/app/exam/manage/exams/exam-update.component.ts
@@ -6,7 +6,7 @@ import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/c
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { faBan, faExclamationTriangle, faSave } from '@fortawesome/free-solid-svg-icons';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AlertService } from 'app/core/util/alert.service';
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html
index dedbac0c4960..fd9aab7bd355 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html
+++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.html
@@ -1,5 +1,5 @@
 <div>
-    <h4>{{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'artemisApp.examManagement.exerciseGroup.create') | artemisTranslate }}</h4>
+    <h4 jhiTranslate="{{ exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'artemisApp.examManagement.exerciseGroup.create' }}"></h4>
     <form name="editForm" role="form" #editForm="ngForm" (ngSubmit)="save()">
         <div class="form-group">
             <label class="form-check-label" for="title" jhiTranslate="artemisApp.examManagement.exerciseGroup.title"></label>
@@ -10,7 +10,7 @@ <h4>{{ (exerciseGroup.id ? 'artemisApp.examManagement.exerciseGroup.update' : 'a
             <label class="form-check-label" for="isMandatory" jhiTranslate="artemisApp.examManagement.exerciseGroup.mandatory"></label>
         </div>
         <ngb-alert [type]="alertType" [dismissible]="false">
-            <span>{{ 'artemisApp.examManagement.exerciseGroup.titleInfo' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.examManagement.exerciseGroup.titleInfo"></span>
         </ngb-alert>
         <div class="mt-3">
             <button type="button" class="btn btn-secondary" (click)="previousState()"><fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts
index bfee12779e25..7acfb1fac6a6 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts
+++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-group-update.component.ts
@@ -5,7 +5,7 @@ import { AlertService } from 'app/core/util/alert.service';
 import { Observable } from 'rxjs';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { onError } from 'app/shared/util/global.utils';
 import { faBan, faSave } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html
index 3ef9ff418472..8b72a9f8f417 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html
+++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex pb-3 border-bottom mb-2">
     <div class="d-flex flex-column justify-content-center">
-        <h4 class="mb-0">{{ 'artemisApp.examManagement.exerciseGroups' | artemisTranslate }}</h4>
+        <h4 class="mb-0" jhiTranslate="artemisApp.examManagement.exerciseGroups"></h4>
     </div>
     @if (course?.isAtLeastEditor) {
         <div class="ms-auto d-flex flex-wrap">
@@ -51,12 +51,12 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             <div class="btn-group-vertical me-1 mb-1" style="justify-content: end">
                                 <a [routerLink]="[exerciseGroup.id, 'file-upload-exercises', 'new']" class="btn btn-info btn-sm me-1 mb-1" style="max-height: 44%">
                                     <fa-icon [icon]="faPlus" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.fileUploadExercise.home.createLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.fileUploadExercise.home.createLabel"></span>
                                     <fa-icon [icon]="faFileUpload" />
                                 </a>
                                 <a (click)="openImportModal(exerciseGroup, exerciseType.FILE_UPLOAD)" class="btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faFileImport" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.fileUploadExercise.home.importLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.fileUploadExercise.home.importLabel"></span>
                                     <fa-icon [icon]="faFileUpload" />
                                 </a>
                             </div>
@@ -65,12 +65,12 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             <div class="btn-group-vertical me-1 mb-1" style="justify-content: end">
                                 <a [routerLink]="[exerciseGroup.id, 'quiz-exercises', 'new']" class="add-quiz-exercise btn btn-info btn-sm me-1 mb-1" style="max-height: 44%">
                                     <fa-icon [icon]="faPlus" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.quizExercise.home.createLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.quizExercise.home.createLabel"></span>
                                     <fa-icon [icon]="faCheckDouble" />
                                 </a>
                                 <a (click)="openImportModal(exerciseGroup, exerciseType.QUIZ)" class="btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faFileImport" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.quizExercise.home.importLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.quizExercise.home.importLabel"></span>
                                     <fa-icon [icon]="faCheckDouble" />
                                 </a>
                             </div>
@@ -79,12 +79,12 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             <div class="btn-group-vertical me-1 mb-1">
                                 <a [routerLink]="[exerciseGroup.id, 'text-exercises', 'new']" class="add-text-exercise btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faPlus" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.textExercise.home.createLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.textExercise.home.createLabel"></span>
                                     <fa-icon [icon]="faFont" />
                                 </a>
                                 <a (click)="openImportModal(exerciseGroup, exerciseType.TEXT)" class="btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faFileImport" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.textExercise.home.importLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.textExercise.home.importLabel"></span>
                                     <fa-icon [icon]="faFont" />
                                 </a>
                             </div>
@@ -93,12 +93,12 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             <div class="btn-group-vertical me-1 mb-1">
                                 <a [routerLink]="[exerciseGroup.id, 'modeling-exercises', 'new']" class="add-modeling-exercise btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faPlus" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.modelingExercise.home.createLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.modelingExercise.home.createLabel"></span>
                                     <fa-icon [icon]="faProjectDiagram" />
                                 </a>
                                 <a (click)="openImportModal(exerciseGroup, exerciseType.MODELING)" class="btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faFileImport" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.modelingExercise.home.importLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.modelingExercise.home.importLabel"></span>
                                     <fa-icon [icon]="faProjectDiagram" />
                                 </a>
                             </div>
@@ -107,12 +107,12 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             <div class="btn-group-vertical me-1 mb-1">
                                 <a [routerLink]="[exerciseGroup.id, 'programming-exercises', 'new']" class="add-programming-exercise btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faPlus" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.programmingExercise.home.createLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.programmingExercise.home.createLabel"></span>
                                     <fa-icon [icon]="faKeyboard" />
                                 </a>
                                 <a (click)="openImportModal(exerciseGroup, exerciseType.PROGRAMMING)" class="btn btn-info btn-sm me-1 mb-1">
                                     <fa-icon [icon]="faFileImport" />
-                                    <span class="d-none d-xl-inline">{{ 'artemisApp.programmingExercise.home.importLabel' | artemisTranslate }}</span>
+                                    <span class="d-none d-xl-inline" jhiTranslate="artemisApp.programmingExercise.home.importLabel"></span>
                                     <fa-icon [icon]="faKeyboard" />
                                 </a>
                             </div>
@@ -122,7 +122,7 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                                 <div class="d-flex flex-column me-1 mb-1">
                                     <a [routerLink]="[exerciseGroup.id, 'edit']" class="edit-group btn btn-warning btn-sm me-1 mb-1">
                                         <fa-icon [icon]="faWrench" />
-                                        <span class="d-none d-xl-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+                                        <span class="d-none d-xl-inline" jhiTranslate="entity.action.edit"></span>
                                     </a>
                                     @if (
                                         exerciseGroup.id &&
@@ -181,50 +181,50 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                         <thead>
                             <tr>
                                 <th class="d-md-table-cell">
-                                    <span>{{ 'global.field.id' | artemisTranslate }}</span>
+                                    <span jhiTranslate="global.field.id"></span>
                                 </th>
                                 <th>
-                                    <span>{{ 'artemisApp.examManagement.exerciseGroup.type' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.exerciseGroup.type"></span>
                                 </th>
                                 <th>
-                                    <span>{{ 'artemisApp.examManagement.exerciseGroup.title' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.exerciseGroup.title"></span>
                                 </th>
                                 <th>
-                                    <span>{{ 'artemisApp.examManagement.exerciseGroup.points' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.examManagement.exerciseGroup.points"></span>
                                 </th>
                                 <th>
-                                    <span>{{ 'artemisApp.exercise.bonus' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.exercise.bonus"></span>
                                 </th>
                                 <th>
-                                    <span>{{ 'artemisApp.exercise.includedCompletely' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.exercise.includedCompletely"></span>
                                 </th>
                                 @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id!)?.includes(exerciseType.PROGRAMMING)) {
                                     <th>
-                                        <span>{{ 'artemisApp.exercise.shortName' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.exercise.shortName"></span>
                                     </th>
                                     <th>
-                                        <span>{{ 'artemisApp.programmingExercise.repositories' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.programmingExercise.repositories"></span>
                                     </th>
                                     <th>
-                                        <span>{{ 'artemisApp.programmingExercise.buildplans' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.programmingExercise.buildplans"></span>
                                     </th>
                                     <th>
-                                        <span>{{ 'artemisApp.programmingExercise.participationMode' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.programmingExercise.participationMode"></span>
                                     </th>
                                 }
                                 @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.QUIZ)) {
                                     <th>
-                                        <span>{{ 'artemisApp.quizExercise.questions' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.quizExercise.questions"></span>
                                     </th>
                                 }
                                 @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING)) {
                                     <th>
-                                        <span>{{ 'artemisApp.modelingExercise.diagramType' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.modelingExercise.diagramType"></span>
                                     </th>
                                 }
                                 @if (exerciseGroup.id && exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.FILE_UPLOAD)) {
                                     <th>
-                                        <span>{{ 'artemisApp.fileUploadExercise.filePattern' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.fileUploadExercise.filePattern"></span>
                                     </th>
                                 }
                                 @if (
@@ -234,7 +234,7 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                                         exerciseGroupToExerciseTypesDict.get(exerciseGroup.id)?.includes(exerciseType.MODELING))
                                 ) {
                                     <th>
-                                        <span>{{ 'artemisApp.assessmentMode' | artemisTranslate }}</span>
+                                        <span jhiTranslate="artemisApp.assessmentMode"></span>
                                     </th>
                                 }
                                 <th></th>
@@ -365,9 +365,7 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                 </div>
             }
             @if (!exerciseGroup.exercises) {
-                <div>
-                    {{ 'artemisApp.examManagement.exerciseGroup.noExercises' | artemisTranslate }}
-                </div>
+                <div jhiTranslate="artemisApp.examManagement.exerciseGroup.noExercises"></div>
             }
         </div>
     </div>
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts
index b2c563ecbfd1..8fcac15d391b 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts
+++ b/src/main/webapp/app/exam/manage/exercise-groups/exercise-groups.component.ts
@@ -10,10 +10,10 @@ import { onError } from 'app/shared/util/global.utils';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { AlertService } from 'app/core/util/alert.service';
 import { EventManager } from 'app/core/util/event-manager.service';
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.html b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.html
index 7194d5a9f141..e59af00e81b9 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.html
+++ b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.html
@@ -84,12 +84,13 @@
     @if (displayEditorModus) {
         <div>
             <div class="d-flex justify-content-between">
-                {{ 'artemisApp.programmingExercise.offlineIde' | artemisTranslate }}
-                : {{ programmingExercise.allowOfflineIde || false }}
+                <span jhiTranslate="'artemisApp.programmingExercise.offlineIde'">: {{ programmingExercise.allowOfflineIde || false }}</span>
             </div>
             <div class="d-flex justify-content-between">
-                {{ 'artemisApp.programmingExercise.onlineEditor' | artemisTranslate }}
-                : {{ programmingExercise.allowOnlineEditor || false }}
+                <span jhiTranslate="'artemisApp.programmingExercise.onlineEditor'">: {{ programmingExercise.allowOnlineEditor || false }}</span>
+            </div>
+            <div class="d-flex justify-content-between">
+                <span jhiTranslate="'artemisApp.programmingExercise.onlineIde'">: {{ programmingExercise.allowOnlineIde || false }}</span>
             </div>
         </div>
     }
diff --git a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts
index 949ab1482efe..a2b6d64ca6e0 100644
--- a/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts
+++ b/src/main/webapp/app/exam/manage/exercise-groups/programming-exercise-cell/programming-exercise-group-cell.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { HttpResponse } from '@angular/common/http';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { createBuildPlanUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts
index 7d489674a1e0..7eafe4900d96 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/programming-exam-diff/programming-exercise-exam-diff.component.ts
@@ -1,6 +1,6 @@
 import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { ButtonSize } from 'app/shared/components/button.component';
 import { GitDiffReportModalComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component';
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts
index f351e89940b8..1b54bd14ff8a 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component.ts
@@ -2,14 +2,14 @@ import { AfterViewInit, Component, OnDestroy, OnInit, QueryList, ViewChild, View
 import { ActivatedRoute } from '@angular/router';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ExamPage } from 'app/entities/exam-page.model';
+import { ExamPage } from 'app/entities/exam/exam-page.model';
 import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component';
 import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component';
 import { SubmissionService } from 'app/exercises/shared/submission/submission.service';
 import dayjs from 'dayjs/esm';
 import { SubmissionVersion } from 'app/entities/submission-version.model';
 import { Observable, Subscription, forkJoin, map, mergeMap, toArray } from 'rxjs';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Submission } from 'app/entities/submission.model';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
 import { FileUploadExamSubmissionComponent } from 'app/exam/participate/exercises/file-upload/file-upload-exam-submission.component';
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
index fd714d8f3f14..5b85ae4215cd 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.html
@@ -177,7 +177,7 @@ <h2>
                     </span>
                 </ng-template>
                 <ng-template ngx-datatable-cell-template let-value="value">
-                    <span>{{ (value ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</span>
+                    <span jhiTranslate="{{ value ? 'global.generic.yes' : 'global.generic.no' }}"></span>
                 </ng-template>
             </ngx-datatable-column>
             <ngx-datatable-column prop="submitted" [minWidth]="80" [width]="80">
@@ -188,7 +188,7 @@ <h2>
                     </span>
                 </ng-template>
                 <ng-template ngx-datatable-cell-template let-value="value">
-                    <span class="submitted">{{ (value ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</span>
+                    <span class="submitted" jhiTranslate="{{ value ? 'global.generic.yes' : 'global.generic.no' }}"></span>
                 </ng-template>
             </ngx-datatable-column>
             <ngx-datatable-column prop="submissionDate" [minWidth]="130" [width]="130">
diff --git a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts
index 8ca3aed74f49..f10fc54ecf2a 100644
--- a/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts
+++ b/src/main/webapp/app/exam/manage/student-exams/student-exams.component.ts
@@ -10,7 +10,7 @@ import { Course } from 'app/entities/course.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { HttpErrorResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component';
 import dayjs from 'dayjs/esm';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.html b/src/main/webapp/app/exam/manage/students/exam-students.component.html
index 471b3bcde32e..7a1aa199b56d 100644
--- a/src/main/webapp/app/exam/manage/students/exam-students.component.html
+++ b/src/main/webapp/app/exam/manage/students/exam-students.component.html
@@ -39,7 +39,7 @@ <h3>
                     title="{{ 'artemisApp.examManagement.examStudents.verifyAttendanceTooltip' | artemisTranslate }}"
                 >
                     <fa-icon [icon]="faCheck" />
-                    <span class="d-none d-md-inline">{{ 'artemisApp.examManagement.examStudents.verifyAttendanceBtn' | artemisTranslate }}</span>
+                    <span class="d-none d-md-inline" jhiTranslate="artemisApp.examManagement.examStudents.verifyAttendanceBtn"></span>
                 </a>
             }
             @if (!isTestExam) {
diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.scss b/src/main/webapp/app/exam/manage/students/exam-students.component.scss
index 821e828b9871..ae06ec2008e2 100644
--- a/src/main/webapp/app/exam/manage/students/exam-students.component.scss
+++ b/src/main/webapp/app/exam/manage/students/exam-students.component.scss
@@ -47,16 +47,16 @@ jhi-exam-students {
         &.newly-registered {
             $vars: map-get($datatable-row, newly-registered);
 
+            animation-name: flash-animation;
+            animation-delay: map-get($vars, animation-delay);
+            animation-duration: map-get($vars, animation-duration);
+            animation-timing-function: ease-out;
+
             @keyframes flash-animation {
                 30% {
                     background-color: map-get($vars, background-color);
                 }
             }
-
-            animation-name: flash-animation;
-            animation-delay: map-get($vars, animation-delay);
-            animation-duration: map-get($vars, animation-duration);
-            animation-timing-function: ease-out;
         }
     }
 }
diff --git a/src/main/webapp/app/exam/manage/students/exam-students.component.ts b/src/main/webapp/app/exam/manage/students/exam-students.component.ts
index 43e72be1cbe3..ccc0f9e42671 100644
--- a/src/main/webapp/app/exam/manage/students/exam-students.component.ts
+++ b/src/main/webapp/app/exam/manage/students/exam-students.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnDestroy, OnInit, ViewChild, ViewEncapsulation } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { ExamUser } from 'app/entities/exam-user.model';
+import { ExamUser } from 'app/entities/exam/exam-user.model';
 import { Observable, Subject, Subscription, of } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { User } from 'app/core/user/user.model';
@@ -9,7 +9,7 @@ import { catchError, map, switchMap, tap } from 'rxjs/operators';
 import { UserService } from 'app/core/user/user.service';
 import { DataTableComponent } from 'app/shared/data-table/data-table.component';
 import { iconsAsHTML } from 'app/utils/icons.utils';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts
index 5f2cee93c4bf..16b03fe9bbcd 100644
--- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts
+++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-button.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { StudentsUploadImagesDialogComponent } from 'app/exam/manage/students/upload-images/students-upload-images-dialog.component';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { faPlus, faUpload } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html
index 1e4543088f11..ac30244295db 100644
--- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html
+++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.html
@@ -34,7 +34,7 @@ <h4 class="modal-title">
                 @if (hasParsed) {
                     <div>
                         <div class="ms-2">
-                            <strong>{{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }}</strong>
+                            <strong jhiTranslate="artemisApp.importUsers.numberOfUsersNotImported"></strong>
                             <span
                                 ><b style="color: red">{{ notFoundUsers?.numberOfUsersNotFound }}</b></span
                             >
diff --git a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts
index 3208de448eb1..f94e4b9f836c 100644
--- a/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts
+++ b/src/main/webapp/app/exam/manage/students/upload-images/students-upload-images-dialog.component.ts
@@ -5,7 +5,7 @@ import { AlertService } from 'app/core/util/alert.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { Subject } from 'rxjs';
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { faArrowRight, faBan, faCheck, faCircleNotch, faSpinner, faUpload } from '@fortawesome/free-solid-svg-icons';
 import { onError } from 'app/shared/util/global.utils';
diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
index 2eee9c93ac88..85acc42e31d6 100644
--- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
+++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.html
@@ -2,7 +2,7 @@
     @if (isLoading) {
         <div class="d-flex justify-content-center">
             <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+                <span class="sr-only" jhiTranslate="loading"></span>
             </div>
         </div>
     } @else {
@@ -35,26 +35,26 @@ <h3><span class="text-white badge bg-danger" [jhiTranslate]="'artemisApp.examMan
                 <thead>
                     <tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="sortRows()">
                         <th class="d-md-table-cell" jhiSortBy="id">
-                            <span>{{ 'global.field.id' | artemisTranslate }}</span>
+                            <span jhiTranslate="global.field.id"></span>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th></th>
                         <th class="d-md-table-cell" jhiSortBy="login">
-                            <span>{{ 'artemisApp.examManagement.examStudents.login' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.examStudents.login"></span>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th class="d-md-table-cell" jhiSortBy="registrationNumber">
-                            <span>{{ 'artemisApp.examManagement.examStudents.registrationNumber' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.examStudents.registrationNumber"></span>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th class="d-md-table-cell">
-                            <span>{{ 'artemisApp.examManagement.examStudents.attendanceChecks' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.examManagement.examStudents.attendanceChecks"></span>
                         </th>
                         <th class="d-md-table-cell">
-                            <span>{{ 'artemisApp.studentExams.started' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.studentExams.started"></span>
                         </th>
                         <th class="d-md-table-cell">
-                            <span>{{ 'artemisApp.studentExams.submitted' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.studentExams.submitted"></span>
                         </th>
                     </tr>
                 </thead>
@@ -91,10 +91,10 @@ <h3>
                                 }
                             </td>
                             <td class="d-md-table-cell">
-                                <span>{{ (examUser?.started ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</span>
+                                <span jhiTranslate="{{ examUser?.started ? 'global.generic.yes' : 'global.generic.no' }}"></span>
                             </td>
                             <td class="d-md-table-cell">
-                                <span>{{ (examUser?.submitted ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</span>
+                                <span jhiTranslate="{{ examUser?.submitted ? 'global.generic.yes' : 'global.generic.no' }}"></span>
                             </td>
                         </tr>
                     }
diff --git a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts
index 1d78d6e3806e..e8cfdfa14426 100644
--- a/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts
+++ b/src/main/webapp/app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component.ts
@@ -1,12 +1,12 @@
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model';
+import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model';
 import { SortService } from 'app/shared/service/sort.service';
 import { Subject, Subscription } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
 import { UserService } from 'app/core/user/user.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html
index d027012cf046..88b2917e7530 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/plagiarism-cases-overview/plagiarism-cases-overview.component.html
@@ -1,12 +1,12 @@
-<h5>{{ 'artemisApp.examManagement.plagiarismCasesOverview.title' | artemisTranslate }}</h5>
+<h5 jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.title"></h5>
 <table class="table">
     <thead>
         <tr>
             <th scope="col">#</th>
-            <th scope="col">{{ 'artemisApp.examManagement.plagiarismCasesOverview.exerciseName' | artemisTranslate }}</th>
-            <th scope="col">{{ 'artemisApp.examManagement.plagiarismCasesOverview.numberOfResults' | artemisTranslate }}</th>
-            <th scope="col">{{ 'artemisApp.examManagement.plagiarismCasesOverview.numberOfCases' | artemisTranslate }}</th>
-            <th scope="col">{{ 'artemisApp.examManagement.plagiarismCasesOverview.actions' | artemisTranslate }}</th>
+            <th scope="col" jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.exerciseName"></th>
+            <th scope="col" jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.numberOfResults"></th>
+            <th scope="col" jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.numberOfCases"></th>
+            <th scope="col" jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.actions"></th>
         </tr>
     </thead>
     <tbody>
@@ -17,16 +17,22 @@ <h5>{{ 'artemisApp.examManagement.plagiarismCasesOverview.title' | artemisTransl
                 <td>{{ plagiarismResultsPerExercise.get(exercise) }}</td>
                 <td>{{ plagiarismCasesPerExercise.get(exercise) }}</td>
                 <td>
-                    <button id="view-plagiarism-results-btn-{{ i }}" class="btn btn-primary" (click)="goToPlagiarismDetection(exercise)">
-                        {{ 'artemisApp.examManagement.plagiarismCasesOverview.viewResultsOrRunDetection' | artemisTranslate }}
-                    </button>
+                    <button
+                        id="view-plagiarism-results-btn-{{ i }}"
+                        class="btn btn-primary"
+                        (click)="goToPlagiarismDetection(exercise)"
+                        jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.viewResultsOrRunDetection"
+                    ></button>
                 </td>
             </tr>
         }
     </tbody>
 </table>
 @if (anyPlagiarismCases) {
-    <button class="btn btn-primary" id="view-plagiarism-cases-btn" (click)="goToPlagiarismCases()">
-        {{ 'artemisApp.examManagement.plagiarismCasesOverview.viewCases' | artemisTranslate }}
-    </button>
+    <button
+        class="btn btn-primary"
+        id="view-plagiarism-cases-btn"
+        (click)="goToPlagiarismCases()"
+        jhiTranslate="artemisApp.examManagement.plagiarismCasesOverview.viewCases"
+    ></button>
 }
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html
index 6e5324ec1046..fbe0e73a6b1d 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.html
@@ -2,12 +2,10 @@ <h5>
     {{ 'artemisApp.examManagement.suspiciousBehavior.title' | artemisTranslate }}
     <jhi-documentation-button [type]="documentationType" />
 </h5>
-<p>
-    {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionDescription' | artemisTranslate }}
-</p>
+<p jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionDescription"></p>
 <div>
     <input class="form-check-input" type="checkbox" id="different-student-exams-same-ip" [(ngModel)]="checkboxCriterionDifferentStudentExamsSameIPAddressChecked" />
-    <label for="different-student-exams-same-ip">{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionIpAddress' | artemisTranslate }}</label>
+    <label for="different-student-exams-same-ip" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionIpAddress"></label>
 </div>
 <div>
     <input
@@ -16,13 +14,11 @@ <h5>
         id="different-student-exams-same-fingerprints"
         [(ngModel)]="checkboxCriterionDifferentStudentExamsSameBrowserFingerprintChecked"
     />
-    <label for="different-student-exams-same-fingerprints">{{
-        'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionBrowserFingerprint' | artemisTranslate
-    }}</label>
+    <label for="different-student-exams-same-fingerprints" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionBrowserFingerprint"></label>
 </div>
 <div>
     <input class="form-check-input" type="checkbox" id="same-student-exam-different-ips" [(ngModel)]="checkboxCriterionSameStudentExamDifferentIPAddressesChecked" />
-    <label for="same-student-exam-different-ips">{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionDifferentIpAddress' | artemisTranslate }}</label>
+    <label for="same-student-exam-different-ips" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionDifferentIpAddress"></label>
 </div>
 <div>
     <input
@@ -31,18 +27,16 @@ <h5>
         id="same-student-exam-different-fingerprints"
         [(ngModel)]="checkboxCriterionSameStudentExamDifferentBrowserFingerprintsChecked"
     />
-    <label for="same-student-exam-different-fingerprints">{{
-        'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionDifferentBrowserFingerprint' | artemisTranslate
-    }}</label>
+    <label for="same-student-exam-different-fingerprints" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionDifferentBrowserFingerprint"></label>
 </div>
 <div>
     <input class="form-check-input" type="checkbox" id="ip-outside-of-range" [(ngModel)]="checkboxCriterionIPOutsideOfASpecificRangeChecked" />
-    <label for="ip-outside-of-range">{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionIpOutsideOfRange' | artemisTranslate }}</label>
+    <label for="ip-outside-of-range" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessionCriterionIpOutsideOfRange"></label>
 </div>
 @if (checkboxCriterionIPOutsideOfASpecificRangeChecked) {
     <div class="form-group col-6">
         <div class="d-flex">
-            <label for="ip-subnet" class="me-2">{{ 'artemisApp.examManagement.suspiciousBehavior.subnet' | artemisTranslate }}</label>
+            <label for="ip-subnet" class="me-2" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.subnet"></label>
             <jhi-help-icon text="artemisApp.examManagement.suspiciousBehavior.subnetHelp" />
         </div>
         <input type="text" class="form-control" id="ip-subnet" [(ngModel)]="ipSubnet" [pattern]="ipSubnetRegexPattern" required />
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts
index 18cf6ea1d227..f29b03f4d428 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-behavior.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { Exercise } from 'app/entities/exercise.model';
-import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model';
 import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service';
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html
index 99d55bae1d19..369a156ad591 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.html
@@ -1,4 +1,4 @@
-<h5 class="mb-3">{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.title' | artemisTranslate }}</h5>
+<h5 class="mb-3" jhiTranslate="artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.title"></h5>
 @for (suspiciousSessionsSet of suspiciousSessions; track suspiciousSessionsSet; let i = $index) {
     <p class="mb-0">
         {{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSessions.case' | artemisTranslate }}
@@ -18,12 +18,12 @@ <h5 class="mb-3">{{ 'artemisApp.examManagement.suspiciousBehavior.suspiciousSess
         <table class="table">
             <thead>
                 <tr>
-                    <th scope="col">{{ 'artemisApp.examSession.id' | artemisTranslate }}</th>
-                    <th scope="col">{{ 'artemisApp.examSession.browserFingerprintHash' | artemisTranslate }}</th>
-                    <th scope="col">{{ 'artemisApp.examSession.ipAddress' | artemisTranslate }}</th>
-                    <th scope="col">{{ 'artemisApp.examSession.createdDate' | artemisTranslate }}</th>
-                    <th scope="col">{{ 'artemisApp.examSession.studentExamId' | artemisTranslate }}</th>
-                    <th scope="col">{{ 'artemisApp.examSession.userLogin' | artemisTranslate }}</th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.id"></th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.browserFingerprintHash"></th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.ipAddress"></th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.createdDate"></th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.studentExamId"></th>
+                    <th scope="col" jhiTranslate="artemisApp.examSession.userLogin"></th>
                 </tr>
             </thead>
             <tbody jhi-suspicious-sessions [suspiciousSessions]="suspiciousSessionsSet"></tbody>
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts
index d24b473ec63c..01189459c644 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model';
 import { cloneDeep } from 'lodash-es';
 
 @Component({
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts
index 4f104cb23de8..8c526b0461ba 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model';
 import { Observable } from 'rxjs';
 
 @Injectable({
diff --git a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts
index 05885359d821..860dd819fd01 100644
--- a/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts
+++ b/src/main/webapp/app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 
 @Component({
diff --git a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts
index 829ef039fd9a..a43fa4a9e41c 100644
--- a/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts
+++ b/src/main/webapp/app/exam/manage/test-runs/create-test-run-modal.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
diff --git a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html
index 7c794b51fee1..988dcfa83074 100644
--- a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html
+++ b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.html
@@ -48,7 +48,7 @@ <h2><span jhiTranslate="artemisApp.examManagement.testRun.title"></span>{{ exam?
                 <thead>
                     <tr jhiSort [(predicate)]="predicate" [(ascending)]="ascending" (sortChange)="sortRows()">
                         <th class="d-none d-md-table-cell" jhiSortBy="id">
-                            <span>{{ 'global.field.id' | artemisTranslate }}</span>
+                            <span jhiTranslate="global.field.id"></span>
                             <fa-icon [icon]="faSort" />
                         </th>
                         <th class="d-none d-md-table-cell" jhiSortBy="id">
@@ -84,8 +84,8 @@ <h2><span jhiTranslate="artemisApp.examManagement.testRun.title"></span>{{ exam?
                                 <a> {{ testRun.user?.name || '--' }}</a>
                             </td>
                             <td class="working-time">{{ testRun.workingTime || 0 | artemisDurationFromSeconds }}</td>
-                            <td class="started">{{ (testRun.started ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</td>
-                            <td class="submitted">{{ (testRun.submitted ? 'global.generic.yes' : 'global.generic.no') | artemisTranslate }}</td>
+                            <td class="started" jhiTranslate="{{ testRun.started ? 'global.generic.yes' : 'global.generic.no' }}"></td>
+                            <td class="submitted" jhiTranslate="{{ testRun.submitted ? 'global.generic.yes' : 'global.generic.no' }}"></td>
                             <td>{{ testRun.submissionDate | artemisDate }}</td>
                             <td [width]="350">
                                 <div class="w-100 text-end">
diff --git a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts
index b10eb427b1dd..06d0196d6ba9 100644
--- a/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts
+++ b/src/main/webapp/app/exam/manage/test-runs/test-run-management.component.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AlertService } from 'app/core/util/alert.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts b/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts
index 1b44965d5241..daf2532e3b15 100644
--- a/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-bar/exam-bar.component.ts
@@ -7,7 +7,7 @@ import { ExamParticipationService } from 'app/exam/participate/exam-participatio
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { faDoorClosed } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 
 @Component({
diff --git a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html
index a90146998779..9d56b746c3c9 100644
--- a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html
+++ b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.html
@@ -193,9 +193,7 @@ <h4 id="exam-finished-title">
         </div>
         @if (handInEarly) {
             <div class="mt-3">
-                <div class="mb-2 font-weight-bold text-secondary">
-                    {{ 'artemisApp.examParticipation.continueAfterHandInEarlyDescription' | artemisTranslate }}
-                </div>
+                <div class="mb-2 font-weight-bold text-secondary" jhiTranslate="artemisApp.examParticipation.continueAfterHandInEarlyDescription"></div>
             </div>
         }
         <div class="d-flex justify-content-end gap-3">
diff --git a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts
index eeb5bc50f9d4..090588335574 100644
--- a/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-cover/exam-participation-cover.component.ts
@@ -3,7 +3,7 @@ import { SafeHtml } from '@angular/platform-browser';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { TranslateService } from '@ngx-translate/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Course } from 'app/entities/course.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
diff --git a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html
index 7d86f3a1f68b..e8f14a4be1c1 100644
--- a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html
+++ b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.html
@@ -1,19 +1,22 @@
 <div class="row justify-content-between align-items-start exam-navigation pt-3">
     <div class="col m-0">
         @if (exercises && exercises.length > 0 && !overviewPageOpen) {
-            <div class="col d-none d-lg-block h3 m-0 text-overflow">
-                {{ 'artemisApp.examParticipation.progress' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }}
-            </div>
+            <div
+                class="col d-none d-lg-block h3 m-0 text-overflow"
+                jhiTranslate="artemisApp.examParticipation.progress"
+                [translateValues]="{ current: exerciseIndex + 1, all: exercises.length }"
+            ></div>
         }
         @if (exercises && exercises.length > 0 && !overviewPageOpen) {
-            <div class="col d-block d-lg-none h3 m-0 text-overflow" style="flex: 0.2">
-                {{ 'artemisApp.examParticipation.progressSmall' | artemisTranslate: { current: exerciseIndex + 1, all: exercises.length } }}
-            </div>
+            <div
+                class="col d-block d-lg-none h3 m-0 text-overflow"
+                style="flex: 0.2"
+                jhiTranslate="artemisApp.examParticipation.progressSmall"
+                [translateValues]="{ current: exerciseIndex + 1, all: exercises.length }"
+            ></div>
         }
         @if (overviewPageOpen) {
-            <div class="h3 m-0 text-overflow d-block col">
-                {{ 'artemisApp.examParticipation.examOverview' | artemisTranslate }}
-            </div>
+            <div class="h3 m-0 text-overflow d-block col" jhiTranslate="artemisApp.examParticipation.examOverview"></div>
         }
         <div class="mt-2">
             <jhi-exam-live-events-button />
@@ -83,9 +86,7 @@
                             {{ 'artemisApp.examParticipation.' + (exerciseIndex >= exercises.length - 1 ? 'submitLastExercise' : 'submitOtherExercise') | artemisTranslate }}
                         </button>
                     }
-                    <button id="hand-in-early" class="btn btn-danger ms-2" (click)="handInEarly()">
-                        {{ 'artemisApp.examParticipation.handInEarly' | artemisTranslate }}
-                    </button>
+                    <button id="hand-in-early" class="btn btn-danger ms-2" (click)="handInEarly()" jhiTranslate="artemisApp.examParticipation.handInEarly"></button>
                 </div>
                 <div class="ms-3 mb-2">
                     <jhi-exam-timer class="d-flex justify-content-end mx-0" [criticalTime]="criticalTime" [endDate]="endDate" (timerAboutToEnd)="triggerExamAboutToEnd()" />
diff --git a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts
index e73b90d55907..800285feeda1 100644
--- a/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-navigation-bar/exam-navigation-bar.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { LayoutService } from 'app/shared/breakpoints/layout.service';
 import { CustomBreakpointNames } from 'app/shared/breakpoints/breakpoints.service';
 import dayjs from 'dayjs/esm';
@@ -12,9 +12,9 @@ import { CommitState, DomainChange, DomainType } from 'app/exercises/programming
 import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { map } from 'rxjs/operators';
 import { CodeEditorConflictStateService } from 'app/exercises/programming/shared/code-editor/service/code-editor-conflict-state.service';
-import { ExamSession } from 'app/entities/exam-session.model';
+import { ExamSession } from 'app/entities/exam/exam-session.model';
 import { faBars, faCheck, faEdit } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionVersion } from 'app/entities/submission-version.model';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
 
diff --git a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts
index 61408881fe77..93bcecfa27ae 100644
--- a/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component.ts
@@ -6,9 +6,9 @@ import { Subscription } from 'rxjs';
 import { SidebarEventService } from 'app/shared/sidebar/sidebar-event.service';
 import { SidebarData } from 'app/types/sidebar';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
-import { ExamSession } from 'app/entities/exam-session.model';
+import { ExamSession } from 'app/entities/exam/exam-session.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionVersion } from 'app/entities/submission-version.model';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
 import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
@@ -17,7 +17,7 @@ import { ExamExerciseUpdateService } from 'app/exam/manage/exam-exercise-update.
 import { ButtonTooltipType, ExamParticipationService } from 'app/exam/participate/exam-participation.service';
 import { map } from 'rxjs/operators';
 import { CommitState, DomainChange, DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faChevronRight, faFileLines, faHourglassHalf } from '@fortawesome/free-solid-svg-icons';
 import { facSaveSuccess, facSaveWarning } from '../../../../content/icons/icons';
diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.html b/src/main/webapp/app/exam/participate/exam-participation.component.html
index bfa6fe636568..391c435fee09 100644
--- a/src/main/webapp/app/exam/participate/exam-participation.component.html
+++ b/src/main/webapp/app/exam/participate/exam-participation.component.html
@@ -96,9 +96,11 @@
                             @if ((generateParticipationStatus | async) === 'failed') {
                                 <div class="d-flex justify-content-center align-items-center">
                                     <p class="mb-0" jhiTranslate="artemisApp.examParticipation.generateParticipationFailed"></p>
-                                    <button class="btn btn-sm btn-primary px-3 ms-2" (click)="createParticipationForExercise(this.activeExamPage.exercise!).subscribe()">
-                                        {{ 'artemisApp.examParticipation.generateParticipationRetry' | artemisTranslate }}
-                                    </button>
+                                    <button
+                                        class="btn btn-sm btn-primary px-3 ms-2"
+                                        (click)="createParticipationForExercise(this.activeExamPage.exercise!).subscribe()"
+                                        jhiTranslate="artemisApp.examParticipation.generateParticipationRetry"
+                                    ></button>
                                 </div>
                             }
 
diff --git a/src/main/webapp/app/exam/participate/exam-participation.component.ts b/src/main/webapp/app/exam/participate/exam-participation.component.ts
index 18b5eec1daf5..a26170db25ca 100644
--- a/src/main/webapp/app/exam/participate/exam-participation.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-participation.component.ts
@@ -5,30 +5,30 @@ import { ExamParticipationService } from 'app/exam/participate/exam-participatio
 import { StudentExam } from 'app/entities/student-exam.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { ModelingSubmissionService } from 'app/exercises/modeling/participate/modeling-submission.service';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model';
 import { Submission } from 'app/entities/submission.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { BehaviorSubject, Observable, Subject, Subscription, of, throwError } from 'rxjs';
 import { catchError, distinctUntilChanged, filter, map, tap, throttleTime, timeout } from 'rxjs/operators';
 import { InitializationState } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model';
 import { TranslateService } from '@ngx-translate/core';
 import { AlertService } from 'app/core/util/alert.service';
 import dayjs from 'dayjs/esm';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { cloneDeep } from 'lodash-es';
 import { Course } from 'app/entities/course.model';
 import { captureException } from '@sentry/angular';
 import { HttpErrorResponse } from '@angular/common/http';
-import { ExamPage } from 'app/entities/exam-page.model';
+import { ExamPage } from 'app/entities/exam/exam-page.model';
 import { ExamPageComponent } from 'app/exam/participate/exercises/exam-page.component';
 import { AUTOSAVE_CHECK_INTERVAL, AUTOSAVE_EXERCISE_INTERVAL } from 'app/shared/constants/exercise-exam-constants';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
diff --git a/src/main/webapp/app/exam/participate/exam-participation.service.ts b/src/main/webapp/app/exam/participate/exam-participation.service.ts
index a790afa7a361..5e125f6b1288 100644
--- a/src/main/webapp/app/exam/participate/exam-participation.service.ts
+++ b/src/main/webapp/app/exam/participate/exam-participation.service.ts
@@ -2,7 +2,7 @@ import { HttpClient, HttpErrorResponse, HttpParams, HttpResponse } from '@angula
 import { Injectable } from '@angular/core';
 import { faLightbulb } from '@fortawesome/free-solid-svg-icons';
 import { captureException } from '@sentry/angular';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
diff --git a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts
index eafff2d69467..33237b989106 100644
--- a/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts
+++ b/src/main/webapp/app/exam/participate/exam-start-information/exam-start-information.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { InformationBox, InformationBoxComponent } from 'app/shared/information-box/information-box.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ArtemisExamSharedModule } from 'app/exam/shared/exam-shared.module';
 import dayjs from 'dayjs/esm';
diff --git a/src/main/webapp/app/exam/participate/exam.utils.ts b/src/main/webapp/app/exam/participate/exam.utils.ts
index fecd529e9a80..1070606f377c 100644
--- a/src/main/webapp/app/exam/participate/exam.utils.ts
+++ b/src/main/webapp/app/exam/participate/exam.utils.ts
@@ -1,4 +1,4 @@
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import dayjs from 'dayjs/esm';
 import { round } from 'app/shared/util/utils';
diff --git a/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts b/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts
index 9e9c12dc8148..483891aba2c1 100644
--- a/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts
+++ b/src/main/webapp/app/exam/participate/exercises/exercise-overview-page/exam-exercise-overview-page.component.ts
@@ -2,7 +2,7 @@ import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, O
 import { Exercise, ExerciseType, getIcon, getIconTooltip } from 'app/entities/exercise.model';
 import { ExamPageComponent } from 'app/exam/participate/exercises/exam-page.component';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { ExamExerciseOverviewItem } from 'app/entities/exam-exercise-overview-item.model';
+import { ExamExerciseOverviewItem } from 'app/entities/exam/exam-exercise-overview-item.model';
 import { ButtonTooltipType, ExamParticipationService } from 'app/exam/participate/exam-participation.service';
 import { faHourglassHalf } from '@fortawesome/free-solid-svg-icons';
 import { facSaveSuccess, facSaveWarning } from '../../../../../content/icons/icons';
diff --git a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html
index e1aae0b032ca..be5dce5a54a3 100644
--- a/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html
+++ b/src/main/webapp/app/exam/participate/exercises/file-upload/file-upload-exam-submission.component.html
@@ -27,9 +27,12 @@ <h3 class="text-align-left fw-normal">
                                     <input #fileInput id="fileUploadInput" type="file" class="custom-file-input" (change)="setFileSubmissionForExercise($event)" />
                                 </div>
                                 <div class="col-4">
-                                    <button class="btn btn-primary" id="file-upload-submit" (click)="saveUploadedFile()">
-                                        {{ 'artemisApp.examParticipation.uploadFile' | artemisTranslate }}
-                                    </button>
+                                    <button
+                                        class="btn btn-primary"
+                                        id="file-upload-submit"
+                                        (click)="saveUploadedFile()"
+                                        jhiTranslate="artemisApp.examParticipation.uploadFile"
+                                    ></button>
                                 </div>
                             </div>
                             <p class="d-inline-block" jhiTranslate="artemisApp.fileUploadExercise.supportedFileExtensions"></p>
@@ -46,9 +49,7 @@ <h3 class="text-align-left fw-normal">
             </div>
             @if (submittedFileName && studentSubmission?.filePath) {
                 <div class="card-text">
-                    <h6>
-                        {{ 'artemisApp.fileUploadSubmission.submittedFile' | artemisTranslate: { filename: submittedFileName } }}
-                    </h6>
+                    <h6 jhiTranslate="artemisApp.fileUploadSubmission.submittedFile" [translateValues]="{ filename: submittedFileName }"></h6>
                     <a class="text-primary" (click)="downloadFile(studentSubmission!.filePath!)" jhiTranslate="artemisApp.fileUploadSubmission.download"></a>
                     @if (submittedFileExtension) {
                         <span class="ms-2 badge bg-info">
@@ -59,9 +60,7 @@ <h6>
             }
             @if (!submittedFileName && examTimeline) {
                 <div>
-                    <h6>
-                        {{ 'artemisApp.timeline.fileUploadNotSubmitted' | artemisTranslate }}
-                    </h6>
+                    <h6 jhiTranslate="artemisApp.timeline.fileUploadNotSubmitted"></h6>
                 </div>
             }
         </div>
diff --git a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts
index 2179d1ba37c6..7b18cda9e20a 100644
--- a/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts
+++ b/src/main/webapp/app/exam/participate/exercises/programming/programming-exam-submission.component.ts
@@ -3,7 +3,7 @@ import { Submission } from 'app/entities/submission.model';
 import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CommitState, DomainType, EditorState } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { Exercise, ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html
index b10c4cbac26c..653d0f6b0ad5 100644
--- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html
+++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.html
@@ -20,12 +20,8 @@ <h3 class="text-align-left fw-normal">
         <div left-body class="text-editor-grid mt-4 ps-2 pb-2 w-100">
             <div class="grid-area-main">
                 <div>
-                    <span class="badge bg-primary mb-2">
-                        {{ 'artemisApp.textExercise.wordCount' | artemisTranslate: { count: wordCount } }}
-                    </span>
-                    <span class="badge bg-primary mb-2">
-                        {{ 'artemisApp.textExercise.characterCount' | artemisTranslate: { count: characterCount } }}
-                    </span>
+                    <span class="badge bg-primary mb-2" jhiTranslate="artemisApp.textExercise.wordCount" [translateValues]="{ count: wordCount }"></span>
+                    <span class="badge bg-primary mb-2" jhiTranslate="artemisApp.textExercise.characterCount" [translateValues]="{ count: characterCount }"></span>
                 </div>
                 <ng-container>
                     <textarea
diff --git a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts
index 6b7359bab58b..3a493af08507 100644
--- a/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts
+++ b/src/main/webapp/app/exam/participate/exercises/text/text-exam-submission.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
 import { TextEditorService } from 'app/exercises/text/participate/text-editor.service';
 import { Subject } from 'rxjs';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { StringCountService } from 'app/exercises/text/participate/string-count.service';
 import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
 import { ExamSubmissionComponent } from 'app/exam/participate/exercises/exam-submission.component';
diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html
index 17a9fe8d8752..d6b4a6cd2c74 100644
--- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html
+++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.html
@@ -1,8 +1,6 @@
 <div>
     @if (!displayOnExamCover) {
-        <h3 id="general-information-title">
-            {{ 'artemisApp.exam.examSummary.generalInformation' | artemisTranslate }}
-        </h3>
+        <h3 id="general-information-title" jhiTranslate="artemisApp.exam.examSummary.generalInformation"></h3>
     }
     <div class="ml-4 mt-3 mb-4">
         <table class="table table-borderless mx-auto d-block">
@@ -11,7 +9,7 @@ <h3 id="general-information-title">
                     <tr>
                         <th>{{ 'artemisApp.examManagement.testExam.examMode' | artemisTranslate }}:</th>
                         <td>
-                            <span class="badge bg-primary">{{ 'artemisApp.examManagement.testExam.testExam' | artemisTranslate }}</span>
+                            <span class="badge bg-primary" jhiTranslate="artemisApp.examManagement.testExam.testExam"></span>
                         </td>
                     </tr>
                 }
@@ -93,7 +91,7 @@ <h3 id="general-information-title">
                                 <span>{{ exam.examStudentReviewEnd | artemisDate }}</span>
                             }
                             @if (reviewIsOpen) {
-                                <div class="mx-2 badge bg-success">{{ 'artemisApp.exam.studentReviewEnabled' | artemisTranslate }}</div>
+                                <div class="mx-2 badge bg-success" jhiTranslate="artemisApp.exam.studentReviewEnabled"></div>
                             }
                         </td>
                     </tr>
diff --git a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts
index fb79c9e8ffab..89dc3774bf64 100644
--- a/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts
+++ b/src/main/webapp/app/exam/participate/general-information/exam-general-information.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges } from '@angular/core';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { endTime, examWorkingTime, getAdditionalWorkingTime, isExamOverMultipleDays } from 'app/exam/participate/exam.utils';
 import dayjs from 'dayjs/esm';
 
diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
index 06c7ae63bf6f..f1017919bfb7 100644
--- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
+++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.html
@@ -11,9 +11,7 @@ <h2>
 </div>
 @if (studentExam && !studentExam.submitted) {
     <div class="alert alert-danger text-center">
-        <strong>
-            {{ 'artemisApp.exam.examSummary.youAreViewingAnUnsubmittedExam' | artemisTranslate }}
-        </strong>
+        <strong jhiTranslate="artemisApp.exam.examSummary.youAreViewingAnUnsubmittedExam"></strong>
     </div>
 }
 @if (studentExam?.exam) {
@@ -42,9 +40,7 @@ <h2>
         {{ 'artemisApp.exam.resultInformation' | artemisTranslate }}
     </div>
 }
-<h3>
-    {{ 'artemisApp.exam.exercises' | artemisTranslate }}
-</h3>
+<h3 jhiTranslate="artemisApp.exam.exercises"></h3>
 @for (exercise of studentExam?.exercises; track exercise; let i = $index) {
     <div [id]="'exercise-' + exercise.id">
         <jhi-collapsible-card [isCardContentCollapsed]="exerciseInfos[exercise.id!].isCollapsed" [toggleCollapse]="toggleCollapseExercise(exerciseInfos[exercise.id!])">
diff --git a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts
index ef25fa45c928..dc3af180c411 100644
--- a/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts
+++ b/src/main/webapp/app/exam/participate/summary/exam-result-summary.component.ts
@@ -4,7 +4,7 @@ import { Exercise, ExerciseType, IncludedInOverallScore, getIcon } from 'app/ent
 import dayjs from 'dayjs/esm';
 import { ActivatedRoute } from '@angular/router';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ThemeService } from 'app/core/theme/theme.service';
 import { ExerciseResult, StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model';
@@ -22,7 +22,7 @@ import { faArrowUp, faEye, faEyeSlash, faFolderOpen, faInfoCircle, faPrint } fro
 import { cloneDeep } from 'lodash-es';
 import { captureException } from '@sentry/angular';
 import { AlertService } from 'app/core/util/alert.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { isExamResultPublished } from 'app/exam/participate/exam.utils';
 import { Course } from 'app/entities/course.model';
 
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
index 6ba27112ac6b..2243c413644a 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
+++ b/src/main/webapp/app/exam/participate/summary/exercises/programming-exam-summary/programming-exam-summary.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnInit, Optional } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { MissingResultInformation, evaluateTemplateStatus } from 'app/exercises/shared/result/result.utils';
 import { FeedbackComponentPreparedParams, prepareFeedbackComponentParameters } from 'app/exercises/shared/feedback/feedback.utils';
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html
index 4e36d07cf014..712358bb9347 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html
+++ b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.html
@@ -1,9 +1,7 @@
 @if (quizParticipation.quizQuestions && quizParticipation.quizQuestions.length > 0) {
     <div class="quiz-container">
         @if (showMissingResultsNotice) {
-            <div class="alert alert-info mb-2">
-                {{ 'artemisApp.exam.examSummary.missingResultNotice' | artemisTranslate }}
-            </div>
+            <div class="alert alert-info mb-2" jhiTranslate="artemisApp.exam.examSummary.missingResultNotice"></div>
         }
         @for (question of quizParticipation.quizQuestions!; track question; let i = $index) {
             <div class="quiz-content">
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts
index d1c71b7c9349..217925a8e230 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts
+++ b/src/main/webapp/app/exam/participate/summary/exercises/quiz-exam-summary/quiz-exam-summary.component.ts
@@ -9,7 +9,7 @@ import { MultipleChoiceSubmittedAnswer } from 'app/entities/quiz/multiple-choice
 import { DragAndDropSubmittedAnswer } from 'app/entities/quiz/drag-and-drop-submitted-answer.model';
 import { ShortAnswerSubmittedAnswer } from 'app/entities/quiz/short-answer-submitted-answer.model';
 import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { Result } from 'app/entities/result.model';
 import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils';
diff --git a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts
index 5ea1bf223f68..a1dcf5c9de34 100644
--- a/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts
+++ b/src/main/webapp/app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Exercise } from 'app/entities/exercise.model';
 
 @Component({
diff --git a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html
index fa7d67675528..06bd840dcf5f 100644
--- a/src/main/webapp/app/exam/shared/events/exam-live-event.component.html
+++ b/src/main/webapp/app/exam/shared/events/exam-live-event.component.html
@@ -37,20 +37,20 @@
                         <table class="table table-borderless mx-auto">
                             <tbody>
                                 <tr>
-                                    <th>{{ 'artemisApp.studentExamDetail.name' | artemisTranslate }}</th>
+                                    <th jhiTranslate="artemisApp.studentExamDetail.name"></th>
                                     <td>{{ event.user?.firstName }} {{ event.user?.lastName }}</td>
                                 </tr>
                                 <tr>
-                                    <th>{{ 'artemisApp.studentExamDetail.login' | artemisTranslate }}</th>
+                                    <th jhiTranslate="artemisApp.studentExamDetail.login"></th>
                                     <td>{{ event.user?.login }}</td>
                                 </tr>
                                 <tr>
-                                    <th>{{ 'artemisApp.studentExamDetail.email' | artemisTranslate }}</th>
+                                    <th jhiTranslate="artemisApp.studentExamDetail.email"></th>
                                     <td>{{ event.user?.email }}</td>
                                 </tr>
                                 @if (event.user?.visibleRegistrationNumber) {
                                     <tr>
-                                        <th>{{ 'artemisApp.studentExamDetail.matriculationNumber' | artemisTranslate }}</th>
+                                        <th jhiTranslate="artemisApp.studentExamDetail.matriculationNumber"></th>
                                         <td>{{ event.user?.visibleRegistrationNumber }}</td>
                                     </tr>
                                 }
@@ -61,11 +61,12 @@
             }
             @case (ExamLiveEventType.PROBLEM_STATEMENT_UPDATE) {
                 <div>
-                    <div>
-                        {{ 'artemisApp.exam.events.messages.problemStatementUpdate.description' | artemisTranslate: { exerciseName: problemStatementUpdateEvent.exerciseName } }}
-                    </div>
+                    <div
+                        jhiTranslate="artemisApp.exam.events.messages.problemStatementUpdate.description"
+                        [translateValues]="{ exerciseName: problemStatementUpdateEvent.exerciseName }"
+                    ></div>
                     @if (problemStatementUpdateEvent.text) {
-                        <div>{{ 'artemisApp.exam.events.messages.problemStatementUpdate.instructorMessage' | artemisTranslate }}</div>
+                        <div jhiTranslate="artemisApp.exam.events.messages.problemStatementUpdate.instructorMessage"></div>
                         <div [innerHTML]="problemStatementUpdateEvent.text | htmlForMarkdown"></div>
                     }
                 </div>
diff --git a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts
index a343ac1c2743..4d90cf31e917 100644
--- a/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts
+++ b/src/main/webapp/app/exam/shared/working-time-control/working-time-control.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { round } from 'app/shared/util/utils';
 import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe';
 import { getRelativeWorkingTimeExtension } from 'app/exam/participate/exam.utils';
diff --git a/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html b/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html
index a3a04e2f4b8d..002e35fe3ee3 100644
--- a/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html
+++ b/src/main/webapp/app/exercises/file-upload/assess/file-upload-assessment.component.html
@@ -30,7 +30,7 @@
                     <div class="row">
                         @if (submission?.filePath) {
                             <div class="col-12 card-text">
-                                <a class="text-primary" (click)="downloadFile(submission!.filePath!)">{{ 'artemisApp.fileUploadAssessment.submissionFile' | artemisTranslate }}</a>
+                                <a class="text-primary" (click)="downloadFile(submission!.filePath!)" jhiTranslate="artemisApp.fileUploadAssessment.submissionFile"></a>
                                 <span class="ms-2 badge bg-info">{{ attachmentExtension(submission!.filePath!) | uppercase }}</span>
                             </div>
                         }
@@ -77,7 +77,7 @@
                 <div class="row">
                     @if (submission?.filePath) {
                         <div class="col-12 card-text">
-                            <a class="text-primary" (click)="downloadFile(submission!.filePath!)">{{ 'artemisApp.fileUploadAssessment.submissionFile' | artemisTranslate }}</a>
+                            <a class="text-primary" (click)="downloadFile(submission!.filePath!)" jhiTranslate="artemisApp.fileUploadAssessment.submissionFile"></a>
                             <span class="ms-2 badge bg-info">{{ attachmentExtension(submission!.filePath!) | uppercase }}</span>
                         </div>
                     }
diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html
index 018239b68f98..244e6275b8b2 100644
--- a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html
+++ b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.html
@@ -39,12 +39,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.mode" id="artemisApp.exercise.sec
         <h3 jhiTranslate="artemisApp.exercise.sections.problem" id="artemisApp.exercise.sections.problem"></h3>
         <div class="form-group" id="field_problemStatement">
             <label class="form-control-label" jhiTranslate="artemisApp.exercise.problemStatement" for="field_problemStatement"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 class="markdown-editor"
-                [domainCommands]="domainCommandsProblemStatement"
+                [domainActions]="domainActionsProblemStatement"
                 [(markdown)]="fileUploadExercise.problemStatement"
                 (markdownChange)="calculateFormSectionStatus()"
-                [editorMode]="EditorMode.LATEX"
             />
         </div>
         @if (!isExamMode) {
@@ -63,12 +62,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise
         <!-- TODO we want to have a file upload here and store a PDF, not a text. We could allow to add text in the sample_solution_explanation field -->
         <div class="form-group" id="field_exampleSolution">
             <label class="form-control-label" jhiTranslate="artemisApp.exercise.exampleSolution" for="field_exampleSolution"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 class="markdown-editor"
-                [domainCommands]="domainCommandsSampleSolution"
+                [domainActions]="domainActionsExampleSolution"
                 [(markdown)]="fileUploadExercise.exampleSolution"
                 (markdownChange)="calculateFormSectionStatus()"
-                [editorMode]="EditorMode.LATEX"
             />
         </div>
         @if (!isExamMode) {
@@ -83,9 +81,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise
                     (valueChange)="validateDate()"
                 />
                 @if (fileUploadExercise.exampleSolutionPublicationDateError) {
-                    <span class="invalid-feedback">
-                        {{ 'artemisApp.exercise.exampleSolutionPublicationDateError' | artemisTranslate }}
-                    </span>
+                    <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.exampleSolutionPublicationDateError"></span>
                 }
             </div>
         }
@@ -119,7 +115,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="fileUploadExercise.startDate"
                     />
                     @if (fileUploadExercise.startDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.startDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.startDateError"></span>
                     }
                 </div>
             </div>
@@ -140,7 +136,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="fileUploadExercise.dueDate"
                     />
                     @if (fileUploadExercise.dueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.dueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.dueDateError"></span>
                     }
                 </div>
                 <div class="form-group flex-grow-1 ms-3">
@@ -157,15 +153,13 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="fileUploadExercise.assessmentDueDate"
                     />
                     @if (fileUploadExercise.assessmentDueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.assessmentDueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.assessmentDueDateError"></span>
                     }
                 </div>
             </div>
         }
         <div class="form-group">
-            <label class="form-control-label">{{
-                'artemisApp.exercise.includedInOverallScore' + (fileUploadExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate
-            }}</label>
+            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ fileUploadExercise.course ? 'Course' : 'Exam' }}Label"></label>
             <div>
                 <jhi-included-in-overall-score-picker
                     [(includedInOverallScore)]="fileUploadExercise.includedInOverallScore"
@@ -190,9 +184,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         #points="ngModel"
                     />
                     @if (points?.invalid && (points?.dirty || points?.touched) && points?.errors) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.exercise.pointsError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
                     }
                 </div>
             </div>
@@ -211,9 +203,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         #bonusPoints="ngModel"
                     />
                     @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
-                        <div class="alert alert-danger" [hidden]="fileUploadExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
-                            {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }}
-                        </div>
+                        <div
+                            class="alert alert-danger"
+                            [hidden]="fileUploadExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
+                            jhiTranslate="artemisApp.exercise.bonusPointsError"
+                        ></div>
                     }
                 </div>
             </div>
diff --git a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts
index 38e688e7c415..8cf0fe19dcb1 100644
--- a/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/file-upload/manage/file-upload-exercise-update.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
@@ -7,8 +7,6 @@ import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { Exercise, ExerciseMode, IncludedInOverallScore, getCourseId, resetForImport } from 'app/entities/exercise.model';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { cloneDeep } from 'lodash-es';
@@ -27,10 +25,12 @@ import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-f
 import { NgModel } from '@angular/forms';
 import { Subscription } from 'rxjs';
 import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.component';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 
 @Component({
     selector: 'jhi-file-upload-exercise-update',
     templateUrl: './file-upload-exercise-update.component.html',
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit {
     readonly IncludedInOverallScore = IncludedInOverallScore;
@@ -53,10 +53,9 @@ export class FileUploadExerciseUpdateComponent implements AfterViewInit, OnDestr
     goBackAfterSaving = false;
     exerciseCategories: ExerciseCategory[];
     existingCategories: ExerciseCategory[];
-    EditorMode = EditorMode;
     notificationText?: string;
-    domainCommandsProblemStatement = [new KatexCommand()];
-    domainCommandsSampleSolution = [new KatexCommand()];
+    domainActionsProblemStatement = [new MonacoFormulaAction()];
+    domainActionsExampleSolution = [new MonacoFormulaAction()];
     isImport: boolean;
     examCourseId?: number;
 
diff --git a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html
index 6ef4808465d3..563047cf80cd 100644
--- a/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html
+++ b/src/main/webapp/app/exercises/file-upload/participate/file-upload-submission.component.html
@@ -53,8 +53,8 @@ <h6>
                             <span> {{ submission!.submissionDate! | artemisTimeAgo }}</span>
                         </h6>
                     } @else {
-                        <h5>{{ 'artemisApp.exam.examSummary.yourSubmission' | artemisTranslate }}</h5>
-                        <span>{{ 'artemisApp.fileUploadSubmission.submittedFile' | artemisTranslate: { filename: submittedFileName } }}</span>
+                        <h5 jhiTranslate="artemisApp.exam.examSummary.yourSubmission"></h5>
+                        <span jhiTranslate="artemisApp.fileUploadSubmission.submittedFile" [translateValues]="{ filename: submittedFileName }"></span>
                     }
                     <br />
                     <div class="mt-2">
diff --git a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
index 53bac3581010..e6610b4edaf0 100644
--- a/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
+++ b/src/main/webapp/app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component.ts
@@ -354,8 +354,7 @@ export class ModelingAssessmentEditorComponent implements OnInit {
 
     /**
      * Remove a feedback suggestion because it was accepted or discarded.
-     * The actual feedback creation when accepting happens in code-editor-ace-component/unreferenced-feedback because they have full control over the suggestion cards.
-     * @param feedback Feedback suggestion that is removed
+     * @param feedback Feedback suggestion to remove
      */
     removeSuggestion(feedback: Feedback) {
         this.feedbackSuggestions = this.feedbackSuggestions.filter((feedbackSuggestion) => feedbackSuggestion !== feedback);
diff --git a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html
index 20082632d010..8f414f19509e 100644
--- a/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html
+++ b/src/main/webapp/app/exercises/modeling/manage/example-modeling/example-modeling-submission.component.html
@@ -5,7 +5,7 @@ <h2 jhiTranslate="artemisApp.modelingExercise.exampleSubmissionForModelingExerci
                 Example Modeling Submission for Exercise {{ exercise?.title }}
             </h2>
             @if (toComplete) {
-                <h5 class="fw-light">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' | artemisTranslate }}</h5>
+                <h5 class="fw-light" jhiTranslate="artemisApp.exampleSubmission.home.assessmentTraining"></h5>
             }
             @if (assessmentMode) {
                 <p jhiTranslate="artemisApp.exampleSubmission.assessmentInstruction"></p>
@@ -17,7 +17,7 @@ <h5 class="fw-light">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' |
                     <div class="d-flex justify-content-end flex-wrap align-items-center">
                         <div>
                             <div class="text-start">
-                                <span>{{ 'artemisApp.exampleSubmission.assessmentTraining' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.exampleSubmission.assessmentTraining"></span>
                                 <jhi-help-icon [text]="'artemisApp.exampleSubmission.selectModelExplanation'" />
                             </div>
                             <div class="btn-group" role="group">
@@ -30,9 +30,7 @@ <h5 class="fw-light">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' |
                                     [value]="ExampleSubmissionMode.READ_AND_CONFIRM"
                                     [(ngModel)]="selectedMode"
                                 />
-                                <label class="btn btn-outline-secondary" for="read-and-confirm-button">{{
-                                    'artemisApp.exampleSubmission.readAndConfirm' | artemisTranslate
-                                }}</label>
+                                <label class="btn btn-outline-secondary" for="read-and-confirm-button" jhiTranslate="artemisApp.exampleSubmission.readAndConfirm"></label>
                                 <input
                                     type="radio"
                                     class="btn-check"
@@ -42,7 +40,7 @@ <h5 class="fw-light">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' |
                                     [value]="ExampleSubmissionMode.ASSESS_CORRECTLY"
                                     [(ngModel)]="selectedMode"
                                 />
-                                <label class="btn btn-outline-secondary" for="only-not-imported">{{ 'artemisApp.exampleSubmission.assessCorrectly' | artemisTranslate }}</label>
+                                <label class="btn btn-outline-secondary" for="only-not-imported" jhiTranslate="artemisApp.exampleSubmission.assessCorrectly"></label>
                             </div>
                         </div>
                         <button (click)="upsertExampleModelingSubmission()" class="btn btn-primary ms-2 button-resize">
@@ -134,7 +132,7 @@ <h5 class="fw-light">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' |
                     @if (highlightedElements && highlightedElements.size > 0) {
                         <div class="col">
                             <div [style.background-color]="highlightColor" class="my-2 text-center">
-                                <span>{{ 'artemisApp.exampleSubmission.modelElementHint' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.exampleSubmission.modelElementHint"></span>
                             </div>
                         </div>
                     }
diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html
index 05e678ad84d4..5df3a96c4deb 100644
--- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html
+++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.html
@@ -33,12 +33,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.mode" id="artemisApp.exercise.sec
         <h3 jhiTranslate="artemisApp.exercise.sections.problem" id="artemisApp.exercise.sections.problem"></h3>
         <div class="form-group" name="problemStatement" id="field_problemStatement">
             <label class="form-control-label" jhiTranslate="artemisApp.exercise.problemStatement" for="field_problemStatement"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 class="markdown-editor background-editor-color"
-                [domainCommands]="domainCommandsProblemStatement"
+                [domainActions]="domainActionsProblemStatement"
                 [(markdown)]="modelingExercise.problemStatement"
                 (markdownChange)="calculateFormSectionStatus()"
-                [editorMode]="EditorMode.LATEX"
             />
         </div>
         @if (!isExamMode) {
@@ -66,12 +65,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise
         @if (!isImport) {
             <div class="form-group" name="exampleSolutionExplanation" id="field_exampleSolutionExplanation">
                 <label class="form-control-label" jhiTranslate="artemisApp.modelingExercise.exampleSolutionExplanation" for="field_exampleSolutionExplanation"></label>
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     class="markdown-editor background-editor-color"
-                    [domainCommands]="domainCommandsSampleSolution"
+                    [domainActions]="domainActionsExampleSolution"
                     [(markdown)]="modelingExercise.exampleSolutionExplanation"
                     (markdownChange)="calculateFormSectionStatus()"
-                    [editorMode]="EditorMode.LATEX"
                 />
             </div>
         }
@@ -87,9 +85,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise
                     (valueChange)="validateDate()"
                 />
                 @if (modelingExercise.exampleSolutionPublicationDateError) {
-                    <span class="invalid-feedback">
-                        {{ 'artemisApp.exercise.exampleSolutionPublicationDateError' | artemisTranslate }}
-                    </span>
+                    <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.exampleSolutionPublicationDateError"></span>
                 }
             </div>
         }
@@ -123,7 +119,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="modelingExercise.startDate"
                     />
                     @if (modelingExercise.startDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.startDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.startDateError"></span>
                     }
                 </div>
             </div>
@@ -144,7 +140,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="modelingExercise.dueDate"
                     />
                     @if (modelingExercise.dueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.dueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.dueDateError"></span>
                     }
                 </div>
                 <div class="form-group flex-grow-1 ms-3">
@@ -161,15 +157,13 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="modelingExercise.assessmentDueDate"
                     />
                     @if (modelingExercise.assessmentDueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.assessmentDueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.assessmentDueDateError"></span>
                     }
                 </div>
             </div>
         }
         <div class="form-group">
-            <label class="form-control-label">{{
-                'artemisApp.exercise.includedInOverallScore' + (modelingExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate
-            }}</label>
+            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ modelingExercise.course ? 'Course' : 'Exam' }}Label"></label>
             <div>
                 <jhi-included-in-overall-score-picker
                     [(includedInOverallScore)]="modelingExercise.includedInOverallScore"
@@ -195,9 +189,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         #points="ngModel"
                     />
                     @if (points?.invalid && (points?.dirty || points?.touched) && points?.errors) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.exercise.pointsError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
                     }
                 </div>
             </div>
@@ -216,9 +208,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         #bonusPoints="ngModel"
                     />
                     @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
-                        <div class="alert alert-danger" [hidden]="modelingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
-                            {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }}
-                        </div>
+                        <div
+                            class="alert alert-danger"
+                            [hidden]="modelingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
+                            jhiTranslate="artemisApp.exercise.bonusPointsError"
+                        ></div>
                     }
                 </div>
             </div>
@@ -233,17 +227,17 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                 (ngModelChange)="diagramTypeChanged()"
                 id="field_diagramType"
             >
-                <option value="ClassDiagram">{{ 'artemisApp.DiagramType.ClassDiagram' | artemisTranslate }}</option>
-                <option value="ActivityDiagram">{{ 'artemisApp.DiagramType.ActivityDiagram' | artemisTranslate }}</option>
-                <option value="ObjectDiagram">{{ 'artemisApp.DiagramType.ObjectDiagram' | artemisTranslate }}</option>
-                <option value="UseCaseDiagram">{{ 'artemisApp.DiagramType.UseCaseDiagram' | artemisTranslate }}</option>
-                <option value="CommunicationDiagram">{{ 'artemisApp.DiagramType.CommunicationDiagram' | artemisTranslate }}</option>
-                <option value="ComponentDiagram">{{ 'artemisApp.DiagramType.ComponentDiagram' | artemisTranslate }}</option>
-                <option value="DeploymentDiagram">{{ 'artemisApp.DiagramType.DeploymentDiagram' | artemisTranslate }}</option>
-                <option value="PetriNet">{{ 'artemisApp.DiagramType.PetriNet' | artemisTranslate }}</option>
-                <option value="SyntaxTree">{{ 'artemisApp.DiagramType.SyntaxTree' | artemisTranslate }}</option>
-                <option value="Flowchart">{{ 'artemisApp.DiagramType.Flowchart' | artemisTranslate }}</option>
-                <option value="BPMN">{{ 'artemisApp.DiagramType.BPMN' | artemisTranslate }}</option>
+                <option value="ClassDiagram" jhiTranslate="artemisApp.DiagramType.ClassDiagram"></option>
+                <option value="ActivityDiagram" jhiTranslate="artemisApp.DiagramType.ActivityDiagram"></option>
+                <option value="ObjectDiagram" jhiTranslate="artemisApp.DiagramType.ObjectDiagram"></option>
+                <option value="UseCaseDiagram" jhiTranslate="artemisApp.DiagramType.UseCaseDiagram"></option>
+                <option value="CommunicationDiagram" jhiTranslate="artemisApp.DiagramType.CommunicationDiagram"></option>
+                <option value="ComponentDiagram" jhiTranslate="artemisApp.DiagramType.ComponentDiagram"></option>
+                <option value="DeploymentDiagram" jhiTranslate="artemisApp.DiagramType.DeploymentDiagram"></option>
+                <option value="PetriNet" jhiTranslate="artemisApp.DiagramType.PetriNet"></option>
+                <option value="SyntaxTree" jhiTranslate="artemisApp.DiagramType.SyntaxTree"></option>
+                <option value="Flowchart" jhiTranslate="artemisApp.DiagramType.Flowchart"></option>
+                <option value="BPMN" jhiTranslate="artemisApp.DiagramType.BPMN"></option>
             </select>
         </div>
         @if (semiAutomaticAssessmentAvailable) {
diff --git a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts
index 7e66dac4b5d8..ff7875cf23c6 100644
--- a/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/modeling/manage/modeling-exercise-update.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
@@ -6,8 +6,6 @@ import { ModelingExerciseService } from './modeling-exercise.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { ExerciseMode, IncludedInOverallScore, resetForImport } from 'app/entities/exercise.model';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { switchMap, tap } from 'rxjs/operators';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
@@ -32,10 +30,12 @@ import { NgModel } from '@angular/forms';
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 
 @Component({
     selector: 'jhi-modeling-exercise-update',
     templateUrl: './modeling-exercise-update.component.html',
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy, OnInit {
     @ViewChild(ExerciseTitleChannelNameComponent) exerciseTitleChannelNameComponent: ExerciseTitleChannelNameComponent;
@@ -54,7 +54,6 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
     readonly IncludedInOverallScore = IncludedInOverallScore;
     readonly documentationType: DocumentationType = 'Model';
 
-    EditorMode = EditorMode;
     AssessmentType = AssessmentType;
     UMLDiagramType = UMLDiagramType;
 
@@ -65,8 +64,8 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
     exerciseCategories: ExerciseCategory[];
     existingCategories: ExerciseCategory[];
     notificationText?: string;
-    domainCommandsProblemStatement = [new KatexCommand()];
-    domainCommandsSampleSolution = [new KatexCommand()];
+    domainActionsProblemStatement = [new MonacoFormulaAction()];
+    domainActionsExampleSolution = [new MonacoFormulaAction()];
     examCourseId?: number;
     isImport: boolean;
     isExamMode: boolean;
@@ -94,6 +93,7 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
         private activatedRoute: ActivatedRoute,
         private router: Router,
         private navigationUtilService: ArtemisNavigationUtilService,
+        private changeDetectorRef: ChangeDetectorRef,
     ) {}
 
     get editType(): EditType {
@@ -244,6 +244,9 @@ export class ModelingExerciseUpdateComponent implements AfterViewInit, OnDestroy
                         !this.modelingExercise.releaseDate?.isValid()),
             },
         ];
+
+        // otherwise the change detection does not work on the initial load
+        this.changeDetectorRef.detectChanges();
     }
 
     /**
diff --git a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts
index 6ed273f43d6f..ca4b299f55bd 100644
--- a/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts
+++ b/src/main/webapp/app/exercises/programming/assess/code-editor-tutor-assessment-container.component.ts
@@ -8,13 +8,13 @@ import { ButtonSize } from 'app/shared/components/button.component';
 import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service';
 import { ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Location } from '@angular/common';
 import { AccountService } from 'app/core/auth/account.service';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
diff --git a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts
index ab616e7037ca..9a2b5af07fb0 100644
--- a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component.ts
@@ -4,7 +4,7 @@ import { ProgrammingAssessmentRepoExportDialogComponent } from 'app/exercises/pr
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
 import { faDownload } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 @Component({
     selector: 'jhi-programming-assessment-repo-export',
diff --git a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts
index a33b555747b7..e61c909e6893 100644
--- a/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts
+++ b/src/main/webapp/app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component.ts
@@ -4,7 +4,7 @@ import { AlertService } from 'app/core/util/alert.service';
 import { ProgrammingAssessmentRepoExportService, RepositoryExportOptions } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service';
 import { HttpResponse } from '@angular/common/http';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { downloadZipFileFromResponse } from 'app/shared/util/download.util';
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss
index 225900c6b301..2fa141c0b0d4 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.scss
@@ -36,12 +36,12 @@
 }
 
 .mat-expansion-panel.code-hint-creation-expansion-panel-wrapper-header {
+    font-weight: bold;
+    cursor: default;
+
     .mat-expansion-panel-header {
         border-bottom: 2px solid;
     }
-
-    font-weight: bold;
-    cursor: default;
 }
 
 .sort-icon {
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts
index 56d9dffe846e..d039db390a19 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CoverageReport } from 'app/entities/hestia/coverage-report.model';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { CodeHint, CodeHintGenerationStep } from 'app/entities/hestia/code-hint-model';
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts
index 71bd928ba2ed..0df03f1664b3 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Subject } from 'rxjs';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts
index 254537ce8ad6..59e8150e2fe8 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 import { faWrench } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service';
 import { AlertService } from 'app/core/util/alert.service';
 
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts
index 44658811f194..0fdc47306615 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { CoverageReport } from 'app/entities/hestia/coverage-report.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts
index 2c2a2929fdfd..3903491a1477 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
 
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.html b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.html
index 433689205c2b..3e3b36f53456 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.html
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.html
@@ -40,7 +40,7 @@
     <table class="table table-striped" aria-describedby="showHealthLabel">
         <thead>
             <tr>
-                <th scope="col" class="text-left">{{ 'global.field.id' | artemisTranslate }}</th>
+                <th scope="col" class="text-left" jhiTranslate="global.field.id"></th>
                 <th scope="col" class="text-left">
                     {{ 'artemisApp.programmingExerciseTestCase.testName' | artemisTranslate }}
                     <fa-icon
@@ -50,7 +50,7 @@
                     />
                 </th>
                 <th scope="col" class="text-left">File Path</th>
-                <th scope="col" class="text-left">{{ 'artemisApp.exerciseHint.content' | artemisTranslate }}</th>
+                <th scope="col" class="text-left" jhiTranslate="artemisApp.exerciseHint.content"></th>
                 <th scope="col" class="text-left">
                     <span jhiTranslate="artemisApp.codeHint.entryType"></span>
                     <jhi-help-icon text="artemisApp.codeHint.entryTypeTooltip" />
diff --git a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts
index 13a0b57ec028..5d4b3c68f675 100644
--- a/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component.ts
@@ -3,8 +3,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { SolutionEntryDetailsModalComponent } from 'app/exercises/programming/hestia/generation-overview/solution-entry-details-modal/solution-entry-details-modal.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExerciseTestCaseType } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExerciseTestCaseType } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { Subject } from 'rxjs';
 import { faSort, faSortDown, faSortUp, faTimes } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html
index eacc4d1f6f9e..198b27469831 100644
--- a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html
+++ b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report-modal.component.html
@@ -1,11 +1,9 @@
 <div>
     <div class="modal-header">
-        <h3 class="modal-title">
-            {{
-                (diffForTemplateAndSolution ? 'artemisApp.programmingExercise.diffReport.title' : 'artemisApp.programmingExercise.diffReport.titleForSubmissions')
-                    | artemisTranslate
-            }}
-        </h3>
+        <h3
+            class="modal-title"
+            jhiTranslate="{{ diffForTemplateAndSolution ? 'artemisApp.programmingExercise.diffReport.title' : 'artemisApp.programmingExercise.diffReport.titleForSubmissions' }}"
+        ></h3>
         <button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
     </div>
     <div class="modal-body">
diff --git a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts
index b134a0c17ad2..d72ed6f72de0 100644
--- a/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts
+++ b/src/main/webapp/app/exercises/programming/hestia/git-diff-report/git-diff-report.module.ts
@@ -1,6 +1,5 @@
 import { NgModule } from '@angular/core';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { GitDiffLineStatComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-line-stat.component';
 import { GitDiffReportComponent } from './git-diff-report.component';
 import { GitDiffFileComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-file.component';
@@ -12,7 +11,7 @@ import { GitDiffFilePanelTitleComponent } from 'app/exercises/programming/hestia
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 
 @NgModule({
-    imports: [ArtemisSharedModule, AceEditorModule, NgbAccordionModule, MonacoEditorModule, ArtemisSharedComponentModule],
+    imports: [ArtemisSharedModule, NgbAccordionModule, MonacoEditorModule, ArtemisSharedComponentModule],
     declarations: [GitDiffFilePanelComponent, GitDiffFilePanelTitleComponent, GitDiffReportComponent, GitDiffFileComponent, GitDiffReportModalComponent, GitDiffLineStatComponent],
     exports: [GitDiffReportComponent, GitDiffReportModalComponent, GitDiffLineStatComponent],
 })
diff --git a/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts b/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts
index 9aca74dfa4ef..b160bf88b2be 100644
--- a/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/build-plan-editor.component.ts
@@ -3,9 +3,9 @@ import { faCircleNotch, faPlayCircle } from '@fortawesome/free-solid-svg-icons';
 import { onError } from 'app/shared/util/global.utils';
 import { AlertService } from 'app/core/util/alert.service';
 import { BuildPlanService } from 'app/exercises/programming/manage/services/build-plan.service';
-import { BuildPlan } from 'app/entities/build-plan.model';
+import { BuildPlan } from 'app/entities/programming/build-plan.model';
 import { ActivatedRoute } from '@angular/router';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts
index 3dad17de0cf1..e53bf800e1a9 100644
--- a/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component.ts
@@ -12,7 +12,7 @@ import { TemplateProgrammingExerciseParticipation } from 'app/entities/participa
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { DomainChange, DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts
index 27aeb8f9ff8d..236a85bf0cce 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/category-issues-chart.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input, OnChanges } from '@angular/core';
-import { IssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
+import { IssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
 
 export class IssueColumn {
     w: string;
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts
index 6385cf5773e7..58e2d7aa9dd3 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
-import { CategoryIssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
+import { CategoryIssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { TranslateService } from '@ngx-translate/core';
 import { getColor } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.utils';
 import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive';
@@ -22,11 +22,14 @@ enum ScaChartBarTitle {
         <div>
             <div>
                 <div class="d-flex justify-content-between">
-                    <h4>{{ 'artemisApp.programmingExercise.configureGrading.charts.categoryDistribution.title' | artemisTranslate }}</h4>
+                    <h4 jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.categoryDistribution.title"></h4>
                     @if (tableFiltered) {
-                        <button type="button" class="btn btn-info" (click)="resetTableFilter()">
-                            {{ 'artemisApp.programmingExercise.configureGrading.charts.resetFilter' | artemisTranslate }}
-                        </button>
+                        <button
+                            type="button"
+                            class="btn btn-info"
+                            (click)="resetTableFilter()"
+                            jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.resetFilter"
+                        ></button>
                     }
                 </div>
                 <p [innerHTML]="'artemisApp.programmingExercise.configureGrading.charts.categoryDistribution.description' | artemisTranslate"></p>
@@ -48,49 +51,31 @@ enum ScaChartBarTitle {
                             @switch (model.series) {
                                 @case (scaChartBarTitle.PENALTY) {
                                     <div>
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.penaltyTooltip' | artemisTranslate: { percentage: model.value.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.penaltyTooltip" [translateValues]="{ percentage: model.value.toFixed(2) }"></span>
                                         <br />
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.issuesTooltip' | artemisTranslate: { percentage: model.issues.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.issuesTooltip" [translateValues]="{ percentage: model.issues.toFixed(2) }"></span>
                                         <br />
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.deductionsTooltip' | artemisTranslate: { percentage: model.points.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.deductionsTooltip" [translateValues]="{ percentage: model.points.toFixed(2) }"></span>
                                     </div>
                                 }
                                 @case (scaChartBarTitle.ISSUES) {
                                     <div>
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.penaltyTooltip' | artemisTranslate: { percentage: model.penalty.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.penaltyTooltip" [translateValues]="{ percentage: model.penalty.toFixed(2) }"></span>
                                         <br />
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.issuesTooltip' | artemisTranslate: { percentage: model.value.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.issuesTooltip" [translateValues]="{ percentage: model.value.toFixed(2) }"></span>
                                         <br />
-                                        <span>
-                                            {{ 'artemisApp.programmingAssessment.deductionsTooltip' | artemisTranslate: { percentage: model.points.toFixed(2) } }}
-                                        </span>
+                                        <span jhiTranslate="artemisApp.programmingAssessment.deductionsTooltip" [translateValues]="{ percentage: model.points.toFixed(2) }"></span>
                                     </div>
                                 }
                             }
                         </div>
                         @if ([scaChartBarTitle.DEDUCTIONS_EN, scaChartBarTitle.DEDUCTIONS_DE].includes(model.series)) {
                             <div>
-                                <span>
-                                    {{ 'artemisApp.programmingAssessment.penaltyTooltip' | artemisTranslate: { percentage: model.penalty.toFixed(2) } }}
-                                </span>
+                                <span jhiTranslate="artemisApp.programmingAssessment.penaltyTooltip" [translateValues]="{ percentage: model.penalty.toFixed(2) }"></span>
                                 <br />
-                                <span>
-                                    {{ 'artemisApp.programmingAssessment.issuesTooltip' | artemisTranslate: { percentage: model.issues.toFixed(2) } }}
-                                </span>
+                                <span jhiTranslate="artemisApp.programmingAssessment.issuesTooltip" [translateValues]="{ percentage: model.issues.toFixed(2) }"></span>
                                 <br />
-                                <span>
-                                    {{ 'artemisApp.programmingAssessment.deductionsTooltip' | artemisTranslate: { percentage: model.value.toFixed(2) } }}
-                                </span>
+                                <span jhiTranslate="artemisApp.programmingAssessment.deductionsTooltip" [translateValues]="{ percentage: model.value.toFixed(2) }"></span>
                             </div>
                         }
                     </ng-template>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.html b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.html
index 6ae8e2c7e24d..727a368d1c44 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.html
@@ -1,11 +1,9 @@
 <div>
     <div>
         <div class="d-flex justify-content-between">
-            <h4>{{ 'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.title' | artemisTranslate }}</h4>
+            <h4 jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.title"></h4>
             @if (tableFiltered) {
-                <button type="button" class="btn btn-info" (click)="resetTableFilter()">
-                    {{ 'artemisApp.programmingExercise.configureGrading.charts.resetFilter' | artemisTranslate }}
-                </button>
+                <button type="button" class="btn btn-info" (click)="resetTableFilter()" jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.resetFilter"></button>
             }
         </div>
         <p>
@@ -28,37 +26,35 @@ <h4>{{ 'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.t
                 <br />
                 @if ([testCaseBarTitle.WEIGHT_EN, testCaseBarTitle.WEIGHT_DE].includes(model.series)) {
                     <div>
-                        <span>
-                            {{ 'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightTooltip' | artemisTranslate: { percentage: model.value.toFixed(2) } }}
-                        </span>
+                        <span
+                            jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightTooltip"
+                            [translateValues]="{ percentage: model.value.toFixed(2) }"
+                        ></span>
                         <br />
-                        <span>
-                            {{
-                                'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightAndBonusTooltip'
-                                    | artemisTranslate: { percentage: model.bonus.toFixed(2) }
-                            }}
-                        </span>
+                        <span
+                            jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightAndBonusTooltip"
+                            [translateValues]="{ percentage: model.bonus.toFixed(2) }"
+                        ></span>
                     </div>
                 }
                 @if ([testCaseBarTitle.WEIGHT_AND_BONUS_EN, testCaseBarTitle.WEIGHT_AND_BONUS_DE].includes(model.series)) {
                     <div>
-                        <span>
-                            {{ 'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightTooltip' | artemisTranslate: { percentage: model.weight.toFixed(2) } }}
-                        </span>
+                        <span
+                            jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightTooltip"
+                            [translateValues]="{ percentage: model.weight.toFixed(2) }"
+                        ></span>
                         <br />
-                        <span>
-                            {{
-                                'artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightAndBonusTooltip'
-                                    | artemisTranslate: { percentage: model.value.toFixed(2) }
-                            }}
-                        </span>
+                        <span
+                            jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCaseWeights.weightAndBonusTooltip"
+                            [translateValues]="{ percentage: model.value.toFixed(2) }"
+                        ></span>
                     </div>
                 }
             </ng-template>
         </ngx-charts-bar-horizontal-normalized>
     </div>
     <div class="mt-4">
-        <h4>{{ 'artemisApp.programmingExercise.configureGrading.charts.testCasePoints.title' | artemisTranslate }}</h4>
+        <h4 jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCasePoints.title"></h4>
         <p [innerHTML]="'artemisApp.programmingExercise.configureGrading.charts.testCasePoints.description' | artemisTranslate"></p>
     </div>
     <div #containerRefPoints class="points-chart bg-light">
@@ -74,9 +70,10 @@ <h4>{{ 'artemisApp.programmingExercise.configureGrading.charts.testCasePoints.ti
             <ng-template #tooltipTemplate let-model="model">
                 <b>{{ model.name }}</b>
                 <br />
-                <span>
-                    {{ 'artemisApp.programmingExercise.configureGrading.charts.testCasePoints.pointsTooltip' | artemisTranslate: { percentage: model.value.toFixed(2) } }}
-                </span>
+                <span
+                    jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.testCasePoints.pointsTooltip"
+                    [translateValues]="{ percentage: model.value.toFixed(2) }"
+                ></span>
             </ng-template>
         </ngx-charts-bar-horizontal-stacked>
     </div>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts
index 5aceb9c57804..568402289fca 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { TestCaseStatsMap } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { TestCaseStatsMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { TranslateService } from '@ngx-translate/core';
 import { getColor } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.utils';
 import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive';
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts
index d7c9dadfe0ed..03e4a076bc58 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges } from '@angular/core';
-import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { round } from 'app/shared/util/utils';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html
new file mode 100644
index 000000000000..4c76747e8e96
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.html
@@ -0,0 +1,27 @@
+<div class="m-3">
+    <h2 class="mb-3" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.title" [translateValues]="{ exerciseTitle: exerciseTitle }"></h2>
+    <table class="table table-striped mb-3">
+        <thead>
+            <tr>
+                <th scope="col" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.occurrence"></th>
+                <th scope="col" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.feedback"></th>
+                <th scope="col" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.task"></th>
+                <th scope="col" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.testcase"></th>
+                <th scope="col" jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.errorCategory"></th>
+            </tr>
+        </thead>
+        <tbody class="table-group-divider">
+            @for (item of feedbackDetails; track item) {
+                <tr>
+                    <td class="text-center">{{ item.count }} ({{ item.relativeCount | number: '1.0-0' }}%)</td>
+                    <td>{{ item.detailText }}</td>
+                    <td class="text-center">{{ item.taskNumber }}</td>
+                    <td>{{ item.testCaseName }}</td>
+                    <td>Student Error</td>
+                    <!-- This is a placeholder, will be covered in follow up PRs -->
+                </tr>
+            }
+        </tbody>
+    </table>
+    <div jhiTranslate="artemisApp.programmingExercise.configureGrading.feedbackAnalysis.totalItems" [translateValues]="{ count: feedbackDetails.length }"></div>
+</div>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts
new file mode 100644
index 000000000000..7e1d48121f1c
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component.ts
@@ -0,0 +1,34 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { AlertService } from 'app/core/util/alert.service';
+
+@Component({
+    selector: 'jhi-feedback-analysis',
+    templateUrl: './feedback-analysis.component.html',
+    standalone: true,
+    imports: [ArtemisSharedModule],
+    providers: [FeedbackAnalysisService],
+})
+export class FeedbackAnalysisComponent implements OnInit {
+    @Input() exerciseTitle: string;
+    @Input() exerciseId: number;
+    feedbackDetails: FeedbackDetail[] = [];
+
+    constructor(
+        private feedbackAnalysisService: FeedbackAnalysisService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit(): void {
+        this.loadFeedbackDetails(this.exerciseId);
+    }
+
+    async loadFeedbackDetails(exerciseId: number): Promise<void> {
+        try {
+            this.feedbackDetails = await this.feedbackAnalysisService.getFeedbackDetailsForExercise(exerciseId);
+        } catch (error) {
+            this.alertService.error(`artemisApp.programmingExercise.configureGrading.feedbackAnalysis.error`);
+        }
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts
new file mode 100644
index 000000000000..4fa81cf289d3
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service.ts
@@ -0,0 +1,19 @@
+import { Injectable } from '@angular/core';
+import { BaseApiHttpService } from 'app/course/learning-paths/services/base-api-http.service';
+
+export interface FeedbackDetail {
+    count: number;
+    relativeCount: number;
+    detailText: string;
+    testCaseName: string;
+    taskNumber: number;
+}
+
+@Injectable()
+export class FeedbackAnalysisService extends BaseApiHttpService {
+    private readonly EXERCISE_RESOURCE_URL = 'exercises';
+
+    getFeedbackDetailsForExercise(exerciseId: number): Promise<FeedbackDetail[]> {
+        return this.get<FeedbackDetail[]>(`${this.EXERCISE_RESOURCE_URL}/${exerciseId}/feedback-details`);
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts
index fec4e31523f6..6c91acef5676 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading-actions.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 /**
  * The actions of the grading page:
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html
index 6ee637d20532..147c35adea2f 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.html
@@ -1,3 +1,8 @@
+<ng-template #tabTemplate let-type="type" let-translation="translation">
+    <div class="tab-item" (click)="selectTab(type)" [ngClass]="activeTab === type ? 'active' : ''">
+        <b [jhiTranslate]="translation"></b>
+    </div>
+</ng-template>
 <div>
     <div class="d-flex align-content-center mb-2">
         <h3 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrading.title"></h3>
@@ -5,23 +10,31 @@ <h3 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrad
     @if (!isLoading) {
         <div class="top-bar">
             <div class="d-flex align-items-center">
-                <div class="tab-item test-cases" (click)="selectTab('test-cases')" [ngClass]="activeTab === 'test-cases' ? 'active' : ''">
-                    <b>Test Cases</b>
-                </div>
+                <ng-container
+                    *ngTemplateOutlet="tabTemplate; context: { type: 'test-cases', translation: 'artemisApp.programmingExercise.configureGrading.testCases.title' }"
+                ></ng-container>
                 @if (programmingExercise.staticCodeAnalysisEnabled) {
-                    <div class="tab-item code-analysis" (click)="selectTab('code-analysis')" [ngClass]="activeTab === 'code-analysis' ? 'active' : ''">
-                        <b>Code Analysis</b>
-                    </div>
+                    <ng-container
+                        *ngTemplateOutlet="tabTemplate; context: { type: 'code-analysis', translation: 'artemisApp.programmingExercise.configureGrading.categories.titleHeader' }"
+                    ></ng-container>
+                }
+                <ng-container
+                    *ngTemplateOutlet="tabTemplate; context: { type: 'submission-policy', translation: 'artemisApp.programmingExercise.submissionPolicy.title' }"
+                ></ng-container>
+                @if (programmingExercise.isAtLeastEditor) {
+                    <ng-container
+                        *ngTemplateOutlet="
+                            tabTemplate;
+                            context: { type: 'feedback-analysis', translation: 'artemisApp.programmingExercise.configureGrading.feedbackAnalysis.titleHeader' }
+                        "
+                    ></ng-container>
                 }
-                <div class="tab-item submission-policy" (click)="selectTab('submission-policy')" [ngClass]="activeTab === 'submission-policy' ? 'active' : ''">
-                    <b>Submission Policy</b>
-                </div>
             </div>
             <ng-template>
                 <div></div>
             </ng-template>
             <div class="d-flex align-items-center">
-                @if (activeTab !== 'submission-policy') {
+                @if (activeTab === 'test-cases' || activeTab === 'code-analysis') {
                     <jhi-programming-exercise-configure-grading-status
                         [exerciseIsReleasedAndHasResults]="isReleasedAndHasResults"
                         [hasUnsavedTestCaseChanges]="hasUnsavedChanges"
@@ -29,7 +42,7 @@ <h3 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrad
                         [hasUpdatedGradingConfig]="hasUpdatedGradingConfig"
                     />
                 }
-                @if (programmingExercise.isAtLeastInstructor) {
+                @if (programmingExercise.isAtLeastInstructor && activeTab !== 'feedback-analysis') {
                     <jhi-programming-exercise-configure-grading-actions
                         [exercise]="programmingExercise"
                         [hasUpdatedGradingConfig]="hasUpdatedGradingConfig"
@@ -52,7 +65,7 @@ <h3 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrad
                     <jhi-submission-policy-update #policyUpdate [programmingExercise]="programmingExercise" [editable]="programmingExercise.isAtLeastInstructor!" />
                     @if (programmingExercise.isAtLeastEditor && programmingExercise.submissionPolicy !== undefined) {
                         <ngb-alert [dismissible]="false" [type]="'info'">
-                            <span>{{ 'artemisApp.programmingExercise.submissionPolicy.submissionPenalty.triggerAllInformation' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionPenalty.triggerAllInformation"></span>
                         </ngb-alert>
                     }
                 </div>
@@ -71,7 +84,7 @@ <h3 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrad
                         </div>
                         <div class="col-5">
                             <h2 class="mb-5 fw-medium">
-                                <span>{{ 'artemisApp.programmingExercise.configureGrading.charts.title' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.title"></span>
                                 @if (!!changedTestCaseIds.length) {
                                     <span class="badge bg-primary" jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.preview"></span>
                                 }
@@ -239,7 +252,7 @@ <h2 class="fw-medium" jhiTranslate="artemisApp.programmingExercise.configureGrad
                         </div>
                         <div class="col-5">
                             <h2 class="mb-5 fw-medium">
-                                <span>{{ 'artemisApp.programmingExercise.configureGrading.charts.title' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.title"></span>
                                 @if (!!changedCategoryIds.length) {
                                     <span class="badge bg-primary" jhiTranslate="artemisApp.programmingExercise.configureGrading.charts.preview"></span>
                                 }
@@ -256,5 +269,10 @@ <h2 class="mb-5 fw-medium">
                 </div>
             }
         </div>
+        <div class="grading-body-container mt-3">
+            @if (programmingExercise.isAtLeastEditor && activeTab === 'feedback-analysis') {
+                <jhi-feedback-analysis [exerciseTitle]="programmingExercise.title!" [exerciseId]="programmingExercise.id!"></jhi-feedback-analysis>
+            }
+        </div>
     }
 </div>
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts
index c242b861d14e..c5ef675338f5 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-configure-grading.component.ts
@@ -7,10 +7,10 @@ import { AccountService } from 'app/core/auth/account.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { Course } from 'app/entities/course.model';
-import { IssuesMap, ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
+import { IssuesMap, ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
 import { SubmissionPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { ProgrammingGradingChartsDirective } from 'app/exercises/programming/manage/grading/charts/programming-grading-charts.directive';
 import { ProgrammingExerciseGradingService, StaticCodeAnalysisCategoryUpdate } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
@@ -56,8 +56,7 @@ const DefaultFieldValues: { [key: string]: number } = {
     [EditableField.MAX_PENALTY]: 0,
 };
 
-export type GradingTab = 'test-cases' | 'code-analysis' | 'submission-policy';
-
+export type GradingTab = 'test-cases' | 'code-analysis' | 'submission-policy' | 'feedback-analysis';
 export type Table = 'testCases' | 'codeAnalysis';
 
 @Component({
@@ -232,7 +231,8 @@ export class ProgrammingExerciseConfigureGradingComponent implements OnInit, OnD
                 this.isLoading = false;
             }
 
-            if (params['tab'] === 'test-cases' || params['tab'] === 'code-analysis' || params['tab'] === 'submission-policy') {
+            const gradingTabs: GradingTab[] = ['test-cases', 'code-analysis', 'submission-policy', 'feedback-analysis'];
+            if (gradingTabs.includes(params['tab'])) {
                 this.selectTab(params['tab']);
             } else {
                 this.selectTab('test-cases');
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts
index 36fcfeb230b6..7e5156faaa52 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-submission-policy-configuration-actions.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { faSave } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { ButtonType } from 'app/shared/components/button.component';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts
index 714ef84c2beb..ae956e5b7a96 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading-table-actions.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { faCopy } from '@fortawesome/free-solid-svg-icons';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { GradingTab } from 'app/exercises/programming/manage/grading/programming-exercise-configure-grading.component';
 import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading.module.ts b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading.module.ts
index 3f91d95f8fc2..ea2a8633af73 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/programming-exercise-grading.module.ts
@@ -19,6 +19,7 @@ import { SubmissionPolicyUpdateModule } from 'app/exercises/shared/submission-po
 import { ProgrammingExerciseGradingTasksTableComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component';
 import { BarChartModule } from '@swimlane/ngx-charts';
 import { ProgrammingExerciseTaskComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component';
+import { FeedbackAnalysisComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component';
 
 @NgModule({
     imports: [
@@ -33,6 +34,7 @@ import { ProgrammingExerciseTaskComponent } from 'app/exercises/programming/mana
         ArtemisProgrammingExerciseActionsModule,
         SubmissionPolicyUpdateModule,
         BarChartModule,
+        FeedbackAnalysisComponent,
     ],
     declarations: [
         ProgrammingExerciseConfigureGradingComponent,
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.html b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.html
index 52934fae6007..52943cc868c4 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.html
@@ -126,9 +126,7 @@ <h2 class="fw-medium">Tasks</h2>
             <fa-icon [icon]="getSortIcon('type')" class="ms-2" />
             <fa-icon [icon]="faQuestionCircle" class="text-secondary ms-2" />
         </button>
-        <div class="task__row__cell">
-            {{ 'artemisApp.programmingExercise.configureGrading.gradingTableHeader.passedPercent' | artemisTranslate }}
-        </div>
+        <div class="task__row__cell" jhiTranslate="artemisApp.programmingExercise.configureGrading.gradingTableHeader.passedPercent"></div>
     </div>
     @for (task of tasks; track task; let i = $index) {
         <jhi-programming-exercise-task [index]="i" [task]="task" [openSubject]="allTasksExpandedSubject" (updateTasksEvent)="updateTasks()" [isExamExercise]="isExamExercise" />
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts
index a40d38cade8e..bd491c999df9 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component.ts
@@ -1,12 +1,12 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ProgrammingExerciseTaskService } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { faAngleDown, faAngleRight, faAsterisk, faMedal, faQuestionCircle, faScaleUnbalanced, faSort, faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { ProgrammingExerciseTask } from './programming-exercise-task';
 import { Observable, Subject } from 'rxjs';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { isExamExercise } from 'app/shared/util/utils';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts
index 508c1e4d21bf..5f45d551b476 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.service.ts
@@ -4,11 +4,11 @@ import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programmi
 import { Observable, catchError, of, tap } from 'rxjs';
 import { Exercise } from 'app/entities/exercise.model';
 import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils';
-import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { ProgrammingExerciseGradingService, ProgrammingExerciseTestCaseUpdate } from '../../services/programming-exercise-grading.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { map, mergeMap } from 'rxjs/operators';
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts
index cff99aac5cc2..3a5844ddbb9e 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task.ts
@@ -1,6 +1,6 @@
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
-import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class ProgrammingExerciseTask extends ProgrammingExerciseServerSideTask {
     declare testCases: ProgrammingExerciseTestCase[];
diff --git a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts
index d8c77b50c8df..837c0210f76d 100644
--- a/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { faAngleDown, faAngleRight } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 import { ProgrammingExerciseTaskService } from '../programming-exercise-task.service';
 import { Subject } from 'rxjs';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component.html b/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component.html
index dd43838f3314..014cd64753f1 100644
--- a/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component.html
@@ -26,7 +26,7 @@
             }
             @if (missingTestCases.length) {
                 <div class="text-start">
-                    <span>{{ 'artemisApp.programmingExercise.testCaseAnalysis.missingTestCases' | artemisTranslate: { number: missingTestCases.length } }}</span>
+                    <span jhiTranslate="artemisApp.programmingExercise.testCaseAnalysis.missingTestCases" [translateValues]="{ number: missingTestCases.length }"></span>
                     <ul>
                         @for (test of missingTestCases; track test) {
                             <li>{{ test }}</li>
@@ -37,7 +37,7 @@
 
             @if (repeatedTestCases.length) {
                 <div class="text-start">
-                    <span>{{ 'artemisApp.programmingExercise.testCaseAnalysis.repeatedTestCases' | artemisTranslate: { number: repeatedTestCases.length } }}</span>
+                    <span jhiTranslate="artemisApp.programmingExercise.testCaseAnalysis.repeatedTestCases" [translateValues]="{ number: repeatedTestCases.length }"></span>
                     <ul>
                         @for (test of repeatedTestCases; track test) {
                             <li>{{ test }}</li>
diff --git a/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/task-count-warning/task-count-warning.component.html b/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/task-count-warning/task-count-warning.component.html
index 631270039a07..d0210bef4c72 100644
--- a/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/task-count-warning/task-count-warning.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/instructions-editor/analysis/task-count-warning/task-count-warning.component.html
@@ -13,7 +13,7 @@
     <div class="text-start w-100">
         @if (numOfTasks > advisedMaxNumOfTasks) {
             <div class="text-start">
-                <span>{{ 'artemisApp.programmingExercise.tasksAnalysis.numOfTasks' | artemisTranslate: { number: numOfTasks, limit: advisedMaxNumOfTasks } }}</span>
+                <span jhiTranslate="artemisApp.programmingExercise.tasksAnalysis.numOfTasks" [translateValues]="{ number: numOfTasks, limit: advisedMaxNumOfTasks }"></span>
             </div>
         }
     </div>
diff --git a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.html b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.html
index 4b697c678b61..677106c40346 100644
--- a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.html
@@ -5,8 +5,10 @@
             class="overflow-hidden flex-grow-1"
             [domainActions]="domainActions"
             [initialEditorHeight]="initialEditorHeight"
+            [useDefaultMarkdownEditorOptions]="false"
             [enableResize]="enableResize"
             [markdown]="exercise.problemStatement"
+            [showDefaultPreview]="false"
             (onPreviewSelect)="generateHtml()"
             (markdownChange)="updateProblemStatement($event)"
         >
diff --git a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts
index 3dcd5d42efa3..e194057bfd89 100644
--- a/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component.ts
@@ -2,22 +2,17 @@ import { AfterViewInit, Component, EventEmitter, HostListener, Input, OnChanges,
 import { AlertService } from 'app/core/util/alert.service';
 import { Observable, Subject, Subscription, of, throwError } from 'rxjs';
 import { catchError, map as rxMap, switchMap, tap } from 'rxjs/operators';
-import { TaskCommand } from 'app/shared/markdown-editor/domainCommands/programming-exercise/task.command';
-import { TestCaseCommand } from 'app/shared/markdown-editor/domainCommands/programming-exercise/testCase.command';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { ProblemStatementAnalysis } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.model';
 import { Participation } from 'app/entities/participation/participation.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { hasExerciseChanged } from 'app/exercises/shared/exercise/exercise.utils';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { Result } from 'app/entities/result.model';
 import { faCheckCircle, faCircleNotch, faExclamationTriangle, faGripLines, faSave } from '@fortawesome/free-solid-svg-icons';
-import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { Annotation } from 'app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component';
 import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 import { MonacoTaskAction } from 'app/shared/monaco-editor/model/actions/monaco-task.action';
@@ -36,11 +31,7 @@ export class ProgrammingExerciseEditableInstructionComponent implements AfterVie
 
     exerciseTestCases: string[] = [];
 
-    taskCommand = new TaskCommand();
-    taskRegex = this.taskCommand.getTagRegex('g');
-    testCaseCommand = new TestCaseCommand();
-    katexCommand = new KatexCommand();
-    domainCommands: DomainCommand[] = [this.katexCommand, this.taskCommand, this.testCaseCommand];
+    taskRegex = MonacoTaskAction.GLOBAL_TASK_REGEX;
     testCaseAction = new MonacoTestCaseAction();
     domainActions: MonacoEditorDomainAction[] = [new MonacoFormulaAction(), new MonacoTaskAction(), this.testCaseAction];
 
@@ -85,7 +76,6 @@ export class ProgrammingExerciseEditableInstructionComponent implements AfterVie
             this.unsavedChanges = true;
         }
         this.programmingExercise = exercise;
-        this.domainCommands = [this.katexCommand, this.taskCommand, this.testCaseCommand];
         this.exerciseChange.emit(this.programmingExercise);
     }
 
@@ -215,7 +205,6 @@ export class ProgrammingExerciseEditableInstructionComponent implements AfterVie
                     tap((testCaseNames: string[]) => {
                         this.exerciseTestCases = testCaseNames;
                         const cases = this.exerciseTestCases.map((value) => ({ value, id: value }));
-                        this.testCaseCommand.setValues(cases);
                         this.testCaseAction.setValues(cases);
                     }),
                     catchError(() => of()),
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts
index 5ec55e54f894..9c842a025b85 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.ts
@@ -4,7 +4,7 @@ import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'
 import { faFileImport, faKeyboard, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Router } from '@angular/router';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.html b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.html
index 2e601a24a5e5..95da3dea7a71 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.html
@@ -80,7 +80,7 @@ <h2><span jhiTranslate="artemisApp.programmingExercise.detail.title"></span> {{
                         @if (programmingExercise.assessmentType === AssessmentType.SEMI_AUTOMATIC || programmingExercise.allowComplaintsForAutomaticAssessments) {
                             <a [routerLink]="[shortBaseResource, 'assessment-dashboard', programmingExercise.id]" class="btn btn-info btn-sm">
                                 <fa-icon [icon]="faUserCheck" />
-                                <span class="d-none d-md-inline">{{ 'artemisApp.exercise.exerciseAssessmentDashboard' | artemisTranslate }}</span>
+                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.exercise.exerciseAssessmentDashboard"></span>
                             </a>
                         }
                         @if (programmingExercise.isAtLeastEditor && plagiarismCheckSupported) {
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts
index 55dec97cbd6e..1a1a95462530 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-detail.component.ts
@@ -1,11 +1,12 @@
 import { Component, OnDestroy, OnInit, ViewEncapsulation } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { SafeHtml } from '@angular/platform-browser';
+import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config';
 import { Subject, Subscription } from 'rxjs';
-import { ProgrammingExercise, ProgrammingExerciseBuildConfig, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
@@ -332,12 +333,17 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                 {
                     type: DetailType.Boolean,
                     title: 'artemisApp.programmingExercise.allowOfflineIde.title',
-                    data: { boolean: exercise.allowOfflineIde },
+                    data: { boolean: exercise.allowOfflineIde ?? false },
                 },
                 {
                     type: DetailType.Boolean,
                     title: 'artemisApp.programmingExercise.allowOnlineEditor.title',
-                    data: { boolean: exercise.allowOnlineEditor },
+                    data: { boolean: exercise.allowOnlineEditor ?? false },
+                },
+                {
+                    type: DetailType.Boolean,
+                    title: 'artemisApp.programmingExercise.allowOnlineIde.title',
+                    data: { boolean: exercise.allowOnlineIde ?? false },
                 },
             ],
         };
@@ -456,13 +462,13 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
                     },
                 },
                 !!exercise.buildConfig?.buildScript &&
-                    !!exercise.buildConfig?.windFile?.metadata?.docker?.image && {
+                    !!exercise.buildConfig?.windfile?.metadata?.docker?.image && {
                         type: DetailType.Text,
                         title: 'artemisApp.programmingExercise.dockerImage',
-                        data: { text: exercise.buildConfig?.windFile?.metadata?.docker?.image },
+                        data: { text: exercise.buildConfig?.windfile?.metadata?.docker?.image },
                     },
                 !!exercise.buildConfig?.buildScript &&
-                    !!exercise.buildConfig?.windFile?.metadata?.docker?.image && {
+                    !!exercise.buildConfig?.windfile?.metadata?.docker?.image && {
                         type: DetailType.Markdown,
                         title: 'artemisApp.programmingExercise.script',
                         titleHelpText: 'artemisApp.programmingExercise.revertToTemplateBuildPlan',
@@ -752,8 +758,8 @@ export class ProgrammingExerciseDetailComponent implements OnInit, OnDestroy {
      * @param exercise the programming exercise to check
      */
     checkAndSetWindFile(exercise: ProgrammingExercise) {
-        if (exercise.buildConfig && exercise.buildConfig?.buildPlanConfiguration && !exercise.buildConfig?.windFile) {
-            exercise.buildConfig!.windFile = this.aeolusService.parseWindFile(exercise.buildConfig?.buildPlanConfiguration);
+        if (exercise.buildConfig && exercise.buildConfig?.buildPlanConfiguration && !exercise.buildConfig?.windfile) {
+            exercise.buildConfig!.windfile = this.aeolusService.parseWindFile(exercise.buildConfig?.buildPlanConfiguration);
         }
     }
 
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts
index 5dd785d95005..287e50b11913 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-edit-selected.component.ts
@@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
 import { faSave } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
index 39ed8888464a..54c277c9bd7d 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management-routing.module.ts
@@ -3,7 +3,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'
 import { Injectable, NgModule } from '@angular/core';
 import { ProgrammingExerciseDetailComponent } from 'app/exercises/programming/manage/programming-exercise-detail.component';
 import { ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { map } from 'rxjs/operators';
 import { HttpResponse } from '@angular/common/http';
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management.module.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management.module.ts
index 2ccadafe3cc1..1cb726111a17 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-management.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-management.module.ts
@@ -24,7 +24,6 @@ import { ProgrammingExerciseExampleSolutionRepoDownloadComponent } from 'app/exe
 import { TestwiseCoverageReportModule } from 'app/exercises/programming/hestia/testwise-coverage-report/testwise-coverage-report.module';
 import { ArtemisCodeHintGenerationOverviewModule } from 'app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.module';
 import { BuildPlanEditorComponent } from 'app/exercises/programming/manage/build-plan-editor.component';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { ArtemisCodeEditorModule } from 'app/exercises/programming/shared/code-editor/code-editor.module';
 import { DetailModule } from 'app/detail-overview-list/detail.module';
 import { IrisModule } from 'app/iris/iris.module';
@@ -53,7 +52,6 @@ import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.modul
         GitDiffReportModule,
         TestwiseCoverageReportModule,
         ArtemisCodeHintGenerationOverviewModule,
-        AceEditorModule,
         ArtemisCodeEditorModule,
         ArtemisExerciseModule,
         DetailModule,
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.html b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.html
index 89d72f95b7ef..39f4a28bbff0 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.html
@@ -139,12 +139,16 @@
                         }
                         <td class="d-md-table-cell">
                             <div class="d-flex justify-content-between">
-                                {{ 'artemisApp.programmingExercise.offlineIde' | artemisTranslate }}:
-                                {{ programmingExercise.allowOfflineIde ? ('artemisApp.exercise.yes' | artemisTranslate) : ('artemisApp.exercise.no' | artemisTranslate) }}
+                                <span [jhiTranslate]="'artemisApp.programmingExercise.offlineIde'"></span>:
+                                <span [jhiTranslate]="programmingExercise.allowOfflineIde ? 'artemisApp.exercise.yes' : 'artemisApp.exercise.no'"></span>
                             </div>
                             <div class="d-flex justify-content-between">
-                                {{ 'artemisApp.programmingExercise.onlineEditor' | artemisTranslate }}:
-                                {{ programmingExercise.allowOnlineEditor ? ('artemisApp.exercise.yes' | artemisTranslate) : ('artemisApp.exercise.no' | artemisTranslate) }}
+                                <span [jhiTranslate]="'artemisApp.programmingExercise.onlineEditor'"></span>:
+                                <span [jhiTranslate]="programmingExercise.allowOnlineEditor ? 'artemisApp.exercise.yes' : 'artemisApp.exercise.no'"></span>
+                            </div>
+                            <div class="d-flex justify-content-between">
+                                <span [jhiTranslate]="'artemisApp.programmingExercise.onlineIde'"></span>:
+                                <span [jhiTranslate]="programmingExercise.allowOnlineIde ? 'artemisApp.exercise.yes' : 'artemisApp.exercise.no'"></span>
                             </div>
                         </td>
                         @if (course.presentationScore !== 0) {
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts
index b28fbed3d6b9..e40533f526cc 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise.component.ts
@@ -1,7 +1,7 @@
 import { Component, ContentChild, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { merge } from 'rxjs';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseInstructorRepositoryType, ProgrammingExerciseService } from './services/programming-exercise.service';
 import { ActivatedRoute } from '@angular/router';
 import { ExerciseComponent } from 'app/exercises/shared/exercise/exercise.component';
@@ -15,7 +15,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { SortService } from 'app/shared/service/sort.service';
 import { ProgrammingExerciseEditSelectedComponent } from 'app/exercises/programming/manage/programming-exercise-edit-selected.component';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { createBuildPlanUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
diff --git a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts
index a16d439806db..f249959c63b5 100644
--- a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts
+++ b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-button.directive.ts
@@ -1,7 +1,7 @@
 import { Directive, ElementRef, HostListener, Input, OnInit, Renderer2 } from '@angular/core';
 import { ProgrammingExerciseResetDialogComponent } from 'app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 @Directive({
     selector: '[jhiProgrammingExerciseResetButton]',
diff --git a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts
index 2ffe3935810a..f064e177d1ff 100644
--- a/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component.ts
@@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseResetOptions, ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { faBan, faCircleNotch, faSpinner, faUndo } from '@fortawesome/free-solid-svg-icons';
 import { PROFILE_AEOLUS, PROFILE_LOCALCI } from 'app/app.constants';
diff --git a/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts b/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts
index ebafd624ea66..49f0aa9dcbff 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/build-plan.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { BuildPlan } from 'app/entities/build-plan.model';
+import { BuildPlan } from 'app/entities/programming/build-plan.model';
 
 export type EntityResponseType = HttpResponse<BuildPlan>;
 
diff --git a/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts b/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts
index a6bbcc6931cf..39fe777826e6 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/code-analysis-paging.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExercisePagingService } from 'app/exercises/programming/manage/services/programming-exercise-paging.service';
 import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service';
 
diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts
index 134da4e5abe5..f2ebc62a33f7 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-grading.service.ts
@@ -3,9 +3,9 @@ import { HttpClient, HttpParams } from '@angular/common/http';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { catchError, map, switchMap, tap } from 'rxjs/operators';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-import { StaticCodeAnalysisCategory } from 'app/entities/static-code-analysis-category.model';
-import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
+import { StaticCodeAnalysisCategory } from 'app/entities/programming/static-code-analysis-category.model';
+import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 
 export class ProgrammingExerciseTestCaseUpdate {
     constructor(
diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts
index 29c311cfd44b..08012217fb18 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-paging.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service';
 
 @Injectable({ providedIn: 'root' })
diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts
index 7af098d1a5a7..5953571a4190 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-participation.service.ts
@@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model';
 import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity-title.service';
 import { createRequestOption } from 'app/shared/util/request.util';
 import { Observable, map, tap } from 'rxjs';
-import { CommitInfo } from 'app/entities/programming-submission.model';
+import { CommitInfo } from 'app/entities/programming/programming-submission.model';
 
 export interface IProgrammingExerciseParticipationService {
     getLatestResultWithFeedback: (participationId: number, withSubmission: boolean) => Observable<Result | undefined>;
diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts
index a73a3bc5c715..30d8f11507b7 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise-websocket.service.ts
@@ -3,7 +3,7 @@ import { HttpResponse } from '@angular/common/http';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { filter, tap } from 'rxjs/operators';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export type EntityResponseType = HttpResponse<ProgrammingExercise>;
 export type EntityArrayResponseType = HttpResponse<ProgrammingExercise[]>;
diff --git a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts
index 39fa4800ecb6..82077ff4ffd6 100644
--- a/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts
+++ b/src/main/webapp/app/exercises/programming/manage/services/programming-exercise.service.ts
@@ -7,7 +7,7 @@ import { omit as _omit } from 'lodash-es';
 
 import { createRequestOption } from 'app/shared/util/request.util';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult';
@@ -19,14 +19,14 @@ import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programmin
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
 import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.utils';
 import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
-import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
+import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
 import { SortService } from 'app/shared/service/sort.service';
 import { Result } from 'app/entities/result.model';
 import { Participation } from 'app/entities/participation/participation.model';
 import { PlagiarismResultDTO } from 'app/exercises/shared/plagiarism/types/PlagiarismResultDTO';
 import { ImportOptions } from 'app/types/programming-exercises';
-import { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto';
+import { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto';
 
 export type EntityResponseType = HttpResponse<ProgrammingExercise>;
 export type EntityArrayResponseType = HttpResponse<ProgrammingExercise[]>;
diff --git a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts
index 85bf8287074f..f9bd6758fd23 100644
--- a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-exercise-status.component.ts
@@ -3,7 +3,7 @@ import { Subscription } from 'rxjs';
 import { filter, tap } from 'rxjs/operators';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { Participation } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { findLatestResult } from 'app/shared/util/utils';
 import { faCheckCircle, faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { hasSolutionParticipationChanged, hasTemplateParticipationChanged } from 'app/exercises/shared/participation/participation.utils';
diff --git a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts
index 66638d6d712f..9ad6970303a1 100644
--- a/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/status/programming-exercise-instructor-status.component.ts
@@ -4,8 +4,8 @@ import { filter } from 'rxjs/operators';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { Result } from 'app/entities/result.model';
 import { Participation } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
 import { findLatestResult } from 'app/shared/util/utils';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
diff --git a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
index 2b9ece99aff9..06d5d6940c83 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/add-auxiliary-repository-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { faPlus } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts
index 6f7e4b3332c3..36c9b8df3a8c 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-creation-config.ts
@@ -1,8 +1,8 @@
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { ModePickerOption } from 'app/exercises/shared/mode-picker/mode-picker.component';
 import { Observable } from 'rxjs';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 
 export type ProgrammingExerciseCreationConfig = {
     titleNamePattern: string;
@@ -44,6 +44,7 @@ export type ProgrammingExerciseCreationConfig = {
     hasUnsavedChanges: boolean;
     rerenderSubject: Observable<void>;
     validIdeSelection: () => boolean | undefined;
+    validOnlineIdeSelection: () => boolean | undefined;
     inProductionEnvironment: boolean;
     recreateBuildPlans: boolean;
     onRecreateBuildPlanOrUpdateTemplateChange: () => void;
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
index 629b1bc07d26..e1257c9c467f 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.component.ts
@@ -2,9 +2,10 @@ import { ActivatedRoute, Params } from '@angular/router';
 import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
+import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
-import { ProgrammingExercise, ProgrammingExerciseBuildConfig, ProgrammingLanguage, ProjectType, resetProgrammingForImport } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType, resetProgrammingForImport } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from '../services/programming-exercise.service';
 import { FileService } from 'app/shared/http/file.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -13,7 +14,6 @@ import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service'
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Exercise, IncludedInOverallScore, ValidationReason } from 'app/entities/exercise.model';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { ProgrammingLanguageFeatureService } from 'app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service';
@@ -23,14 +23,14 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { cloneDeep } from 'lodash-es';
 import { ExerciseUpdateWarningService } from 'app/exercises/shared/exercise-update-warning/exercise-update-warning.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { faExclamationCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ModePickerOption } from 'app/exercises/shared/mode-picker/mode-picker.component';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { loadCourseExerciseCategories } from 'app/exercises/shared/course-exercises/course-utils';
-import { PROFILE_AEOLUS, PROFILE_LOCALCI } from 'app/app.constants';
+import { PROFILE_AEOLUS, PROFILE_LOCALCI, PROFILE_THEIA } from 'app/app.constants';
 import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service';
 import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.component';
 import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
@@ -85,7 +85,6 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     notificationText?: string;
     courseId: number;
 
-    EditorMode = EditorMode;
     AssessmentType = AssessmentType;
     rerenderSubject = new Subject<void>();
     // This is used to revert the select if the user cancels to override the new selected programming language.
@@ -136,6 +135,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     public auxiliaryRepositoriesSupported = false;
     public auxiliaryRepositoriesValid = true;
     public customBuildPlansSupported: string = '';
+    public theiaEnabled = false;
 
     // Additional options for import
     // This is a wrapper to allow modifications from the other subcomponents
@@ -265,7 +265,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
             this.withDependenciesValue = false;
             this.buildPlanLoaded = false;
             if (this.programmingExercise.buildConfig) {
-                this.programmingExercise.buildConfig.windFile = undefined;
+                this.programmingExercise.buildConfig.windfile = undefined;
                 this.programmingExercise.buildConfig.buildPlanConfiguration = undefined;
             } else {
                 this.programmingExercise.buildConfig = new ProgrammingExerciseBuildConfig();
@@ -390,7 +390,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         this.activatedRoute.data.subscribe(({ programmingExercise }) => {
             this.programmingExercise = programmingExercise;
             if (this.programmingExercise.buildConfig?.buildPlanConfiguration) {
-                this.programmingExercise.buildConfig!.windFile = this.aeolusService.parseWindFile(this.programmingExercise.buildConfig!.buildPlanConfiguration);
+                this.programmingExercise.buildConfig!.windfile = this.aeolusService.parseWindFile(this.programmingExercise.buildConfig!.buildPlanConfiguration);
             }
             this.backupExercise = cloneDeep(this.programmingExercise);
             this.selectedProgrammingLanguageValue = this.programmingExercise.programmingLanguage!;
@@ -404,50 +404,52 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         });
 
         // If it is an import from this instance, just get the course, otherwise handle the edit and new cases
-        this.activatedRoute.url
-            .pipe(
-                tap((segments) => {
-                    this.isImportFromExistingExercise = segments.some((segment) => segment.path === 'import');
-                    this.isImportFromFile = segments.some((segment) => segment.path === 'import-from-file');
-                }),
-                switchMap(() => this.activatedRoute.params),
-                tap((params) => {
-                    if (this.isImportFromFile) {
-                        this.createProgrammingExerciseForImportFromFile();
-                    }
-                    if (this.isImportFromExistingExercise) {
-                        this.createProgrammingExerciseForImport(params);
-                    } else {
-                        if (params['courseId'] && params['examId'] && params['exerciseGroupId']) {
-                            this.isExamMode = true;
-                            this.exerciseGroupService.find(params['courseId'], params['examId'], params['exerciseGroupId']).subscribe((res) => {
-                                this.programmingExercise.exerciseGroup = res.body!;
-                                if (!params['exerciseId'] && this.programmingExercise.exerciseGroup.exam?.course?.defaultProgrammingLanguage && !this.isImportFromFile) {
-                                    this.selectedProgrammingLanguage = this.programmingExercise.exerciseGroup.exam.course.defaultProgrammingLanguage;
+        if (this.activatedRoute && this.activatedRoute.url) {
+            this.activatedRoute.url
+                .pipe(
+                    tap((segments) => {
+                        this.isImportFromExistingExercise = segments.some((segment) => segment.path === 'import');
+                        this.isImportFromFile = segments.some((segment) => segment.path === 'import-from-file');
+                    }),
+                    switchMap(() => this.activatedRoute.params),
+                    tap((params) => {
+                        if (this.isImportFromFile) {
+                            this.createProgrammingExerciseForImportFromFile();
+                        }
+                        if (this.isImportFromExistingExercise) {
+                            this.createProgrammingExerciseForImport(params);
+                        } else {
+                            if (params['courseId'] && params['examId'] && params['exerciseGroupId']) {
+                                this.isExamMode = true;
+                                this.exerciseGroupService.find(params['courseId'], params['examId'], params['exerciseGroupId']).subscribe((res) => {
+                                    this.programmingExercise.exerciseGroup = res.body!;
+                                    if (!params['exerciseId'] && this.programmingExercise.exerciseGroup.exam?.course?.defaultProgrammingLanguage && !this.isImportFromFile) {
+                                        this.selectedProgrammingLanguage = this.programmingExercise.exerciseGroup.exam.course.defaultProgrammingLanguage;
+                                    }
+                                });
+                                // we need the course id  to make the request to the server if it's an import from file
+                                if (this.isImportFromFile) {
+                                    this.courseId = params['courseId'];
+                                    this.loadCourseExerciseCategories(params['courseId']);
                                 }
-                            });
-                            // we need the course id  to make the request to the server if it's an import from file
-                            if (this.isImportFromFile) {
+                            } else if (params['courseId']) {
                                 this.courseId = params['courseId'];
-                                this.loadCourseExerciseCategories(params['courseId']);
+                                this.isExamMode = false;
+                                this.courseService.find(this.courseId).subscribe((res) => {
+                                    this.programmingExercise.course = res.body!;
+                                    if (!params['exerciseId'] && this.programmingExercise.course?.defaultProgrammingLanguage && !this.isImportFromFile) {
+                                        this.selectedProgrammingLanguage = this.programmingExercise.course.defaultProgrammingLanguage!;
+                                    }
+                                    this.exerciseCategories = this.programmingExercise.categories || [];
+
+                                    this.loadCourseExerciseCategories(this.programmingExercise.course!.id!);
+                                });
                             }
-                        } else if (params['courseId']) {
-                            this.courseId = params['courseId'];
-                            this.isExamMode = false;
-                            this.courseService.find(this.courseId).subscribe((res) => {
-                                this.programmingExercise.course = res.body!;
-                                if (!params['exerciseId'] && this.programmingExercise.course?.defaultProgrammingLanguage && !this.isImportFromFile) {
-                                    this.selectedProgrammingLanguage = this.programmingExercise.course.defaultProgrammingLanguage!;
-                                }
-                                this.exerciseCategories = this.programmingExercise.categories || [];
-
-                                this.loadCourseExerciseCategories(this.programmingExercise.course!.id!);
-                            });
                         }
-                    }
-                }),
-            )
-            .subscribe();
+                    }),
+                )
+                .subscribe();
+        }
 
         // If an exercise is created, load our readme template so the problemStatement is not empty
         this.selectedProgrammingLanguage = this.programmingExercise.programmingLanguage!;
@@ -472,6 +474,9 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
             if (profileInfo?.activeProfiles.includes(PROFILE_AEOLUS)) {
                 this.customBuildPlansSupported = PROFILE_AEOLUS;
             }
+            if (profileInfo?.activeProfiles.includes(PROFILE_THEIA)) {
+                this.theiaEnabled = true;
+            }
         });
         this.defineSupportedProgrammingLanguages();
     }
@@ -502,13 +507,9 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
             },
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.languageStepTitle',
-                valid: this.exerciseLanguageComponent?.formValid ?? false,
-            },
-            {
-                title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle',
-                valid: true,
-                empty: !this.programmingExercise.problemStatement,
+                valid: (this.exerciseLanguageComponent?.formValid && this.validOnlineIdeSelection()) ?? false,
             },
+            { title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.problemStepTitle', valid: true, empty: !this.programmingExercise.problemStatement },
             {
                 title: 'artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle',
                 valid: Boolean(this.exerciseGradingComponent?.formValid && (this.isExamMode || this.exercisePlagiarismComponent?.formValid)),
@@ -615,15 +616,15 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
      */
     saveExercise() {
         // trim potential whitespaces that can lead to issues
-        if (this.programmingExercise.buildConfig!.windFile?.metadata?.docker?.image) {
-            this.programmingExercise.buildConfig!.windFile.metadata.docker.image = this.programmingExercise.buildConfig!.windFile.metadata.docker.image.trim();
+        if (this.programmingExercise.buildConfig!.windfile?.metadata?.docker?.image) {
+            this.programmingExercise.buildConfig!.windfile.metadata.docker.image = this.programmingExercise.buildConfig!.windfile.metadata.docker.image.trim();
         }
 
-        if (this.programmingExercise.customizeBuildPlanWithAeolus) {
-            this.programmingExercise.buildConfig!.buildPlanConfiguration = this.aeolusService.serializeWindFile(this.programmingExercise.buildConfig!.windFile!);
+        if (this.programmingExercise.customizeBuildPlanWithAeolus || this.isImportFromFile) {
+            this.programmingExercise.buildConfig!.buildPlanConfiguration = this.aeolusService.serializeWindFile(this.programmingExercise.buildConfig!.windfile!);
         } else {
             this.programmingExercise.buildConfig!.buildPlanConfiguration = undefined;
-            this.programmingExercise.buildConfig!.windFile = undefined;
+            this.programmingExercise.buildConfig!.windfile = undefined;
         }
         // If the programming exercise has a submission policy with a NONE type, the policy is removed altogether
         if (this.programmingExercise.submissionPolicy && this.programmingExercise.submissionPolicy.type === SubmissionPolicyType.NONE) {
@@ -678,8 +679,12 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
 
     private subscribeToSaveResponse(result: Observable<HttpResponse<ProgrammingExercise>>) {
         result.subscribe({
-            next: (response: HttpResponse<ProgrammingExercise>) => this.onSaveSuccess(response.body!),
-            error: (error: HttpErrorResponse) => this.onSaveError(error),
+            next: (response: HttpResponse<ProgrammingExercise>) => {
+                this.onSaveSuccess(response.body!);
+            },
+            error: (error: HttpErrorResponse) => {
+                this.onSaveError(error);
+            },
         });
     }
 
@@ -823,10 +828,21 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
     }
 
     /**
-     * checking if at least one of Online Editor or Offline Ide is selected
+     * checking if at least one of Online Editor, Offline Ide, or Online Ide is selected
      */
     validIdeSelection = () => {
-        return this.programmingExercise?.allowOnlineEditor || this.programmingExercise?.allowOfflineIde;
+        if (this.theiaEnabled) {
+            return this.programmingExercise?.allowOnlineEditor || this.programmingExercise?.allowOfflineIde || this.programmingExercise?.allowOnlineIde;
+        } else {
+            return this.programmingExercise?.allowOnlineEditor || this.programmingExercise?.allowOfflineIde;
+        }
+    };
+
+    /**
+     * Checking if the online IDE is selected and a valid image is selected
+     */
+    validOnlineIdeSelection = () => {
+        return !this.programmingExercise?.allowOnlineIde || this.programmingExercise?.buildConfig!.theiaImage !== undefined;
     };
 
     isEventInsideTextArea(event: Event): boolean {
@@ -848,6 +864,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
         this.validateExerciseAuxiliaryRepositories(validationErrorReasons);
         this.validateExercisePackageName(validationErrorReasons);
         this.validateExerciseIdeSelection(validationErrorReasons);
+        this.validateExerciseOnlineIdeSelection(validationErrorReasons);
         this.validateExercisePoints(validationErrorReasons);
         this.validateExerciseBonusPoints(validationErrorReasons);
         this.validateExerciseSCAMaxPenalty(validationErrorReasons);
@@ -1046,8 +1063,18 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
 
     private validateExerciseIdeSelection(validationErrorReasons: ValidationReason[]): void {
         if (!this.validIdeSelection()) {
+            const translateKey = this.theiaEnabled ? 'artemisApp.programmingExercise.allowOnlineEditor.alert' : 'artemisApp.programmingExercise.allowOnlineEditor.alertNoTheia';
+            validationErrorReasons.push({
+                translateKey: translateKey,
+                translateValues: {},
+            });
+        }
+    }
+
+    private validateExerciseOnlineIdeSelection(validationErrorReasons: ValidationReason[]): void {
+        if (!this.validOnlineIdeSelection()) {
             validationErrorReasons.push({
-                translateKey: 'artemisApp.programmingExercise.allowOnlineEditor.alert',
+                translateKey: 'artemisApp.programmingExercise.theiaImage.alert',
                 translateValues: {},
             });
         }
@@ -1112,6 +1139,7 @@ export class ProgrammingExerciseUpdateComponent implements AfterViewInit, OnDest
             hasUnsavedChanges: this.hasUnsavedChanges,
             rerenderSubject: this.rerenderSubject.asObservable(),
             validIdeSelection: this.validIdeSelection,
+            validOnlineIdeSelection: this.validOnlineIdeSelection,
             inProductionEnvironment: this.inProductionEnvironment,
             recreateBuildPlans: this.importOptions.recreateBuildPlans,
             onRecreateBuildPlanOrUpdateTemplateChange: this.onRecreateBuildPlanOrUpdateTemplateChange,
diff --git a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
index 29c6704e6d08..7ac399d6daeb 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/programming-exercise-update.module.ts
@@ -26,12 +26,12 @@ import { ExerciseTitleChannelNameModule } from 'app/exercises/shared/exercise-ti
 import { ExerciseUpdateNotificationModule } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.module';
 import { ExerciseUpdatePlagiarismModule } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.module';
 import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { ProgrammingExerciseCustomBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component';
 import { ProgrammingExerciseDockerImageComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-docker-image/programming-exercise-docker-image.component';
 import { FormsModule } from 'app/forms/forms.module';
 import { ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component';
 import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component';
+import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
 import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module';
 
 @NgModule({
@@ -54,11 +54,11 @@ import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.modul
         ExerciseTitleChannelNameModule,
         ExerciseUpdateNotificationModule,
         ExerciseUpdatePlagiarismModule,
-        AceEditorModule,
         FormsModule,
         ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent,
         ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent,
         MonacoEditorModule,
+        ProgrammingExerciseTheiaComponent,
     ],
     declarations: [
         ProgrammingExerciseUpdateComponent,
diff --git a/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts b/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts
index dcd21a30e18c..2ce643767155 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/remove-auxiliary-repository-button.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { faTrash } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.html
index aa9a31a9dfcf..bcfd1a078ac7 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.html
@@ -6,16 +6,16 @@
     </div>
     @if (programmingExercise.customizeBuildPlanWithAeolus) {
         <div class="row m-1">
-            @if (programmingExercise.buildConfig?.windFile && programmingExercise.buildConfig?.windFile?.metadata && programmingExercise.buildConfig?.windFile?.metadata?.docker) {
+            @if (programmingExercise.buildConfig?.windfile && programmingExercise.buildConfig?.windfile?.metadata && programmingExercise.buildConfig?.windfile?.metadata?.docker) {
                 <jhi-programming-exercise-docker-image
-                    [dockerImage]="programmingExercise.buildConfig!.windFile!.metadata.docker.image"
+                    [dockerImage]="programmingExercise.buildConfig!.windfile!.metadata.docker.image"
                     (dockerImageChange)="setDockerImage($event)"
                 />
             }
             <div class="col-3 col-md-3">
                 <div class="d-flex flex-column h-100 justify-content-between">
                     <div class="list-group">
-                        @for (action of this.programmingExercise.buildConfig?.windFile?.actions; track action) {
+                        @for (action of this.programmingExercise.buildConfig?.windfile?.actions; track action) {
                             <div class="list-group-item mb-1" [ngClass]="{ active: active?.name === action.name }" (click)="changeActiveAction(action.name)">
                                 <div class="d-flex w-100 justify-content-between">
                                     <p class="mb-0">{{ action.name }}</p>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts
index 92f3a3a31443..e350d8c201b9 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component.ts
@@ -1,5 +1,6 @@
 import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
-import { BuildAction, ProgrammingExercise, ProgrammingLanguage, ProjectType, ScriptAction } from 'app/entities/programming-exercise.model';
+import { BuildAction, ScriptAction } from 'app/entities/programming/build.action';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service';
@@ -42,7 +43,8 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     ngOnChanges(changes: SimpleChanges) {
         if (changes.programmingExerciseCreationConfig || changes.programmingExercise) {
             if (this.shouldReloadTemplate()) {
-                this.loadAeolusTemplate();
+                const isImportFromFile = changes.programmingExerciseCreationConfig?.currentValue?.isImportFromFile ?? false;
+                this.loadAeolusTemplate(isImportFromFile);
             }
         }
     }
@@ -62,20 +64,21 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
      * @private
      */
     resetCustomBuildPlan() {
-        this.programmingExercise.buildConfig!.windFile = undefined;
+        this.programmingExercise.buildConfig!.windfile = undefined;
         this.programmingExercise.buildConfig!.buildPlanConfiguration = undefined;
     }
 
     /**
      * Loads the predefined template for the selected programming language and project type
      * if there is one available.
+     * @param isImportFromFile whether the exercise is imported from a file
      * @private
      */
-    loadAeolusTemplate() {
-        if (this.programmingExercise?.id) {
-            if (!this.programmingExerciseCreationConfig.buildPlanLoaded && !this.programmingExercise.buildConfig?.windFile) {
+    loadAeolusTemplate(isImportFromFile: boolean = false) {
+        if (this.programmingExercise?.id || isImportFromFile) {
+            if (!this.programmingExerciseCreationConfig.buildPlanLoaded && !this.programmingExercise.buildConfig?.windfile) {
                 if (this.programmingExercise.buildConfig?.buildPlanConfiguration) {
-                    this.programmingExercise.buildConfig!.windFile = this.aeolusService.parseWindFile(this.programmingExercise.buildConfig?.buildPlanConfiguration);
+                    this.programmingExercise.buildConfig!.windfile = this.aeolusService.parseWindFile(this.programmingExercise.buildConfig?.buildPlanConfiguration);
                 }
                 this.programmingExerciseCreationConfig.buildPlanLoaded = true;
             }
@@ -90,16 +93,18 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
         this.staticCodeAnalysisEnabled = this.programmingExercise.staticCodeAnalysisEnabled;
         this.sequentialTestRuns = this.programmingExercise.buildConfig?.sequentialTestRuns;
         this.testwiseCoverageEnabled = this.programmingExercise.buildConfig?.testwiseCoverageEnabled;
-        this.aeolusService
-            .getAeolusTemplateFile(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
-            .subscribe({
-                next: (file) => {
-                    this.programmingExercise.buildConfig!.windFile = this.aeolusService.parseWindFile(file);
-                },
-                error: () => {
-                    this.programmingExercise.buildConfig!.windFile = undefined;
-                },
-            });
+        if (!isImportFromFile || !this.programmingExercise.buildConfig?.windfile) {
+            this.aeolusService
+                .getAeolusTemplateFile(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
+                .subscribe({
+                    next: (file) => {
+                        this.programmingExercise.buildConfig!.windfile = this.aeolusService.parseWindFile(file);
+                    },
+                    error: () => {
+                        this.programmingExercise.buildConfig!.windfile = undefined;
+                    },
+                });
+        }
         this.programmingExerciseCreationConfig.buildPlanLoaded = true;
     }
 
@@ -110,7 +115,7 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     faQuestionCircle = faQuestionCircle;
 
     protected getActionScript(action: string): string {
-        const foundAction: BuildAction | undefined = this.programmingExercise.buildConfig?.windFile?.actions.find((a) => a.name === action);
+        const foundAction: BuildAction | undefined = this.programmingExercise.buildConfig?.windfile?.actions.find((a) => a.name === action);
         if (foundAction && foundAction instanceof ScriptAction) {
             return (foundAction as ScriptAction).script;
         }
@@ -118,12 +123,12 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     }
 
     changeActiveAction(action: string): void {
-        if (!this.programmingExercise.buildConfig?.windFile) {
+        if (!this.programmingExercise.buildConfig?.windfile) {
             return;
         }
 
         this.code = this.getActionScript(action);
-        this.active = this.programmingExercise.buildConfig?.windFile.actions.find((a) => a.name === action);
+        this.active = this.programmingExercise.buildConfig?.windfile.actions.find((a) => a.name === action);
         this.isScriptAction = this.active instanceof ScriptAction;
         if (this.isScriptAction && this.editor) {
             this.editor.setText(this.code);
@@ -131,8 +136,8 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     }
 
     deleteAction(action: string): void {
-        if (this.programmingExercise.buildConfig?.windFile) {
-            this.programmingExercise.buildConfig!.windFile.actions = this.programmingExercise.buildConfig?.windFile.actions.filter((a) => a.name !== action);
+        if (this.programmingExercise.buildConfig?.windfile) {
+            this.programmingExercise.buildConfig!.windfile.actions = this.programmingExercise.buildConfig?.windfile.actions.filter((a) => a.name !== action);
             if (this.active?.name === action) {
                 this.active = undefined;
                 this.code = '';
@@ -141,12 +146,12 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     }
 
     addAction(action: string): void {
-        if (this.programmingExercise.buildConfig?.windFile) {
+        if (this.programmingExercise.buildConfig?.windfile) {
             const newAction = new ScriptAction();
             newAction.script = '#!/bin/bash\n\n# Add your custom build plan action here\n\nexit 0';
             newAction.name = action;
             newAction.runAlways = false;
-            this.programmingExercise.buildConfig?.windFile.actions.push(newAction);
+            this.programmingExercise.buildConfig?.windfile.actions.push(newAction);
             this.changeActiveAction(action);
         }
     }
@@ -194,9 +199,9 @@ export class ProgrammingExerciseCustomAeolusBuildPlanComponent implements OnChan
     }
 
     setDockerImage(dockerImage: string) {
-        if (!this.programmingExercise.buildConfig?.windFile || !this.programmingExercise.buildConfig?.windFile.metadata.docker) {
+        if (!this.programmingExercise.buildConfig?.windfile || !this.programmingExercise.buildConfig?.windfile.metadata.docker) {
             return;
         }
-        this.programmingExercise.buildConfig!.windFile.metadata.docker.image = dockerImage.trim();
+        this.programmingExercise.buildConfig!.windfile.metadata.docker.image = dockerImage.trim();
     }
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.html
index 2f05f5d16dd4..0c0e2c702af7 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.html
@@ -6,9 +6,9 @@
     </div>
     @if (programmingExercise.customizeBuildPlanWithAeolus) {
         <div class="row m-1">
-            @if (programmingExercise.buildConfig?.windFile && programmingExercise.buildConfig?.windFile?.metadata && programmingExercise.buildConfig?.windFile?.metadata?.docker) {
+            @if (programmingExercise.buildConfig?.windfile && programmingExercise.buildConfig?.windfile?.metadata && programmingExercise.buildConfig?.windfile?.metadata?.docker) {
                 <jhi-programming-exercise-docker-image
-                    [dockerImage]="programmingExercise.buildConfig!.windFile!.metadata.docker.image"
+                    [dockerImage]="programmingExercise.buildConfig!.windfile!.metadata.docker.image"
                     (dockerImageChange)="setDockerImage($event)"
                 />
             }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts
index b87916c9c3fd..437c22fc0f40 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges, SimpleChanges, ViewChild } from '@angular/core';
-import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { AeolusService } from 'app/exercises/programming/shared/service/aeolus.service';
@@ -22,6 +22,7 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
     staticCodeAnalysisEnabled?: boolean;
     sequentialTestRuns?: boolean;
     testwiseCoverageEnabled?: boolean;
+    isImportFromFile: boolean = false;
 
     constructor(private aeolusService: AeolusService) {}
 
@@ -32,7 +33,7 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
         this._editor = value;
         if (this._editor) {
             this.setupEditor();
-            if (this.programmingExercise.id) {
+            if (this.programmingExercise.id || this.isImportFromFile) {
                 this.code = this.programmingExercise.buildConfig?.buildScript || '';
             }
             this._editor.setText(this.code);
@@ -42,7 +43,8 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
     ngOnChanges(changes: SimpleChanges) {
         if (changes.programmingExerciseCreationConfig || changes.programmingExercise) {
             if (this.shouldReloadTemplate()) {
-                this.loadAeolusTemplate();
+                const isImportFromFile = changes.programmingExerciseCreationConfig?.currentValue?.isImportFromFile ?? false;
+                this.loadAeolusTemplate(isImportFromFile);
             }
         }
     }
@@ -63,7 +65,7 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
      * @private
      */
     resetCustomBuildPlan() {
-        this.programmingExercise.buildConfig!.windFile = undefined;
+        this.programmingExercise.buildConfig!.windfile = undefined;
         this.programmingExercise.buildConfig!.buildPlanConfiguration = undefined;
         this.programmingExercise.buildConfig!.buildScript = undefined;
     }
@@ -71,9 +73,10 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
     /**
      * Loads the predefined template for the selected programming language and project type
      * if there is one available.
+     * @param isImportFromFile whether the exercise is imported from a file
      * @private
      */
-    loadAeolusTemplate() {
+    loadAeolusTemplate(isImportFromFile: boolean = false) {
         if (!this.programmingExercise.programmingLanguage) {
             return;
         }
@@ -82,31 +85,36 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
         this.staticCodeAnalysisEnabled = this.programmingExercise.staticCodeAnalysisEnabled;
         this.sequentialTestRuns = this.programmingExercise.buildConfig?.sequentialTestRuns;
         this.testwiseCoverageEnabled = this.programmingExercise.buildConfig?.testwiseCoverageEnabled;
-        this.aeolusService
-            .getAeolusTemplateFile(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
-            .subscribe({
-                next: (file) => {
-                    this.programmingExercise.buildConfig!.windFile = this.aeolusService.parseWindFile(file);
-                },
-                error: () => {
-                    this.programmingExercise.buildConfig!.windFile = undefined;
-                },
-            });
+        this.isImportFromFile = isImportFromFile;
+        if (!isImportFromFile || !this.programmingExercise.buildConfig?.windfile) {
+            this.aeolusService
+                .getAeolusTemplateFile(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
+                .subscribe({
+                    next: (file) => {
+                        this.programmingExercise.buildConfig!.windfile = this.aeolusService.parseWindFile(file);
+                    },
+                    error: () => {
+                        this.programmingExercise.buildConfig!.windfile = undefined;
+                    },
+                });
+        }
         this.programmingExerciseCreationConfig.buildPlanLoaded = true;
-        if (!this.programmingExercise.buildConfig?.windFile) {
+        if (!this.programmingExercise.buildConfig?.windfile) {
             this.resetCustomBuildPlan();
         }
-        this.aeolusService
-            .getAeolusTemplateScript(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
-            .subscribe({
-                next: (file: string) => {
-                    this.codeChanged(file);
-                    this.editor?.setText(file);
-                },
-                error: () => {
-                    this.programmingExercise.buildConfig!.buildScript = undefined;
-                },
-            });
+        if (!isImportFromFile || !this.programmingExercise.buildConfig?.buildScript) {
+            this.aeolusService
+                .getAeolusTemplateScript(this.programmingLanguage, this.projectType, this.staticCodeAnalysisEnabled, this.sequentialTestRuns, this.testwiseCoverageEnabled)
+                .subscribe({
+                    next: (file: string) => {
+                        this.codeChanged(file);
+                        this.editor?.setText(file);
+                    },
+                    error: () => {
+                        this.programmingExercise.buildConfig!.buildScript = undefined;
+                    },
+                });
+        }
         if (!this.programmingExercise.buildConfig?.buildScript) {
             this.resetCustomBuildPlan();
         }
@@ -124,7 +132,7 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
     }
 
     /**
-     * Sets up an ace editor for the build plan script
+     * Sets up the Monaco editor for the build plan script
      */
     setupEditor(): void {
         if (!this._editor) {
@@ -134,9 +142,9 @@ export class ProgrammingExerciseCustomBuildPlanComponent implements OnChanges {
     }
 
     setDockerImage(dockerImage: string) {
-        if (!this.programmingExercise.buildConfig?.windFile || !this.programmingExercise.buildConfig?.windFile.metadata.docker) {
+        if (!this.programmingExercise.buildConfig?.windfile || !this.programmingExercise.buildConfig?.windfile.metadata.docker) {
             return;
         }
-        this.programmingExercise.buildConfig!.windFile.metadata.docker.image = dockerImage.trim();
+        this.programmingExercise.buildConfig!.windfile.metadata.docker.image = dockerImage.trim();
     }
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html
index addc823095a9..8f66c32f99dd 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.html
@@ -27,12 +27,21 @@
                 />
                 <span jhiTranslate="artemisApp.programmingExercise.allowOfflineIde.title"></span>
                 @if (!programmingExerciseCreationConfig.validIdeSelection()) {
-                    <fa-icon
-                        [icon]="faQuestionCircle"
-                        class="text-danger"
-                        [placement]="'top'"
-                        ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alert' | artemisTranslate }}"
-                    />
+                    @if (theiaEnabled) {
+                        <fa-icon
+                            [icon]="faQuestionCircle"
+                            class="text-danger"
+                            [placement]="'top'"
+                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alert' | artemisTranslate }}"
+                        />
+                    } @else {
+                        <fa-icon
+                            [icon]="faQuestionCircle"
+                            class="text-danger"
+                            [placement]="'top'"
+                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOfflineIde.alertNoTheia' | artemisTranslate }}"
+                        />
+                    }
                 }
             </label>
         </div>
@@ -49,12 +58,46 @@
                         (ngModelChange)="triggerValidation.emit()"
                     />
                     <span jhiTranslate="artemisApp.programmingExercise.allowOnlineEditor.title"></span>
+                    @if (!programmingExerciseCreationConfig.validIdeSelection()) {
+                        @if (theiaEnabled) {
+                            <fa-icon
+                                [icon]="faQuestionCircle"
+                                class="text-danger"
+                                [placement]="'top'"
+                                ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineEditor.alert' | artemisTranslate }}"
+                            />
+                        } @else {
+                            <fa-icon
+                                [icon]="faQuestionCircle"
+                                class="text-danger"
+                                [placement]="'top'"
+                                ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineEditor.alertNoTheia' | artemisTranslate }}"
+                            />
+                        }
+                    }
+                </label>
+            </div>
+        }
+        <!-- only show this for non-exam exercises -->
+        @if (!programmingExercise.exerciseGroup && theiaEnabled) {
+            <div class="form-check">
+                <label [class]="!programmingExerciseCreationConfig.validIdeSelection() ? 'form-check-label text-danger' : 'form-check-label'" for="field_allowOnlineIde">
+                    <input
+                        class="form-check-input"
+                        type="checkbox"
+                        name="allowOnlineIde"
+                        id="field_allowOnlineIde"
+                        [(ngModel)]="programmingExercise.allowOnlineIde"
+                        checked
+                        (ngModelChange)="triggerValidation.emit()"
+                    />
+                    <span jhiTranslate="artemisApp.programmingExercise.allowOnlineIde.title"></span>
                     @if (!programmingExerciseCreationConfig.validIdeSelection()) {
                         <fa-icon
                             [icon]="faQuestionCircle"
                             class="text-danger"
                             [placement]="'top'"
-                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineEditor.alert' | artemisTranslate }}"
+                            ngbTooltip="{{ 'artemisApp.programmingExercise.allowOnlineIde.alert' | artemisTranslate }}"
                         />
                     }
                 </label>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts
index 77e30693bff9..9b90e235dcec 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-difficulty.component.ts
@@ -1,15 +1,17 @@
-import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { ProgrammingExercise, ProjectType } from 'app/entities/programming-exercise.model';
+import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
+import { PROFILE_THEIA } from 'app/app.constants';
+import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 
 @Component({
     selector: 'jhi-programming-exercise-difficulty',
     templateUrl: './programming-exercise-difficulty.component.html',
     styleUrls: ['../../programming-exercise-form.scss'],
 })
-export class ProgrammingExerciseDifficultyComponent {
+export class ProgrammingExerciseDifficultyComponent implements OnInit {
     @Input() programmingExercise: ProgrammingExercise;
     @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
     @ViewChild(TeamConfigFormGroupComponent) teamConfigComponent: TeamConfigFormGroupComponent;
@@ -18,5 +20,15 @@ export class ProgrammingExerciseDifficultyComponent {
 
     protected readonly ProjectType = ProjectType;
 
+    theiaEnabled: boolean = false;
+
+    constructor(private profileService: ProfileService) {}
+
+    ngOnInit(): void {
+        this.profileService.getProfileInfo().subscribe((profileInfo) => {
+            this.theiaEnabled = profileInfo.activeProfiles?.includes(PROFILE_THEIA);
+        });
+    }
+
     faQuestionCircle = faQuestionCircle;
 }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
index cda675597e30..596b6d8c38c7 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.html
@@ -2,7 +2,7 @@
     <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle" id="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepTitle"></h3>
     <p jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradingStepMessage"></p>
     <div class="form-group">
-        <label class="form-control-label">{{ 'artemisApp.exercise.includedInOverallScore' + (programmingExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate }}</label>
+        <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ programmingExercise.course ? 'Course' : 'Exam' }}Label"></label>
         <div>
             <jhi-included-in-overall-score-picker [(includedInOverallScore)]="programmingExercise.includedInOverallScore" [allowNotIncluded]="true" />
         </div>
@@ -23,9 +23,7 @@ <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradin
                     #maxScore="ngModel"
                 />
                 @if (maxScore?.invalid && (maxScore?.dirty || maxScore?.touched) && maxScore?.errors) {
-                    <div class="alert alert-danger">
-                        {{ 'artemisApp.exercise.pointsError' | artemisTranslate }}
-                    </div>
+                    <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
                 }
             </div>
         </div>
@@ -44,9 +42,11 @@ <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradin
                     #bonusPoints="ngModel"
                 />
                 @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
-                    <div class="alert alert-danger" [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
-                        {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }}
-                    </div>
+                    <div
+                        class="alert alert-danger"
+                        [hidden]="programmingExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
+                        jhiTranslate="artemisApp.exercise.bonusPointsError"
+                    ></div>
                 }
             </div>
         </div>
@@ -94,9 +94,9 @@ <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.gradin
         />
         @if (programmingExerciseCreationConfig.isEdit) {
             <ngb-alert [dismissible]="false" [type]="'info'">
-                <span>{{ 'artemisApp.programmingExercise.submissionPolicy.editInGradingInformation' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.editInGradingInformation"></span>
                 <a [href]="editPolicyUrl">
-                    <span>{{ 'artemisApp.programmingExercise.submissionPolicy.goToGradingToEditInformation' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.programmingExercise.submissionPolicy.goToGradingToEditInformation"></span>
                 </a>
             </ngb-alert>
         }
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts
index b82813fa9f06..5a5c6a17c6d3 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-grading.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, Input, OnDestroy, ViewChild } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
index b1bd35bca30a..f60b0948a4c6 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-information.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, Input, OnDestroy, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { NgModel } from '@angular/forms';
-import { ProgrammingExercise, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
 import { Subject, Subscription } from 'rxjs';
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
index 1e4c258dfd16..e801f1a04d85 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.html
@@ -111,6 +111,13 @@
             }
         </div>
     }
+
+    <!-- Theia Image Selection -->
+    @if (programmingExercise.allowOnlineIde && programmingExercise.programmingLanguage) {
+        <label class="label-narrow" jhiTranslate="artemisApp.programmingExercise.theiaImage.title"></label>
+        <jhi-programming-exercise-theia [programmingExercise]="programmingExercise" [programmingExerciseCreationConfig]="programmingExerciseCreationConfig" />
+    }
+
     <!-- Static code analysis checkbox -->
     @if (programmingExercise.programmingLanguage && programmingExerciseCreationConfig.staticCodeAnalysisAllowed) {
         <div>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts
index 51bb90eb46d8..696d75ce185f 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-language.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewChecked, AfterViewInit, Component, EventEmitter, Input, OnDestroy, ViewChild } from '@angular/core';
-import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { PROFILE_AEOLUS, PROFILE_LOCALCI } from 'app/app.constants';
@@ -7,6 +7,7 @@ import { NgModel } from '@angular/forms';
 import { Subject, Subscription } from 'rxjs';
 import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component';
 import { ProgrammingExerciseCustomBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-build-plan.component';
+import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
 
 @Component({
     selector: 'jhi-programming-exercise-language',
@@ -24,6 +25,7 @@ export class ProgrammingExerciseLanguageComponent implements AfterViewChecked, A
     @ViewChild('packageName') packageNameField?: NgModel;
     @ViewChild(ProgrammingExerciseCustomAeolusBuildPlanComponent) programmingExerciseCustomAeolusBuildPlanComponent?: ProgrammingExerciseCustomAeolusBuildPlanComponent;
     @ViewChild(ProgrammingExerciseCustomBuildPlanComponent) programmingExerciseCustomBuildPlanComponent?: ProgrammingExerciseCustomBuildPlanComponent;
+    @ViewChild(ProgrammingExerciseTheiaComponent) programmingExerciseTheiaComponent?: ProgrammingExerciseTheiaComponent;
 
     formValid: boolean;
     formValidChanges = new Subject<boolean>();
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
index 0b1c6ad56f56..61cd41a42924 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.html
@@ -6,11 +6,13 @@ <h3 jhiTranslate="artemisApp.programmingExercise.wizardMode.detailedSteps.proble
         @if (programmingExerciseCreationConfig.isImportFromExistingExercise || programmingExerciseCreationConfig.isImportFromFile) {
             <ngb-alert [dismissible]="false">
                 <span class="font-weight-bold">{{ 'artemisApp.exercise.import.attention' | artemisTranslate }}</span
-                ><span>{{
-                    programmingExerciseCreationConfig.isImportFromExistingExercise
-                        ? ('artemisApp.exercise.import.markdownWarning' | artemisTranslate)
-                        : ('artemisApp.exercise.import.embeddedFilesWarning' | artemisTranslate)
-                }}</span>
+                ><span
+                    jhiTranslate="{{
+                        programmingExerciseCreationConfig.isImportFromExistingExercise
+                            ? 'artemisApp.exercise.import.markdownWarning'
+                            : 'artemisApp.exercise.import.embeddedFilesWarning'
+                    }}"
+                ></span>
             </ngb-alert>
         }
         @if (programmingExerciseCreationConfig.isImportFromExistingExercise) {
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts
index f6625d0f56fe..803b06558f72 100644
--- a/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/programming-exercise-problem.component.ts
@@ -1,9 +1,10 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
+
+import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 @Component({
     selector: 'jhi-programming-exercise-problem',
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.html b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.html
new file mode 100644
index 000000000000..96d23fa998e8
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.html
@@ -0,0 +1,21 @@
+<div class="form-group">
+    <select
+        #select="ngModel"
+        required
+        class="form-select"
+        [ngModel]="programmingExercise.buildConfig?.theiaImage"
+        (ngModelChange)="onTheiaImageChange($event)"
+        name="theiaImage"
+        id="field_theiaImage"
+    >
+        @for (item of theiaImages! | keyvalue; track item) {
+            <option [value]="item.value">
+                {{ item.key }}
+            </option>
+        } @empty {
+            <option [value]="undefined" disabled>
+                <div jhiTranslate="artemisApp.programmingExercise.theiaImage.noImageAvailable"></div>
+            </option>
+        }
+    </select>
+</div>
diff --git a/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts
new file mode 100644
index 000000000000..b516009846ed
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component.ts
@@ -0,0 +1,82 @@
+import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
+import { TheiaService } from 'app/exercises/programming/shared/service/theia.service';
+import { ArtemisSharedLibsModule } from 'app/shared/shared-libs.module';
+
+@Component({
+    selector: 'jhi-programming-exercise-theia',
+    templateUrl: './programming-exercise-theia.component.html',
+    styleUrls: ['../../../programming-exercise-form.scss'],
+    standalone: true,
+    imports: [ArtemisSharedLibsModule],
+})
+export class ProgrammingExerciseTheiaComponent implements OnChanges {
+    @Input() programmingExercise: ProgrammingExercise;
+    @Input() programmingExerciseCreationConfig: ProgrammingExerciseCreationConfig;
+
+    programmingLanguage?: ProgrammingLanguage;
+    theiaImages = {};
+
+    constructor(private theiaService: TheiaService) {}
+
+    ngOnChanges(changes: SimpleChanges) {
+        if ((changes.programmingExerciseCreationConfig || changes.programmingExercise) && this.shouldReloadTemplate()) {
+            this.loadTheiaImages();
+        }
+    }
+
+    onTheiaImageChange(theiaImage: string) {
+        if (this.programmingExercise.buildConfig) {
+            this.programmingExercise.buildConfig.theiaImage = theiaImage;
+        }
+    }
+
+    shouldReloadTemplate(): boolean {
+        return this.programmingExercise.programmingLanguage !== this.programmingLanguage;
+    }
+
+    /**
+     * In case the programming language or project type changes, we need to reset the template and the build plan
+     * @private
+     */
+    resetImageSelection() {
+        if (this.programmingExercise.buildConfig) {
+            this.programmingExercise.buildConfig.theiaImage = undefined;
+        }
+    }
+
+    /**
+     * Loads the predefined template for the selected programming language if there is one available.
+     * @private
+     */
+    loadTheiaImages() {
+        if (!this.programmingExercise || !this.programmingExercise.programmingLanguage) {
+            return;
+        }
+
+        this.programmingLanguage = this.programmingExercise.programmingLanguage;
+
+        this.theiaService.getTheiaImages(this.programmingLanguage).subscribe({
+            next: (images) => {
+                if (!images) {
+                    // Remove selection if no image is available
+                    this.theiaImages = {};
+                    this.resetImageSelection();
+                    return;
+                }
+
+                this.theiaImages = images;
+
+                // Set the first image as default if none is selected
+                if (this.programmingExercise && this.programmingExercise.buildConfig && !this.programmingExercise.buildConfig.theiaImage && Object.values(images).length > 0) {
+                    this.programmingExercise.buildConfig.theiaImage = Object.values(images).first() as string;
+                }
+            },
+            error: () => {
+                this.theiaImages = {};
+                this.resetImageSelection();
+            },
+        });
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html
index 054042061c0d..b1e8a2e356d1 100644
--- a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html
+++ b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.html
@@ -44,19 +44,15 @@
             </div>
             <div submissionPolicy class="ps-2 pt-1 justify-self-center">
                 @if (exercise.submissionPolicy && exercise.submissionPolicy.active && numberOfSubmissionsForSubmissionPolicy !== undefined) {
-                    <span>
-                        {{
-                            'artemisApp.programmingExercise.submissionPolicy.submissionsAllowed'
-                                | artemisTranslate: { submissionCount: numberOfSubmissionsForSubmissionPolicy, totalSubmissions: exercise.submissionPolicy.submissionLimit }
-                        }}
-                    </span>
+                    <span
+                        jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionsAllowed"
+                        [translateValues]="{ submissionCount: numberOfSubmissionsForSubmissionPolicy, totalSubmissions: exercise.submissionPolicy.submissionLimit }"
+                    ></span>
                     @if (exercise.submissionPolicy.type === SubmissionPolicyType.SUBMISSION_PENALTY) {
-                        <span>
-                            {{
-                                'artemisApp.programmingExercise.submissionPolicy.submissionPenalty.penaltyInfoLabel'
-                                    | artemisTranslate: { points: exercise.submissionPolicy.exceedingPenalty }
-                            }}
-                        </span>
+                        <span
+                            jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionPenalty.penaltyInfoLabel"
+                            [translateValues]="{ points: exercise.submissionPolicy.exceedingPenalty }"
+                        ></span>
                     }
                 }
             </div>
diff --git a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts
index 826902c2058a..34aa3e0b0d5a 100644
--- a/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts
+++ b/src/main/webapp/app/exercises/programming/participate/code-editor-student-container.component.ts
@@ -10,7 +10,7 @@ import { DomainService } from 'app/exercises/programming/shared/code-editor/serv
 import { ExerciseType, IncludedInOverallScore, getCourseFromExercise } from 'app/entities/exercise.model';
 import { Result } from 'app/entities/result.model';
 import { Feedback, FeedbackType, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { ActivatedRoute } from '@angular/router';
 import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component';
diff --git a/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts b/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts
index bf3cd9026f40..826437a4ce28 100644
--- a/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts
+++ b/src/main/webapp/app/exercises/programming/participate/programming-submission-policy-status.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
 
 @Component({
@@ -7,19 +7,15 @@ import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
     template: `
         @if (exercise.submissionPolicy && exercise.submissionPolicy.active && submissionCount !== undefined) {
             <div submissionPolicy>
-                <span>
-                    {{
-                        'artemisApp.programmingExercise.submissionPolicy.submissionsAllowed'
-                            | artemisTranslate: { submissionCount: submissionCount, totalSubmissions: exercise.submissionPolicy.submissionLimit }
-                    }}
-                </span>
+                <span
+                    jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionsAllowed"
+                    [translateValues]="{ submissionCount: submissionCount, totalSubmissions: exercise.submissionPolicy.submissionLimit }"
+                ></span>
                 @if (exercise.submissionPolicy.type === SubmissionPolicyType.SUBMISSION_PENALTY) {
-                    <span>
-                        {{
-                            'artemisApp.programmingExercise.submissionPolicy.submissionPenalty.penaltyInfoLabel'
-                                | artemisTranslate: { points: exercise.submissionPolicy.exceedingPenalty }
-                        }}
-                    </span>
+                    <span
+                        jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionPenalty.penaltyInfoLabel"
+                        [translateValues]="{ points: exercise.submissionPolicy.exceedingPenalty }"
+                    ></span>
                 }
             </div>
         }
diff --git a/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts b/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts
index c13539943903..0fd3d43a0535 100644
--- a/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts
+++ b/src/main/webapp/app/exercises/programming/participate/programming-submission.service.ts
@@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model';
 import { createRequestOption } from 'app/shared/util/request.util';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionType, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { findLatestResult } from 'app/shared/util/utils';
diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts
index afa3062da5b8..60081cc274f3 100644
--- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component.ts
@@ -3,7 +3,7 @@ import { debounceTime, map, tap } from 'rxjs/operators';
 import { ExerciseSubmissionState, ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/exercises/programming/participate/programming-submission.service';
 import { Subscription } from 'rxjs';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { hasExerciseChanged } from 'app/exercises/shared/exercise/exercise.utils';
 import { ButtonType } from 'app/shared/components/button.component';
 import { faCircleNotch, faClock, faRedo } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts
index 06c2447d5248..2d1710b1b692 100644
--- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-re-evaluate-button.component.ts
@@ -3,7 +3,7 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { AlertService } from 'app/core/util/alert.service';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ButtonType } from 'app/shared/components/button.component';
 import { faRedo } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts
index 3dc928117229..28454d8c0e72 100644
--- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component.ts
@@ -6,7 +6,7 @@ import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { hasDueDatePassed } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
 import { BuildRunState, ProgrammingBuildRunService } from 'app/exercises/programming/participate/programming-build-run.service';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ButtonType } from 'app/shared/components/button.component';
 import { faBan, faRedo, faTimes } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts
index 5efd0b6ea087..52089b28c991 100644
--- a/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/actions/programming-exercise-trigger-build-button.component.ts
@@ -10,7 +10,7 @@ import { hasDueDatePassed } from 'app/exercises/programming/shared/utils/program
 import { Result } from 'app/entities/result.model';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { SubmissionType } from 'app/entities/submission.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { hasParticipationChanged } from 'app/exercises/shared/participation/participation.utils';
 
diff --git a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts
index 4bcffecaa5af..d1932dc53ff3 100644
--- a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/build-plan-checkout-directories-dto';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { BuildPlanCheckoutDirectoriesDTO } from 'app/entities/programming/build-plan-checkout-directories-dto';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 
 @Component({
     selector: 'jhi-programming-exercise-build-plan-checkout-directories',
diff --git a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts
index 30021b146f48..f44d22e06ff7 100644
--- a/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component.ts
@@ -1,9 +1,9 @@
 import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
 import { getCourseFromExercise } from 'app/entities/exercise.model';
-import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import type { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { Subscription } from 'rxjs';
-import type { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto';
+import type { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component';
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts
index d4506dbc256b..1c7535cbc9d6 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component.ts
@@ -2,7 +2,7 @@ import { ParticipationWebsocketService } from 'app/overview/participation-websoc
 import { AfterViewInit, Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core';
 import { Observable, Subscription, of } from 'rxjs';
 import { catchError, filter, map, switchMap, tap } from 'rxjs/operators';
-import { BuildLogEntry, BuildLogEntryArray } from 'app/entities/build-log.model';
+import { BuildLogEntry, BuildLogEntryArray } from 'app/entities/programming/build-log.model';
 import { Participation, getExercise } from 'app/entities/participation/participation.model';
 import { CodeEditorSubmissionService } from 'app/exercises/programming/shared/code-editor/service/code-editor-submission.service';
 import { CodeEditorBuildLogService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
@@ -11,10 +11,10 @@ import { ResultService } from 'app/exercises/shared/result/result.service';
 import { Result } from 'app/entities/result.model';
 import { Interactable } from '@interactjs/core/Interactable';
 import interact from 'interactjs';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { findLatestResult } from 'app/shared/util/utils';
-import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { faChevronDown, faCircleNotch, faTerminal } from '@fortawesome/free-solid-svg-icons';
 import { hasParticipationChanged } from 'app/exercises/shared/participation/participation.utils';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/code-editor.module.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/code-editor.module.ts
index d403afbfa572..7b23b4959793 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/code-editor.module.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/code-editor.module.ts
@@ -1,5 +1,4 @@
 import { NgModule } from '@angular/core';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { CodeEditorBuildOutputComponent } from 'app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component';
 import { CodeEditorGridComponent } from 'app/exercises/programming/shared/code-editor/layout/code-editor-grid.component';
 import { CodeEditorActionsComponent } from 'app/exercises/programming/shared/code-editor/actions/code-editor-actions.component';
@@ -28,7 +27,6 @@ import { ArtemisSharedComponentModule } from 'app/shared/components/shared-compo
 
 @NgModule({
     imports: [
-        AceEditorModule,
         NgbModule,
         ArtemisSharedModule,
         FeatureToggleModule,
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser.component.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser.component.ts
index 52fa1c7dbd28..16cd6c22176b 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/file-browser/code-editor-file-browser.component.ts
@@ -515,8 +515,6 @@ export class CodeEditorFileBrowserComponent implements OnInit, OnChanges, AfterV
                 fromPairs(
                     toPairs(files)
                         .filter(([fileName, fileType]) => this.allowHiddenFiles || CodeEditorFileBrowserComponent.shouldDisplayFile(fileName, fileType))
-                        // Filter Readme file that was historically in the student's assignment repo
-                        .filter(([value]) => !value.includes('README.md'))
                         // Filter root folder
                         .filter(([value]) => value),
                 ),
@@ -527,14 +525,7 @@ export class CodeEditorFileBrowserComponent implements OnInit, OnChanges, AfterV
 
     loadFilesWithInformationAboutChange(): Observable<{ [fileName: string]: boolean }> {
         return this.repositoryFileService.getFilesWithInformationAboutChange().pipe(
-            rxMap((files) =>
-                fromPairs(
-                    toPairs(files)
-                        .filter(([filename]) => this.allowHiddenFiles || CodeEditorFileBrowserComponent.shouldDisplayFile(filename, FileType.FILE))
-                        // Filter Readme file that was historically in the student's assignment repo
-                        .filter(([value]) => !value.includes('README.md')),
-                ),
-            ),
+            rxMap((files) => fromPairs(toPairs(files).filter(([filename]) => this.allowHiddenFiles || CodeEditorFileBrowserComponent.shouldDisplayFile(filename, FileType.FILE)))),
             catchError(() => throwError(() => new Error('couldNotBeRetrieved'))),
         );
     }
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/header/code-editor-header.component.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/header/code-editor-header.component.ts
index 2a509207248b..e340a1dcb4f2 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/header/code-editor-header.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/header/code-editor-header.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { MAX_TAB_SIZE } from 'app/shared/markdown-editor/ace-editor/ace-editor.component';
 import { faFileAlt } from '@fortawesome/free-regular-svg-icons';
 import { faCircleNotch, faGear } from '@fortawesome/free-solid-svg-icons';
+import { MAX_TAB_SIZE } from 'app/shared/monaco-editor/monaco-editor.component';
 
 @Component({
     selector: 'jhi-code-editor-header',
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts
index 15e715b290ef..a3215aa04c48 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/model/code-editor.model.ts
@@ -1,7 +1,7 @@
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 /**
  * Enumeration defining type of the exported file.
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component.ts b/src/main/webapp/app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component.ts
index 5ea72401832e..b16d76dc66a4 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/monaco/code-editor-monaco.component.ts
@@ -3,7 +3,7 @@ import { RepositoryFileService } from 'app/exercises/shared/result/repository.se
 import { CodeEditorRepositoryFileService, ConnectionError } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { CodeEditorFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-file.service';
 import { LocalStorageService } from 'ngx-webstorage';
-import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
+import { EditorPosition, MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
 import { firstValueFrom, timeout } from 'rxjs';
 import { FEEDBACK_SUGGESTION_ACCEPTED_IDENTIFIER, FEEDBACK_SUGGESTION_IDENTIFIER, Feedback } from 'app/entities/feedback.model';
 import { Course } from 'app/entities/course.model';
@@ -22,7 +22,7 @@ import { CodeEditorTutorAssessmentInlineFeedbackSuggestionComponent } from 'app/
 import { MonacoEditorLineHighlight } from 'app/shared/monaco-editor/model/monaco-editor-line-highlight.model';
 import { FileTypeService } from 'app/exercises/programming/shared/service/file-type.service';
 
-type FileSession = { [fileName: string]: { code: string; cursor: { column: number; row: number }; loadingError: boolean } };
+type FileSession = { [fileName: string]: { code: string; cursor: EditorPosition; loadingError: boolean } };
 export type Annotation = { fileName: string; row: number; column: number; text: string; type: string; timestamp: number; hash?: string };
 @Component({
     selector: 'jhi-code-editor-monaco',
@@ -159,7 +159,7 @@ export class CodeEditorMonacoComponent implements OnChanges {
                     this.onError.emit('loadingFailed');
                 }
             }
-            this.fileSession[fileName] = { code: fileContent, loadingError, cursor: { column: 0, row: 0 } };
+            this.fileSession[fileName] = { code: fileContent, loadingError, cursor: { column: 0, lineNumber: 0 } };
         }
 
         const code = this.fileSession[fileName].code;
@@ -329,7 +329,7 @@ export class CodeEditorMonacoComponent implements OnChanges {
         }
         // In the future, there may be more than one feedback node per line.
         const feedbackNode = this.getInlineFeedbackNodeOrElseThrow(line);
-        // The lines are 0-based for Ace, but 1-based for Monaco -> increase by 1 to ensure it works in both editors.
+        // Feedback is stored with 0-based lines, but the lines of the Monaco editor used in Artemis are 1-based. We add 1 to correct this
         this.editor.addLineWidget(line + 1, 'feedback-' + feedback.id, feedbackNode);
     }
 
@@ -365,7 +365,7 @@ export class CodeEditorMonacoComponent implements OnChanges {
             this.fileSession = this.fileService.updateFileReferences(this.fileSession, fileChange);
             this.storeAnnotations([fileChange.fileName]);
         } else if (fileChange instanceof CreateFileChange && fileChange.fileType === FileType.FILE) {
-            this.fileSession = { ...this.fileSession, [fileChange.fileName]: { code: '', cursor: { row: 0, column: 0 }, loadingError: false } };
+            this.fileSession = { ...this.fileSession, [fileChange.fileName]: { code: '', cursor: { lineNumber: 0, column: 0 }, loadingError: false } };
         }
         this.setBuildAnnotations(this.annotationsArray);
     }
diff --git a/src/main/webapp/app/exercises/programming/shared/code-editor/status/code-editor-status.component.html b/src/main/webapp/app/exercises/programming/shared/code-editor/status/code-editor-status.component.html
index 2102e75ddf69..3d9c0233d530 100644
--- a/src/main/webapp/app/exercises/programming/shared/code-editor/status/code-editor-status.component.html
+++ b/src/main/webapp/app/exercises/programming/shared/code-editor/status/code-editor-status.component.html
@@ -5,7 +5,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.changesUndefinedTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faCircleNotch" animation="spin" class="text-info me-1" />
-                        <span class="text-info">{{ 'artemisApp.editor.changesUndefined' | artemisTranslate }}</span>
+                        <span class="text-info" jhiTranslate="artemisApp.editor.changesUndefined"></span>
                     </span>
                 </div>
             }
@@ -13,7 +13,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.changesErrorTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faTimesCircle" class="text-danger me-1" />
-                        <span class="text-danger">{{ 'artemisApp.editor.changesError' | artemisTranslate }}</span>
+                        <span class="text-danger" jhiTranslate="artemisApp.editor.changesError"></span>
                     </span>
                 </div>
             }
@@ -21,7 +21,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.changesConflictTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faTimesCircle" class="text-danger me-1" />
-                        <span class="text-danger">{{ 'artemisApp.editor.changesConflict' | artemisTranslate }}</span>
+                        <span class="text-danger" jhiTranslate="artemisApp.editor.changesConflict"></span>
                     </span>
                 </div>
             }
@@ -29,7 +29,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.changesSubmittedTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faCheckCircle" class="text-success me-1" />
-                        <span class="text-info">{{ 'artemisApp.editor.changesSubmitted' | artemisTranslate }}</span>
+                        <span class="text-info" jhiTranslate="artemisApp.editor.changesSubmitted"></span>
                     </span>
                 </div>
             }
@@ -37,7 +37,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.unsubmittedChangesTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faExclamationTriangle" class="text-warning me-1" />
-                        <span class="text-info">{{ 'artemisApp.editor.unsubmittedChanges' | artemisTranslate }}</span>
+                        <span class="text-info" jhiTranslate="artemisApp.editor.unsubmittedChanges"></span>
                     </span>
                 </div>
             }
@@ -45,7 +45,7 @@
                 <div>
                     <span ngbTooltip="{{ 'artemisApp.editor.submittingChangesTooltip' | artemisTranslate }}">
                         <fa-icon [icon]="faCircleNotch" class="text-info me-1" animation="spin" />
-                        <span class="text-info">{{ 'artemisApp.editor.submittingChanges' | artemisTranslate }}</span>
+                        <span class="text-info" jhiTranslate="artemisApp.editor.submittingChanges"></span>
                     </span>
                 </div>
             }
diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts
index 4700569d8c97..64ed91bab723 100644
--- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-group.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import type { CommitInfo } from 'app/entities/programming-submission.model';
+import type { CommitInfo } from 'app/entities/programming/programming-submission.model';
 
 @Component({
     selector: 'jhi-commits-info-group',
diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts
index 51edbcc7652c..a944e452e1b4 100644
--- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import type { CommitInfo } from 'app/entities/programming-submission.model';
+import type { CommitInfo } from 'app/entities/programming/programming-submission.model';
 import { faCircle } from '@fortawesome/free-regular-svg-icons';
 import { faAngleDown, faAngleLeft } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts
index d3728a48dc46..28a46506caab 100644
--- a/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/commits-info/commits-info.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import dayjs from 'dayjs/esm';
 import { createCommitUrl } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts
index 6b7a28165b4a..2c0d4036369b 100644
--- a/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts
+++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { Subject } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts
index 4fd960bbbe2d..f1f669c7fb5c 100644
--- a/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component.ts
@@ -14,12 +14,12 @@ import {
 } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ThemeService } from 'app/core/theme/theme.service';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { ShowdownExtension } from 'showdown';
 import { catchError, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
 import { Observable, Subscription, merge, of } from 'rxjs';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { ProgrammingExerciseTaskExtensionWrapper, taskRegex } from './extensions/programming-exercise-task.extension';
 import { ProgrammingExercisePlantUmlExtensionWrapper } from 'app/exercises/programming/shared/instructions-render/extensions/programming-exercise-plant-uml.extension';
@@ -27,7 +27,6 @@ import { TaskArray } from 'app/exercises/programming/shared/instructions-render/
 import { Participation } from 'app/entities/participation/participation.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { ResultService } from 'app/exercises/shared/result/result.service';
-import { RepositoryFileService } from 'app/exercises/shared/result/repository.service';
 import { problemStatementHasChanged } from 'app/exercises/shared/exercise/exercise.utils';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { Result } from 'app/entities/result.model';
@@ -51,7 +50,7 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes
     @Input() public participation: Participation;
     @Input() generateHtmlEvents: Observable<void>;
     @Input() personalParticipation: boolean;
-    // If there are no instructions available (neither in the exercise problemStatement nor the legacy README.md) emits an event
+    // Emits an event if the instructions are not available via the problemStatement
     @Output()
     public onNoInstructionsAvailable = new EventEmitter();
 
@@ -94,7 +93,6 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes
     constructor(
         public viewContainerRef: ViewContainerRef,
         private resultService: ResultService,
-        private repositoryFileService: RepositoryFileService,
         private participationWebsocketService: ParticipationWebsocketService,
         private programmingExerciseTaskWrapper: ProgrammingExerciseTaskExtensionWrapper,
         private programmingExercisePlantUmlWrapper: ProgrammingExercisePlantUmlExtensionWrapper,
@@ -155,7 +153,7 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes
                     // If the exercise is not loaded, the instructions can't be loaded and so there is no point in loading the results, etc, yet.
                     if (!this.isLoading && this.exercise && this.participation && (this.isInitial || participationHasChanged)) {
                         this.isLoading = true;
-                        return this.loadInstructions().pipe(
+                        return of(this.exercise.problemStatement).pipe(
                             // If no instructions can be loaded, abort pipe and hide the instruction panel
                             tap((problemStatement) => {
                                 if (!problemStatement) {
@@ -291,26 +289,6 @@ export class ProgrammingExerciseInstructionComponent implements OnChanges, OnDes
         );
     }
 
-    /**
-     * Loads the instructions for the programming exercise.
-     * We added the problemStatement later, historically the instructions where a file in the student's repository
-     * This is why we now prefer the problemStatement and if it doesn't exist try to load the readme.
-     */
-    loadInstructions(): Observable<string | undefined> {
-        if (this.exercise.problemStatement) {
-            return of(this.exercise.problemStatement);
-        } else {
-            if (!this.participation.id) {
-                return of(undefined);
-            }
-            return this.repositoryFileService.get(this.participation.id, 'README.md').pipe(
-                catchError(() => of(undefined)),
-                // Old readme files contain chars instead of our domain command tags - replace them when loading the file
-                map((fileObj) => fileObj && fileObj.fileContent.replace(new RegExp(/✅/, 'g'), '[task]')),
-            );
-        }
-    }
-
     private renderMarkdown(): void {
         // Highlight differences between previous and current markdown
         if (
diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts
index 3234cae415ee..73cd7de06eba 100644
--- a/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts
+++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/service/programming-exercise-instruction.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { Result } from 'app/entities/result.model';
 
 /**
diff --git a/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html b/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html
index a0bb5f4203fc..eaf81d0a62f8 100644
--- a/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html
+++ b/src/main/webapp/app/exercises/programming/shared/instructions-render/step-wizard/programming-exercise-instruction-step-wizard.component.html
@@ -1,8 +1,6 @@
 <div class="card-second-header" [hidden]="!steps?.length">
     <div class="stepwizard">
-        <div class="stepwizard-title">
-            {{ 'artemisApp.programmingExercise.problemStatement.tasksOfExercise' | artemisTranslate }}
-        </div>
+        <div class="stepwizard-title" jhiTranslate="artemisApp.programmingExercise.problemStatement.tasksOfExercise"></div>
         <div class="stepwizard-row">
             @for (step of steps; track step; let i = $index) {
                 <div class="stepwizard-step">
diff --git a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
index 9185f229d2ff..aa2e0e951699 100644
--- a/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
+++ b/src/main/webapp/app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component.ts
@@ -2,7 +2,7 @@ import { AfterViewInit, Component, Input, OnChanges, OnDestroy, OnInit, QueryLis
 import dayjs from 'dayjs/esm';
 import { TranslateService } from '@ngx-translate/core';
 import { AssessmentType } from 'app/entities/assessment-type.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { faCogs, faUserCheck, faUserSlash } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { IncludedInOverallScore } from 'app/entities/exercise.model';
diff --git a/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts b/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts
index 5871d4ca94f1..1b468776d570 100644
--- a/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts
+++ b/src/main/webapp/app/exercises/programming/shared/service/aeolus.service.ts
@@ -1,8 +1,10 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action';
+import { WindFile } from 'app/entities/programming/wind.file';
 import { Observable } from 'rxjs';
 
-import { BuildAction, PlatformAction, ProgrammingLanguage, ProjectType, ScriptAction, WindFile } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 
 @Injectable({ providedIn: 'root' })
 export class AeolusService {
@@ -51,7 +53,7 @@ export class AeolusService {
     parseWindFile(file: string): WindFile | undefined {
         try {
             const templateFile: WindFile = JSON.parse(file);
-            const windFile: WindFile = Object.assign(new WindFile(), templateFile);
+            const windfile: WindFile = Object.assign(new WindFile(), templateFile);
             const actions: BuildAction[] = [];
             templateFile.actions.forEach((anyAction: any) => {
                 let action: BuildAction | undefined;
@@ -71,11 +73,11 @@ export class AeolusService {
                 }
             });
             // somehow, the returned content may have a scriptActions field, which is not a field of the WindFile class
-            if ('scriptActions' in windFile) {
-                delete windFile['scriptActions'];
+            if ('scriptActions' in windfile) {
+                delete windfile['scriptActions'];
             }
-            windFile.actions = actions;
-            return windFile;
+            windfile.actions = actions;
+            return windfile;
         } catch (SyntaxError) {
             return undefined;
         }
@@ -100,8 +102,8 @@ export class AeolusService {
         };
     }
 
-    serializeWindFile(windFile: WindFile): string {
-        return JSON.stringify(windFile, this.replacer);
+    serializeWindFile(windfile: WindFile): string {
+        return JSON.stringify(windfile, this.replacer);
     }
 
     /**
diff --git a/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts b/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts
index 029e09af8e16..3f749357f188 100644
--- a/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts
+++ b/src/main/webapp/app/exercises/programming/shared/service/build-log.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { BuildLogEntry } from 'app/entities/build-log.model';
+import { BuildLogEntry } from 'app/entities/programming/build-log.model';
 
 export interface IBuildLogService {
     getBuildLogs: (participationId: number, resultId?: number) => Observable<BuildLogEntry[]>;
diff --git a/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts b/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts
index 3c7d1c9eaccd..7f2e95b0f73a 100644
--- a/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts
+++ b/src/main/webapp/app/exercises/programming/shared/service/programming-language-feature/programming-language-feature.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 
 /**
diff --git a/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts b/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts
new file mode 100644
index 000000000000..3165730ddab7
--- /dev/null
+++ b/src/main/webapp/app/exercises/programming/shared/service/theia.service.ts
@@ -0,0 +1,25 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
+
+@Injectable({ providedIn: 'root' })
+export class TheiaService {
+    private resourceUrl = 'api/theia';
+
+    constructor(private http: HttpClient) {}
+
+    /**
+     * Fetches the theia images for the given programming language
+     * @param {ProgrammingLanguage} language
+     * @returns the theia images or undefined if no images are available for this language
+     */
+    getTheiaImages(language: ProgrammingLanguage): Observable<{ [key: string]: string } | undefined> {
+        return this.http.get<{ [key: string]: string }>(`${this.resourceUrl}/images`, {
+            params: {
+                language: language,
+            },
+        });
+    }
+}
diff --git a/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts b/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts
index 3234ee6a1cf1..5e95bb66dbac 100644
--- a/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts
+++ b/src/main/webapp/app/exercises/programming/shared/utils/programming-exercise.utils.ts
@@ -1,8 +1,8 @@
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionType } from 'app/entities/submission.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-create-form.component.html b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-create-form.component.html
index ff4737f5e7d5..c7fef4d606df 100644
--- a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-create-form.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-create-form.component.html
@@ -10,17 +10,17 @@ <h4 class="modal-title" id="myApollonDiagramLabel" jhiTranslate="artemisApp.apol
         <div class="form-group-narrow">
             <label class="form-control-label" jhiTranslate="artemisApp.modelingExercise.diagramType" for="field_diagramType"></label>
             <select class="form-select" name="diagramType" [(ngModel)]="apollonDiagram.diagramType" id="field_diagramType">
-                <option value="ClassDiagram">{{ 'artemisApp.DiagramType.ClassDiagram' | artemisTranslate }}</option>
-                <option value="ActivityDiagram">{{ 'artemisApp.DiagramType.ActivityDiagram' | artemisTranslate }}</option>
-                <option value="ObjectDiagram">{{ 'artemisApp.DiagramType.ObjectDiagram' | artemisTranslate }}</option>
-                <option value="UseCaseDiagram">{{ 'artemisApp.DiagramType.UseCaseDiagram' | artemisTranslate }}</option>
-                <option value="CommunicationDiagram">{{ 'artemisApp.DiagramType.CommunicationDiagram' | artemisTranslate }}</option>
-                <option value="ComponentDiagram">{{ 'artemisApp.DiagramType.ComponentDiagram' | artemisTranslate }}</option>
-                <option value="DeploymentDiagram">{{ 'artemisApp.DiagramType.DeploymentDiagram' | artemisTranslate }}</option>
-                <option value="PetriNet">{{ 'artemisApp.DiagramType.PetriNet' | artemisTranslate }}</option>
-                <option value="SyntaxTree">{{ 'artemisApp.DiagramType.SyntaxTree' | artemisTranslate }}</option>
-                <option value="Flowchart">{{ 'artemisApp.DiagramType.Flowchart' | artemisTranslate }}</option>
-                <option value="BPMN">{{ 'artemisApp.DiagramType.BPMN' | artemisTranslate }}</option>
+                <option value="ClassDiagram" jhiTranslate="artemisApp.DiagramType.ClassDiagram"></option>
+                <option value="ActivityDiagram" jhiTranslate="artemisApp.DiagramType.ActivityDiagram"></option>
+                <option value="ObjectDiagram" jhiTranslate="artemisApp.DiagramType.ObjectDiagram"></option>
+                <option value="UseCaseDiagram" jhiTranslate="artemisApp.DiagramType.UseCaseDiagram"></option>
+                <option value="CommunicationDiagram" jhiTranslate="artemisApp.DiagramType.CommunicationDiagram"></option>
+                <option value="ComponentDiagram" jhiTranslate="artemisApp.DiagramType.ComponentDiagram"></option>
+                <option value="DeploymentDiagram" jhiTranslate="artemisApp.DiagramType.DeploymentDiagram"></option>
+                <option value="PetriNet" jhiTranslate="artemisApp.DiagramType.PetriNet"></option>
+                <option value="SyntaxTree" jhiTranslate="artemisApp.DiagramType.SyntaxTree"></option>
+                <option value="Flowchart" jhiTranslate="artemisApp.DiagramType.Flowchart"></option>
+                <option value="BPMN" jhiTranslate="artemisApp.DiagramType.BPMN"></option>
             </select>
         </div>
     </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-detail.component.html b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-detail.component.html
index 2eba8db14941..65b59b45c255 100644
--- a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-detail.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-detail.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <h4 class="modal-title">{{ 'artemisApp.apollonDiagram.detail.title' | artemisTranslate: { title: this.apollonDiagram?.title } }}</h4>
+    <h4 class="modal-title" jhiTranslate="artemisApp.apollonDiagram.detail.title" [translateValues]="{ title: this.apollonDiagram?.title }"></h4>
     <button type="button" class="btn ms-auto text-secondary" (click)="confirmExitDetailView(true)"><fa-icon [icon]="faX" size="lg" /></button>
 </div>
 <div class="modal-body">
@@ -37,8 +37,13 @@ <h4 class="modal-title">{{ 'artemisApp.apollonDiagram.detail.title' | artemisTra
         jhiTranslate="artemisApp.apollonDiagram.detail.save"
     ></button>
     <div [ngbTooltip]="!hasInteractive ? ('artemisApp.apollonDiagram.create.validationError' | artemisTranslate) : undefined">
-        <button id="generate-quiz-exercise" class="btn btn-primary" (click)="generateExercise()" [hidden]="!apollonDiagram" [disabled]="!hasInteractive">
-            {{ 'artemisApp.apollonDiagram.detail.createLabel' | artemisTranslate }}
-        </button>
+        <button
+            id="generate-quiz-exercise"
+            class="btn btn-primary"
+            (click)="generateExercise()"
+            [hidden]="!apollonDiagram"
+            [disabled]="!hasInteractive"
+            jhiTranslate="artemisApp.apollonDiagram.detail.createLabel"
+        ></button>
     </div>
 </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-list.component.html b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-list.component.html
index d826fca80ac9..328f37d9780a 100644
--- a/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-list.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/apollon-diagrams/apollon-diagram-list.component.html
@@ -1,5 +1,5 @@
 <div class="modal-header">
-    <h4 class="modal-title">{{ 'artemisApp.apollonDiagram.home.title' | artemisTranslate }}</h4>
+    <h4 class="modal-title" jhiTranslate="artemisApp.apollonDiagram.home.title"></h4>
     <button type="button" class="btn ms-auto text-secondary" (click)="handleCloseDiagramClick()"><fa-icon [icon]="faX" size="lg" /></button>
 </div>
 <div class="modal-body">
diff --git a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html
index 183061aefb94..7f09ade80455 100644
--- a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.html
@@ -110,9 +110,9 @@ <h3 class="mb-0"><span class="badge bg-warning align-text-top" style="width: 60p
                 <div class="form-group">
                     <span jhiTranslate="artemisApp.quizQuestion.scoringType" class="colon-suffix no-flex-shrink"></span>
                     <select class="form-select" [(ngModel)]="question.scoringType" (ngModelChange)="questionUpdated.emit()" title="scoring type">
-                        <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                        <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                        <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                        <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                     </select>
                     <jhi-quiz-scoring-info-modal />
                 </div>
@@ -144,9 +144,9 @@ <h3 class="mb-0"><span class="badge bg-warning align-text-top" style="width: 60p
                     <div class="form-group">
                         <span jhiTranslate="artemisApp.quizQuestion.scoringType" class="colon-suffix no-flex-shrink"></span>
                         <select class="form-select" [(ngModel)]="question.scoringType" (ngModelChange)="questionUpdated.emit()" title="scoring type">
-                            <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                            <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                            <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                            <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                            <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                            <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                         </select>
                         <jhi-quiz-scoring-info-modal />
                     </div>
@@ -200,29 +200,28 @@ <h3 class="mb-0"><span class="badge bg-warning align-text-top" style="width: 60p
         <div class="markupEditorArea">
             @if (!reEvaluationInProgress) {
                 <div class="question-content">
-                    <jhi-markdown-editor
+                    <jhi-markdown-editor-monaco
                         #markdownEditor
                         [markdown]="questionEditorText"
                         [showPreviewButton]="false"
-                        [domainCommands]="dragAndDropQuestionDomainCommands"
+                        [domainActions]="dragAndDropDomainActions"
                         (markdownChange)="changesInMarkdown($event)"
-                        (textWithDomainCommandsFound)="domainCommandsFound($event)"
+                        (textWithDomainActionsFound)="domainActionsFound($event)"
                         class="h-auto"
                     />
                 </div>
-            }
-            @if (reEvaluationInProgress) {
+            } @else {
                 <div class="markupEditorArea">
                     <div class="question-content row">
                         <div class="col-10 col-lg-11">
                             <!-- TODO: Fix file upload    -->
-                            <jhi-markdown-editor
+                            <jhi-markdown-editor-monaco
                                 #markdownEditor
                                 [markdown]="questionEditorText"
                                 [showPreviewButton]="false"
-                                [domainCommands]="dragAndDropQuestionDomainCommands"
+                                [domainActions]="dragAndDropDomainActions"
                                 (markdownChange)="changesInMarkdown($event)"
-                                (textWithDomainCommandsFound)="domainCommandsFound($event)"
+                                (textWithDomainActionsFound)="domainActionsFound($event)"
                                 [enableFileUpload]="false"
                                 class="h-auto"
                             />
@@ -459,10 +458,19 @@ <h3 class="mb-0"><span class="badge bg-warning align-text-top" style="width: 60p
                         }
                     </button>
                     <input #dragItemFileInput id="dragItemFileInput{{ questionIndex }}" type="file" accept="image/*" [hidden]="true" (change)="createImageDragItem($event)" />
-                    <button class="btn btn-outline-secondary" id="add-text-drag-item" (click)="addTextDragItem()">
+                    <button class="btn btn-outline-secondary me-2" id="add-text-drag-item" (click)="addTextDragItem()">
                         <fa-icon [icon]="faPlus" />
                         <span jhiTranslate="artemisApp.dragAndDropQuestion.addDragItemText"></span>
                     </button>
+                    <button
+                        class="btn btn-outline-secondary"
+                        id="crop-drag-item"
+                        [ngbTooltip]="'artemisApp.dragAndDropQuestion.cutImagesFromDropLocationTip' | artemisTranslate"
+                        (click)="getImagesFromDropLocations()"
+                    >
+                        <fa-icon [icon]="faScissors" />
+                        <span jhiTranslate="artemisApp.dragAndDropQuestion.cutImagesFromDropLocation"></span>
+                    </button>
                 </div>
             </div>
         }
diff --git a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts
index fde9f929e280..0c3561afc5c9 100644
--- a/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-question-edit.component.ts
@@ -16,14 +16,10 @@ import { DragAndDropQuestionUtil } from 'app/exercises/quiz/shared/drag-and-drop
 import { DragAndDropMouseEvent } from 'app/exercises/quiz/manage/drag-and-drop-question/drag-and-drop-mouse-event.class';
 import { DragState } from 'app/entities/quiz/drag-state.enum';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command';
-import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command';
 import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model';
 import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { DragItem } from 'app/entities/quiz/drag-item.model';
 import { DropLocation } from 'app/entities/quiz/drop-location.model';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
 import { QuizQuestionEdit } from 'app/exercises/quiz/manage/quiz-question-edit.interface';
 import { cloneDeep } from 'lodash-es';
 import { round } from 'app/shared/util/utils';
@@ -43,6 +39,7 @@ import {
     faFont,
     faPencilAlt,
     faPlus,
+    faScissors,
     faTrash,
     faUndo,
     faUnlink,
@@ -52,6 +49,9 @@ import { faFileImage } from '@fortawesome/free-regular-svg-icons';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { MAX_QUIZ_QUESTION_POINTS } from 'app/shared/constants/input.constants';
 import { FileService } from 'app/shared/http/file.service';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 @Component({
     selector: 'jhi-drag-and-drop-question-edit',
@@ -63,7 +63,7 @@ import { FileService } from 'app/shared/http/file.service';
 export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, AfterViewInit, QuizQuestionEdit {
     @ViewChild('clickLayer', { static: false }) private clickLayer: ElementRef;
     @ViewChild('backgroundImage ', { static: false }) private backgroundImage: SecuredImageComponent;
-    @ViewChild('markdownEditor', { static: false }) private markdownEditor: MarkdownEditorComponent;
+    @ViewChild('markdownEditor', { static: false }) private markdownEditor: MarkdownEditorMonacoComponent;
 
     @Input() question: DragAndDropQuestion;
     @Input() questionIndex: number;
@@ -78,14 +78,12 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
     @Output() addNewFile = new EventEmitter<{ fileName: string; path?: string; file: File }>();
     @Output() removeFile = new EventEmitter<string>();
 
-    /** Ace Editor configuration constants **/
     questionEditorText = '';
-
     backupQuestion: DragAndDropQuestion;
     filePreviewPaths: Map<string, string> = new Map<string, string>();
     dropAllowed = false;
     showPreview = false;
-
+    readonly CLICK_LAYER_DIMENSION: number = 200;
     /** Status boolean for collapse status **/
     isQuestionCollapsed = false;
 
@@ -107,11 +105,10 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
      */
     mouse: DragAndDropMouseEvent;
 
-    hintCommand = new HintCommand();
-    explanationCommand = new ExplanationCommand();
+    hintAction = new MonacoQuizHintAction();
+    explanationAction = new MonacoQuizExplanationAction();
 
-    /** {array} with domainCommands that are needed for a drag and drop question **/
-    dragAndDropQuestionDomainCommands: DomainCommand[] = [this.explanationCommand, this.hintCommand];
+    dragAndDropDomainActions = [this.explanationAction, this.hintAction];
 
     // Icons
     faBan = faBan;
@@ -130,6 +127,7 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
     faAngleRight = faAngleRight;
     faAngleDown = faAngleDown;
     faUpload = faUpload;
+    faScissors = faScissors;
 
     readonly MAX_POINTS = MAX_QUIZ_QUESTION_POINTS;
 
@@ -276,16 +274,21 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
     setBackgroundFile(event: any): void {
         const fileList: FileList = event.target.files as FileList;
         if (fileList.length) {
-            if (this.question.backgroundFilePath) {
-                this.removeFile.emit(this.question.backgroundFilePath);
-            }
             const file = fileList[0];
-            const fileName = this.fileService.getUniqueFileName(this.fileService.getExtension(file.name), this.filePool);
-            this.question.backgroundFilePath = fileName;
-            this.filePreviewPaths.set(fileName, URL.createObjectURL(file));
-            this.addNewFile.emit({ fileName, file });
-            this.changeDetector.detectChanges();
+            this.setBackgroundFileFromFile(file);
+        }
+    }
+
+    setBackgroundFileFromFile(file: File) {
+        if (this.question.backgroundFilePath) {
+            this.removeFile.emit(this.question.backgroundFilePath);
         }
+
+        const fileName = this.fileService.getUniqueFileName(this.fileService.getExtension(file.name), this.filePool);
+        this.question.backgroundFilePath = fileName;
+        this.filePreviewPaths.set(fileName, URL.createObjectURL(file));
+        this.addNewFile.emit({ fileName, file });
+        this.changeDetector.detectChanges();
     }
 
     /**
@@ -517,11 +520,15 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
     /**
      * Add a Picture Drag Item with the selected file as its picture to the question
      */
-    createImageDragItem(event: any): void {
+    createImageDragItem(event: any): DragItem | undefined {
         const dragItemFile = this.getFileFromEvent(event);
         if (!dragItemFile) {
-            return;
+            return undefined;
         }
+        return this.createImageDragItemFromFile(dragItemFile);
+    }
+
+    createImageDragItemFromFile(dragItemFile: File): DragItem {
         const fileName = this.fileService.getUniqueFileName(this.fileService.getExtension(dragItemFile.name), this.filePool);
         this.addNewFile.emit({ fileName, file: dragItemFile });
         this.filePreviewPaths.set(fileName, URL.createObjectURL(dragItemFile));
@@ -535,6 +542,7 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
         this.question.dragItems.push(dragItem);
 
         this.questionUpdated.emit();
+        return dragItem;
     }
 
     /**
@@ -838,20 +846,18 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
     }
 
     /**
-     * 1. Gets the {array} containing the text with the domainCommandIdentifier and creates a new drag and drop problem statement
-     * by assigning the text according to the domainCommandIdentifiers to the drag and drop attributes.
-     * (question text, explanation, hint)
-     * @param domainCommands - containing markdownText with the corresponding domainCommand {DomainCommand} identifier
+     * Creates the drag and drop problem statement from the parsed markdown text, assigning the question text, explanation, and hint according to the domain actions found.
+     * @param textWithDomainActions The parsed markdown text with the corresponding domain actions.
      */
-    domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void {
+    domainActionsFound(textWithDomainActions: TextWithDomainAction[]): void {
         this.cleanupQuestion();
-        for (const [text, command] of domainCommands) {
-            if (command === null && text.length > 0) {
+        for (const { text, action } of textWithDomainActions) {
+            if (action === undefined && text.length > 0) {
                 this.question.text = text;
             }
-            if (command instanceof ExplanationCommand) {
+            if (action instanceof MonacoQuizExplanationAction) {
                 this.question.explanation = text;
-            } else if (command instanceof HintCommand) {
+            } else if (action instanceof MonacoQuizHintAction) {
                 this.question.hint = text;
             }
         }
@@ -873,6 +879,121 @@ export class DragAndDropQuestionEditComponent implements OnInit, OnChanges, Afte
      */
     prepareForSave(): void {
         this.cleanupQuestion();
-        this.markdownEditor.parse();
+        this.markdownEditor.parseMarkdown();
+    }
+
+    /**
+     * Create new drag items for each drop location in the background image
+     */
+    getImagesFromDropLocations() {
+        for (const someLocation of this.question.dropLocations!) {
+            // only crop if there is not mapping to this drop location
+            if (this.getMappingsForDropLocation(someLocation).length == 0) {
+                const image = new Image();
+                let dataUrl: string = '';
+                let bgWidth;
+                let bgHeight;
+                image.onload = () => {
+                    bgHeight = image.height;
+                    bgWidth = image.width;
+
+                    const canvas = document.createElement('canvas');
+                    const context = canvas.getContext('2d');
+
+                    if (context) {
+                        // The click layer is 200x200 so it need to be rescaled to the image
+                        const scalarHeight = bgHeight / this.CLICK_LAYER_DIMENSION;
+                        const scalarWidth = bgWidth / this.CLICK_LAYER_DIMENSION;
+                        canvas.width = someLocation.width! * scalarWidth;
+                        canvas.height = someLocation.height! * scalarHeight;
+                        context.drawImage(
+                            image,
+                            someLocation.posX! * scalarWidth,
+                            someLocation.posY! * scalarHeight,
+                            someLocation.width! * scalarWidth,
+                            someLocation.height! * scalarHeight,
+                            0,
+                            0,
+                            someLocation.width! * scalarWidth,
+                            someLocation.height! * scalarHeight,
+                        );
+
+                        dataUrl = canvas.toDataURL('image/png');
+                        const dragItemCreated = this.createImageDragItemFromFile(this.dataUrlToFile(dataUrl, 'placeholder' + someLocation.posX!))!;
+                        const dndMapping = new DragAndDropMapping(dragItemCreated, someLocation);
+                        this.question.correctMappings!.push(dndMapping);
+                    }
+                };
+                image.src = this.backgroundImage.src;
+            }
+        }
+        this.blankOutBackgroundImage();
+    }
+
+    /**
+     * Takes all drop locations and replaces their location with a white rectangle on the background image
+     */
+    blankOutBackgroundImage() {
+        const backgroundBlankingCanvas = document.createElement('canvas');
+        const backgroundBlankingContext = backgroundBlankingCanvas.getContext('2d');
+        const image = new Image();
+        let bgWidth;
+        let bgHeight;
+        image.onload = () => {
+            bgHeight = image.height;
+            bgWidth = image.width;
+
+            backgroundBlankingCanvas.width = bgWidth;
+            backgroundBlankingCanvas.height = bgHeight;
+            if (backgroundBlankingContext) {
+                const scalarHeight = bgHeight / this.CLICK_LAYER_DIMENSION;
+                const scalarWidth = bgWidth / this.CLICK_LAYER_DIMENSION;
+
+                backgroundBlankingContext.drawImage(image, 0, 0);
+                backgroundBlankingContext.fillStyle = 'white';
+
+                for (const someLocation of this.question.dropLocations!) {
+                    // Draw a white rectangle over the specified box location
+                    backgroundBlankingContext.fillRect(
+                        someLocation.posX! * scalarWidth,
+                        someLocation.posY! * scalarHeight,
+                        someLocation.width! * scalarWidth,
+                        someLocation.height! * scalarHeight,
+                    );
+                }
+                const dataUrlCanvas = backgroundBlankingCanvas.toDataURL('image/png');
+                this.setBackgroundFileFromFile(this.dataUrlToFile(dataUrlCanvas, 'background'));
+            }
+        };
+        image.src = this.backgroundImage.src;
+    }
+
+    /**
+     * Turns a data url into a blob
+     * @param dataUrl the data url string for which the file should be created
+     * @returns returns a blob created from the data url
+     */
+    dataUrlToBlob(dataUrl: string): Blob {
+        // Seperate metadata from base64-encoded content
+        const byteString = atob(dataUrl.split(',')[1]);
+        // Isolate the MIME type (e.g "image/png")
+        const mimeString = dataUrl.split(',')[0].split(':')[1].split(';')[0];
+        const ab = new ArrayBuffer(byteString.length);
+        const ia = new Uint8Array(ab);
+        for (let i = 0; i < byteString.length; i++) {
+            ia[i] = byteString.charCodeAt(i);
+        }
+        return new Blob([ab], { type: mimeString });
+    }
+
+    /**
+     * Creates a File object from  a blob given through a dataUrl
+     * @param dataUrl the data url string for which the file should be created
+     * @param fileName the name of the file to be created
+     * @returns returns a new file created from the data url
+     */
+    dataUrlToFile(dataUrl: string, fileName: string): File {
+        const blob = this.dataUrlToBlob(dataUrl);
+        return new File([blob], fileName, { type: blob.type });
     }
 }
diff --git a/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html b/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html
index c653e3747365..e53cf5bda583 100644
--- a/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/match-percentage-info-modal/match-percentage-info-modal.component.html
@@ -1,18 +1,18 @@
 <ng-template #info let-c="close" let-d="dismiss">
     <div class="modal-header">
-        <h4 class="modal-title">{{ 'artemisApp.quizExercise.matchingInfoModalTitle' | artemisTranslate }}</h4>
+        <h4 class="modal-title" jhiTranslate="artemisApp.quizExercise.matchingInfoModalTitle"></h4>
         <button type="button" class="btn-close" aria-label="Close" (click)="d()"></button>
     </div>
     <div class="modal-body">
         <table class="table">
             <tr>
-                <th>{{ 'artemisApp.quizExercise.matchLetterCase.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.quizExercise.matchLetterCase.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.quizExercise.matchLetterCase.title"></th>
+                <td jhiTranslate="artemisApp.quizExercise.matchLetterCase.explanation"></td>
             </tr>
 
             <tr>
-                <th>{{ 'artemisApp.quizExercise.matchPercentage.explanationTitle' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.quizExercise.matchPercentage.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.quizExercise.matchPercentage.explanationTitle"></th>
+                <td jhiTranslate="artemisApp.quizExercise.matchPercentage.explanation"></td>
             </tr>
         </table>
     </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html
index de7ab74f204c..84d72e6ee23b 100644
--- a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.html
@@ -47,9 +47,9 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
                     [disabled]="question.singleChoice ?? false"
                     title="scoring type"
                 >
-                    <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                    <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                    <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                    <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                    <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                    <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                 </select>
                 <jhi-quiz-scoring-info-modal />
             </div>
@@ -94,19 +94,20 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
         </div>
         <div class="markupEditorArea">
             <div class="question-content">
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     #markdownEditor
                     [markdown]="questionEditorText"
                     [showPreviewButton]="true"
-                    [showVisualModeButton]="true"
-                    [domainCommands]="commandMultipleChoiceQuestions"
+                    [showVisualButton]="true"
+                    [domainActions]="multipleChoiceActions"
                     (markdownChange)="changesInMarkdown()"
-                    (textWithDomainCommandsFound)="domainCommandsFound($event)"
+                    (textWithDomainActionsFound)="domainActionsFound($event)"
+                    (onLeaveVisualTab)="onLeaveVisualTab()"
                     [showDefaultPreview]="false"
                     class="h-auto"
                 >
                     <!-- Preview -->
-                    <ng-container id="preview">
+                    <ng-container id="previewMonaco">
                         @if (showMultipleChoiceQuestionPreview) {
                             <jhi-multiple-choice-question [question]="question" [selectedAnswerOptions]="[]" [questionIndex]="questionIndex" />
                         }
@@ -114,13 +115,13 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
                     </ng-container>
                     <!-- End of Preview-->
                     <!-- Visual -->
-                    <ng-container id="visual" #visual>
+                    <ng-container id="visual">
                         @if (showMultipleChoiceQuestionVisual) {
-                            <jhi-multiple-choice-visual-question [question]="question" (questionChanged)="changesInVisualMode()" />
+                            <jhi-multiple-choice-visual-question #visual [question]="question" (questionChanged)="changesInVisualMode()" />
                         }
                     </ng-container>
                     <!-- End of Visual -->
-                </jhi-markdown-editor>
+                </jhi-markdown-editor-monaco>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts
index 48fdeb5a2c09..be36aaedd0e7 100644
--- a/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component.ts
@@ -1,29 +1,33 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
+import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command';
-import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command';
-import { IncorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/incorrectOptionCommand';
 import { AnswerOption } from 'app/entities/quiz/answer-option.model';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model';
-import { CorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/correctOptionCommand';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
 import { QuizQuestionEdit } from 'app/exercises/quiz/manage/quiz-question-edit.interface';
 import { generateExerciseHintExplanation } from 'app/shared/util/markdown.util';
 import { faAngleDown, faAngleRight, faQuestionCircle, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { ScoringType } from 'app/entities/quiz/quiz-question.model';
 import { MAX_QUIZ_QUESTION_POINTS } from 'app/shared/constants/input.constants';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
+import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action';
+import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { MultipleChoiceVisualQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component';
 
 @Component({
     selector: 'jhi-multiple-choice-question-edit',
     templateUrl: './multiple-choice-question-edit.component.html',
     styleUrls: ['../quiz-exercise.scss', '../../shared/quiz.scss'],
     encapsulation: ViewEncapsulation.None,
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestionEdit {
     @ViewChild('markdownEditor', { static: false })
-    private markdownEditor: MarkdownEditorComponent;
+    private markdownEditor: MarkdownEditorMonacoComponent;
+
+    @ViewChild('visual', { static: false })
+    visualChild: MultipleChoiceVisualQuestionComponent;
 
     @Input()
     question: MultipleChoiceQuestion;
@@ -35,26 +39,22 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion
     @Output()
     questionDeleted = new EventEmitter();
 
-    /** Ace Editor configuration constants **/
     questionEditorText = '';
-
-    /** Status boolean for collapse status **/
     isQuestionCollapsed: boolean;
 
     /** Set default preview of the markdown editor as preview for the multiple choice question **/
     get showPreview(): boolean {
-        return this.markdownEditor && this.markdownEditor.previewMode;
+        return this.markdownEditor && this.markdownEditor.inPreviewMode;
     }
     showMultipleChoiceQuestionPreview = true;
     showMultipleChoiceQuestionVisual = true;
 
-    hintCommand = new HintCommand();
-    correctCommand = new CorrectOptionCommand();
-    incorrectCommand = new IncorrectOptionCommand();
-    explanationCommand = new ExplanationCommand();
+    correctAction = new MonacoCorrectMultipleChoiceAnswerAction();
+    wrongAction = new MonacoWrongMultipleChoiceAnswerAction();
+    explanationAction = new MonacoQuizExplanationAction();
+    hintAction = new MonacoQuizHintAction();
 
-    /** DomainCommands for the multiple choice question **/
-    commandMultipleChoiceQuestions: DomainCommand[] = [this.correctCommand, this.incorrectCommand, this.explanationCommand, this.hintCommand];
+    multipleChoiceActions = [this.correctAction, this.wrongAction, this.explanationAction, this.hintAction];
 
     // Icons
     faTrash = faTrash;
@@ -131,12 +131,13 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion
      * to get the newest values in the editor to update the question attributes
      */
     prepareForSave(): void {
-        if (this.markdownEditor.visualMode) {
-            this.markdownEditor.markdown = this.markdownEditor.visualChild.parseQuestion();
-        }
-
         this.cleanupQuestion();
-        this.markdownEditor.parse();
+        this.markdownEditor.parseMarkdown();
+    }
+
+    onLeaveVisualTab(): void {
+        this.markdownEditor.markdown = this.visualChild.parseQuestion();
+        this.prepareForSave();
     }
 
     /**
@@ -153,34 +154,34 @@ export class MultipleChoiceQuestionEditComponent implements OnInit, QuizQuestion
     }
 
     /**
-     * 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers a
+     * 1. Gets a tuple of text and domain action identifiers and assigns text values according to the domain actions a
      *    multiple choice question the to the multiple choice question attributes.
      *   (question text, explanation, hint, answerOption (correct/wrong)
-     * 2. The tuple order is the same as the order of the commands in the markdown text inserted by the user
+     * 2. The tuple order is the same as the order of the actions in the markdown text inserted by the user
      * 3. resetMultipleChoicePreview() is triggered to notify the parent component
      *    about the changes within the question and to cacheValidation() since the assigned values have changed
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void {
+    domainActionsFound(textWithDomainActions: TextWithDomainAction[]): void {
         this.cleanupQuestion();
         let currentAnswerOption;
 
-        for (const [text, command] of domainCommands) {
-            if (command === null && text.length > 0) {
+        for (const { text, action } of textWithDomainActions) {
+            if (action === undefined && text.length > 0) {
                 this.question.text = text;
             }
-            if (command instanceof CorrectOptionCommand || command instanceof IncorrectOptionCommand) {
+            if (action instanceof MonacoCorrectMultipleChoiceAnswerAction || action instanceof MonacoWrongMultipleChoiceAnswerAction) {
                 currentAnswerOption = new AnswerOption();
-                currentAnswerOption.isCorrect = command instanceof CorrectOptionCommand;
+                currentAnswerOption.isCorrect = action instanceof MonacoCorrectMultipleChoiceAnswerAction;
                 currentAnswerOption.text = text;
                 this.question.answerOptions!.push(currentAnswerOption);
-            } else if (command instanceof ExplanationCommand) {
+            } else if (action instanceof MonacoQuizExplanationAction) {
                 if (currentAnswerOption) {
                     currentAnswerOption.explanation = text;
                 } else {
                     this.question.explanation = text;
                 }
-            } else if (command instanceof HintCommand) {
+            } else if (action instanceof MonacoQuizHintAction) {
                 if (currentAnswerOption) {
                     currentAnswerOption.hint = text;
                 } else {
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.html b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.html
index 01efeed3e88b..5548d546d1b7 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.html
@@ -112,9 +112,9 @@ <h4>
                                 <label for="quizMode" jhiTranslate="artemisApp.quizExercise.quizMode.title" class="colon-suffix no-flex-shrink"></label>
                                 <jhi-help-icon text="artemisApp.quizExercise.quizMode.explanation" />
                                 <select id="quizMode" class="form-select" [(ngModel)]="quizExercise.quizMode" (ngModelChange)="cacheValidation()">
-                                    <option [value]="QuizMode.SYNCHRONIZED">{{ 'artemisApp.quizExercise.quizMode.synchronized' | artemisTranslate }}</option>
-                                    <option [value]="QuizMode.BATCHED">{{ 'artemisApp.quizExercise.quizMode.batched' | artemisTranslate }}</option>
-                                    <option [value]="QuizMode.INDIVIDUAL">{{ 'artemisApp.quizExercise.quizMode.individual' | artemisTranslate }}</option>
+                                    <option [value]="QuizMode.SYNCHRONIZED" jhiTranslate="artemisApp.quizExercise.quizMode.synchronized"></option>
+                                    <option [value]="QuizMode.BATCHED" jhiTranslate="artemisApp.quizExercise.quizMode.batched"></option>
+                                    <option [value]="QuizMode.INDIVIDUAL" jhiTranslate="artemisApp.quizExercise.quizMode.individual"></option>
                                 </select>
                                 <ng-container>
                                     <!-- releaseDate works similar to Exam.visibleDate -->
@@ -140,7 +140,7 @@ <h4>
                                         [(ngModel)]="quizExercise.dueDate"
                                     />
                                     @if (quizExercise.dueDateError) {
-                                        <span class="invalid-feedback">{{ 'artemisApp.quizExercise.dueDateError' | artemisTranslate }}</span>
+                                        <span class="invalid-feedback" jhiTranslate="artemisApp.quizExercise.dueDateError"></span>
                                     }
                                 }
                                 @if (quizExercise.quizMode === QuizMode.SYNCHRONIZED) {
@@ -199,9 +199,7 @@ <h4>
                 <div class="row">
                     <div class="col">
                         <div class="form-group">
-                            <label class="form-control-label">{{
-                                'artemisApp.exercise.includedInOverallScore' + (quizExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate
-                            }}</label>
+                            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ quizExercise.course ? 'Course' : 'Exam' }}Label"></label>
                             <div>
                                 @if (quizExercise.includedInOverallScore) {
                                     <jhi-included-in-overall-score-picker
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts
index a1cc56e466c1..b6fda2b6e1ee 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-update.component.ts
@@ -19,7 +19,7 @@ import { Course } from 'app/entities/course.model';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { cloneDeep } from 'lodash-es';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
 
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise.component.html b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise.component.html
index 097f8d74b05a..f016eb439967 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise.component.html
@@ -19,7 +19,7 @@
                     <th jhiSortBy="duration"><span jhiTranslate="artemisApp.quizExercise.duration"></span>&nbsp;<fa-icon [icon]="faSort" /></th>
                     <th jhiSortBy="maxPoints"><span jhiTranslate="artemisApp.exercise.points"></span>&nbsp;<fa-icon [icon]="faSort" /></th>
                     <th jhiSortBy="includedInOverallScore"><span jhiTranslate="artemisApp.exercise.includedCompletely"></span>&nbsp;<fa-icon [icon]="faSort" /></th>
-                    <th>{{ 'artemisApp.quizExercise.quizLifecycle' | artemisTranslate }}</th>
+                    <th jhiTranslate="artemisApp.quizExercise.quizLifecycle"></th>
                     <th class="d-md-table-cell"><span jhiTranslate="artemisApp.exercise.categories"></span></th>
                     <th></th>
                 </tr>
@@ -47,19 +47,19 @@
                         }
                         <td>
                             @if (quizExercise.status === QuizStatus.CLOSED) {
-                                <span>{{ 'artemisApp.quizExercise.quizStatus.closed' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.quizExercise.quizStatus.closed"></span>
                             }
                             @if (quizExercise.status === QuizStatus.INVISIBLE) {
-                                <span>{{ 'artemisApp.quizExercise.quizStatus.invisible' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.quizExercise.quizStatus.invisible"></span>
                             }
                             @if (quizExercise.status === QuizStatus.VISIBLE) {
-                                <span>{{ 'artemisApp.quizExercise.quizStatus.visible' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.quizExercise.quizStatus.visible"></span>
                             }
                             @if (quizExercise.status === QuizStatus.ACTIVE) {
-                                <span>{{ 'artemisApp.quizExercise.quizStatus.active' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.quizExercise.quizStatus.active"></span>
                             }
                             @if (quizExercise.status === QuizStatus.OPEN_FOR_PRACTICE) {
-                                <span>{{ 'artemisApp.quizExercise.quizStatus.openForPractice' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.quizExercise.quizStatus.openForPractice"></span>
                             }
                         </td>
                         <td>{{ quizExercise.releaseDate ? (quizExercise.releaseDate | artemisDate: 'long' : true) : '-' }}</td>
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-management.module.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-management.module.ts
index 2140ad695252..829eae9fbb76 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-management.module.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-management.module.ts
@@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
 import { MultipleChoiceQuestionEditComponent } from './multiple-choice-question/multiple-choice-question-edit.component';
 import { DragAndDropQuestionEditComponent } from './drag-and-drop-question/drag-and-drop-question-edit.component';
 import { ShortAnswerQuestionEditComponent } from './short-answer-question/short-answer-question-edit.component';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 import { QuizScoringInfoModalComponent } from './quiz-scoring-info-modal/quiz-scoring-info-modal.component';
@@ -50,7 +49,6 @@ const ENTITY_STATES = [...quizManagementRoute];
         ArtemisSharedModule,
         RouterModule.forChild(ENTITY_STATES),
         DragDropModule,
-        AceEditorModule,
         FormDateTimePickerModule,
         ArtemisQuizQuestionTypesModule,
         ArtemisMarkdownEditorModule,
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts
index 7714b90a5841..ea04a7e2fe7f 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-pool.component.ts
@@ -15,7 +15,7 @@ import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-qu
 import { onError } from 'app/shared/util/global.utils';
 import { computeQuizQuestionInvalidReason, isQuizQuestionValid } from 'app/exercises/quiz/shared/quiz-manage-util.service';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts
index a361064be33f..7dc2df7ed5d3 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-question-list-edit-existing.component.ts
@@ -9,7 +9,7 @@ import { Course } from 'app/entities/course.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service';
 import { AlertService } from 'app/core/util/alert.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-scoring-info-modal/quiz-scoring-info-modal.component.html b/src/main/webapp/app/exercises/quiz/manage/quiz-scoring-info-modal/quiz-scoring-info-modal.component.html
index 345fec5d5378..dcc2030e4f34 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-scoring-info-modal/quiz-scoring-info-modal.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-scoring-info-modal/quiz-scoring-info-modal.component.html
@@ -1,23 +1,23 @@
 <ng-template #info let-c="close" let-d="dismiss">
     <div class="modal-header">
-        <h4 class="modal-title">{{ 'artemisApp.quizExercise.scoringTypeExplanation.title' | artemisTranslate }}</h4>
+        <h4 class="modal-title" jhiTranslate="artemisApp.quizExercise.scoringTypeExplanation.title"></h4>
         <button type="button" class="btn-close" aria-label="Close" (click)="d()"></button>
     </div>
     <div class="modal-body">
         <table class="table">
             <tr>
-                <th>{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.quizExercise.scoringTypeExplanation.all_or_nothing' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></th>
+                <td jhiTranslate="artemisApp.quizExercise.scoringTypeExplanation.all_or_nothing"></td>
             </tr>
 
             <tr>
-                <th>{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.quizExercise.scoringTypeExplanation.proportional_with_penalty' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></th>
+                <td jhiTranslate="artemisApp.quizExercise.scoringTypeExplanation.proportional_with_penalty"></td>
             </tr>
 
             <tr>
-                <th>{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.quizExercise.scoringTypeExplanation.proportional_without_penalty' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></th>
+                <td jhiTranslate="artemisApp.quizExercise.scoringTypeExplanation.proportional_without_penalty"></td>
             </tr>
         </table>
     </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.html b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.html
index 29f375533509..aacbf1d246b1 100644
--- a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.html
@@ -1,3 +1,4 @@
+<!-- TODO for a follow-up: This template relies on method calls to ensure the drag/drop of answer options works. We should avoid this for performance reasons -->
 <div class="edit-mc-question">
     <div class="card-header">
         <div class="row">
@@ -79,9 +80,9 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
                 <div class="form-group">
                     <span jhiTranslate="artemisApp.quizQuestion.scoringType" class="colon-suffix no-flex-shrink"></span>
                     <select class="form-select" [(ngModel)]="question.scoringType" title="scoring type">
-                        <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                        <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                        <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                        <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                     </select>
                 </div>
             </div>
@@ -135,17 +136,17 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
                 <div class="row">
                     <div class="col-10 col-lg-11">
                         <!-- TODO: Fix file upload    -->
-                        <jhi-markdown-editor
-                            [markdown]="getQuestionText(question)"
-                            [editorMode]="editorMode"
-                            [metaCommands]="[]"
-                            [defaultCommands]="[]"
-                            [headerCommands]="[]"
-                            [domainCommands]="[]"
-                            [colorCommands]="[]"
+                        <jhi-markdown-editor-monaco
+                            [markdown]="questionText"
+                            [metaActions]="[]"
+                            [defaultActions]="[]"
+                            [headerActions]="undefined"
+                            [domainActions]="[]"
+                            [colorAction]="undefined"
                             [showEditButton]="false"
                             [showPreviewButton]="false"
                             (markdownChange)="onQuestionChange($event)"
+                            (onBlurEditor)="questionText = getQuestionText(question)"
                             [enableFileUpload]="false"
                             class="editor col"
                             style="width: 90%"
@@ -177,18 +178,18 @@ <h3 class="mb-0"><span class="badge bg-info align-text-top">MC</span></h3>
                         </div>
                         <div class="col-9 col-lg-7 option-text">
                             <!-- TODO: Fix file upload -->
-                            <jhi-markdown-editor
+                            <jhi-markdown-editor-monaco
                                 [markdown]="markdownMap.get(answer.id!)"
-                                [editorMode]="editorMode"
-                                [metaCommands]="[]"
-                                [defaultCommands]="[]"
-                                [headerCommands]="[]"
-                                [domainCommands]="[]"
-                                [colorCommands]="[]"
+                                [metaActions]="[]"
+                                [defaultActions]="[]"
+                                [headerActions]="undefined"
+                                [domainActions]="[]"
+                                [colorAction]="undefined"
                                 [showEditButton]="false"
                                 [showPreviewButton]="false"
                                 (markdownChange)="onAnswerOptionChange($event, answer)"
                                 [enableFileUpload]="false"
+                                [enableResize]="false"
                                 class="editor"
                                 style="width: 65%"
                             />
diff --git a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.ts b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.ts
index 39489c556064..142869ee1ce8 100644
--- a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component.ts
@@ -1,14 +1,13 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { AnswerOption } from 'app/entities/quiz/answer-option.model';
 import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model';
-import { CorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/correctOptionCommand';
-import { IncorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/incorrectOptionCommand';
 import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
 import { cloneDeep } from 'lodash-es';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
 import { generateExerciseHintExplanation, parseExerciseHintExplanation } from 'app/shared/util/markdown.util';
 import { faAngleDown, faAngleRight, faArrowsAltV, faChevronDown, faChevronUp, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action';
+import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action';
 
 @Component({
     selector: 'jhi-re-evaluate-multiple-choice-question',
@@ -24,8 +23,8 @@ export class ReEvaluateMultipleChoiceQuestionComponent implements OnInit {
     @Output() questionMoveUp = new EventEmitter<object>();
     @Output() questionMoveDown = new EventEmitter<object>();
 
-    editorMode = EditorMode.NONE;
     markdownMap: Map<number, string>;
+    questionText: string;
 
     // Create Backup Question for resets
     @Input() backupQuestion: MultipleChoiceQuestion;
@@ -46,9 +45,12 @@ export class ReEvaluateMultipleChoiceQuestionComponent implements OnInit {
         for (const answer of this.question.answerOptions!) {
             this.markdownMap.set(
                 answer.id!,
-                (answer.isCorrect ? CorrectOptionCommand.IDENTIFIER : IncorrectOptionCommand.IDENTIFIER) + ' ' + generateExerciseHintExplanation(answer),
+                (answer.isCorrect ? MonacoCorrectMultipleChoiceAnswerAction.IDENTIFIER : MonacoWrongMultipleChoiceAnswerAction.IDENTIFIER) +
+                    ' ' +
+                    generateExerciseHintExplanation(answer),
             );
         }
+        this.questionText = this.getQuestionText(this.question);
     }
 
     /**
@@ -102,9 +104,9 @@ export class ReEvaluateMultipleChoiceQuestionComponent implements OnInit {
         const startOfThisPart = text.indexOf(answerOptionText);
         const box = text.substring(0, startOfThisPart);
         // Check if box says this answer option is correct or not
-        if (box === CorrectOptionCommand.IDENTIFIER) {
+        if (box === MonacoCorrectMultipleChoiceAnswerAction.IDENTIFIER) {
             answer.isCorrect = true;
-        } else if (box === IncorrectOptionCommand.IDENTIFIER) {
+        } else if (box === MonacoWrongMultipleChoiceAnswerAction.IDENTIFIER) {
             answer.isCorrect = false;
         } else {
             answer.isCorrect = undefined;
@@ -117,7 +119,10 @@ export class ReEvaluateMultipleChoiceQuestionComponent implements OnInit {
      * @param text
      */
     private static splitByCorrectIncorrectTag(text: string): string[] {
-        const stringForSplit = escapeStringForUseInRegex(`${CorrectOptionCommand.IDENTIFIER}`) + '|' + escapeStringForUseInRegex(`${IncorrectOptionCommand.IDENTIFIER}`);
+        const stringForSplit =
+            escapeStringForUseInRegex(`${MonacoCorrectMultipleChoiceAnswerAction.IDENTIFIER}`) +
+            '|' +
+            escapeStringForUseInRegex(`${MonacoWrongMultipleChoiceAnswerAction.IDENTIFIER}`);
         const splitRegExp = new RegExp(stringForSplit, 'g');
         return text.split(splitRegExp);
     }
diff --git a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/quiz-re-evaluate.component.html b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/quiz-re-evaluate.component.html
index da535def7274..beda166c1e83 100644
--- a/src/main/webapp/app/exercises/quiz/manage/re-evaluate/quiz-re-evaluate.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/re-evaluate/quiz-re-evaluate.component.html
@@ -69,9 +69,7 @@ <h5>
                     </div>
                     <div class="col-12 col-lg-5">
                         <div class="row form-group">
-                            <label class="form-control-label">{{
-                                'artemisApp.exercise.includedInOverallScore' + (quizExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate
-                            }}</label>
+                            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ quizExercise.course ? 'Course' : 'Exam' }}Label"></label>
                             <div>
                                 @if (quizExercise.includedInOverallScore) {
                                     <jhi-included-in-overall-score-picker
diff --git a/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.html b/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.html
index 8372aea83c43..481e9a768333 100644
--- a/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.html
@@ -118,14 +118,14 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                 <div class="form-group">
                     <span jhiTranslate="artemisApp.quizQuestion.scoringType" class="colon-suffix no-flex-shrink"></span>
                     <select class="form-select" [(ngModel)]="shortAnswerQuestion.scoringType" (ngModelChange)="questionUpdated.emit()" title="scoring type">
-                        <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                        <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                        <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                        <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                        <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                     </select>
                     <jhi-quiz-scoring-info-modal />
                 </div>
                 <div class="form-group match-percentage-container">
-                    <span class="colon-suffix no-flex-shrink">{{ 'artemisApp.quizExercise.answerMatching.title' | artemisTranslate }}</span>
+                    <span class="colon-suffix no-flex-shrink" jhiTranslate="artemisApp.quizExercise.answerMatching.title"></span>
                     <div class="slider-container">
                         <div class="slider-with-label">
                             <input
@@ -152,9 +152,11 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                             [checked]="shortAnswerQuestion.similarityValue === 100"
                             (change)="toggleExactMatchCheckbox(inputElement.checked)"
                         />
-                        <label class="form-check-label custom-control-label" for="{{ 'cbMatchAnswersExactly' + questionIndex }}">{{
-                            'artemisApp.quizExercise.matchPercentage.title' | artemisTranslate
-                        }}</label>
+                        <label
+                            class="form-check-label custom-control-label"
+                            for="{{ 'cbMatchAnswersExactly' + questionIndex }}"
+                            jhiTranslate="artemisApp.quizExercise.matchPercentage.title"
+                        ></label>
                     </div>
                     <div class="form-group form-check custom-control custom-checkbox">
                         <input
@@ -164,9 +166,11 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                             [(ngModel)]="shortAnswerQuestion.matchLetterCase"
                             (ngModelChange)="questionUpdated.emit()"
                         />
-                        <label class="form-check-label custom-control-label" for="{{ 'cbMatchLetterCase' + questionIndex }}">{{
-                            'artemisApp.quizExercise.matchLetterCase.title' | artemisTranslate
-                        }}</label>
+                        <label
+                            class="form-check-label custom-control-label"
+                            for="{{ 'cbMatchLetterCase' + questionIndex }}"
+                            jhiTranslate="artemisApp.quizExercise.matchLetterCase.title"
+                        ></label>
                     </div>
                 </div>
                 @if (!reEvaluationInProgress) {
@@ -184,9 +188,9 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                     <div class="form-group">
                         <span jhiTranslate="artemisApp.quizQuestion.scoringType" class="colon-suffix no-flex-shrink"></span>
                         <select class="form-select" [(ngModel)]="shortAnswerQuestion.scoringType" (ngModelChange)="questionUpdated.emit()" title="scoring type">
-                            <option value="ALL_OR_NOTHING">{{ 'artemisApp.quizExercise.scoringType.all_or_nothing' | artemisTranslate }}</option>
-                            <option value="PROPORTIONAL_WITH_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_with_penalty' | artemisTranslate }}</option>
-                            <option value="PROPORTIONAL_WITHOUT_PENALTY">{{ 'artemisApp.quizExercise.scoringType.proportional_without_penalty' | artemisTranslate }}</option>
+                            <option value="ALL_OR_NOTHING" jhiTranslate="artemisApp.quizExercise.scoringType.all_or_nothing"></option>
+                            <option value="PROPORTIONAL_WITH_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_with_penalty"></option>
+                            <option value="PROPORTIONAL_WITHOUT_PENALTY" jhiTranslate="artemisApp.quizExercise.scoringType.proportional_without_penalty"></option>
                         </select>
                         <jhi-quiz-scoring-info-modal />
                     </div>
@@ -221,7 +225,7 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                 <div class="col-12 row align-items-center justify-content-center justify-content-lg-start">
                     <div class="col-lg-6 row">
                         <div class="col-12 col-lg-4 form-group mt-1">
-                            <span class="colon-suffix no-flex-shrink">{{ 'artemisApp.quizExercise.answerMatching.title' | artemisTranslate }}</span>
+                            <span class="colon-suffix no-flex-shrink" jhiTranslate="artemisApp.quizExercise.answerMatching.title"></span>
                         </div>
                         <div class="col-12 col-lg-7">
                             <div class="slider-container">
@@ -254,9 +258,11 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                                 [checked]="shortAnswerQuestion.similarityValue === 100"
                                 (change)="toggleExactMatchCheckbox(inputElement.checked)"
                             />
-                            <label class="form-check-label custom-control-label" for="{{ 'cbMatchAnswersExactly' + questionIndex }}">{{
-                                'artemisApp.quizExercise.matchPercentage.title' | artemisTranslate
-                            }}</label>
+                            <label
+                                class="form-check-label custom-control-label"
+                                for="{{ 'cbMatchAnswersExactly' + questionIndex }}"
+                                jhiTranslate="artemisApp.quizExercise.matchPercentage.title"
+                            ></label>
                         </div>
                     </div>
                     <div class="col-12 col-lg-3" style="padding: 0 0.5rem">
@@ -268,9 +274,11 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                                 [(ngModel)]="shortAnswerQuestion.matchLetterCase"
                                 (ngModelChange)="questionUpdated.emit()"
                             />
-                            <label class="form-check-label custom-control-label" for="{{ 'cbMatchLetterCase' + questionIndex }}">{{
-                                'artemisApp.quizExercise.matchLetterCase.title' | artemisTranslate
-                            }}</label>
+                            <label
+                                class="form-check-label custom-control-label"
+                                for="{{ 'cbMatchLetterCase' + questionIndex }}"
+                                jhiTranslate="artemisApp.quizExercise.matchLetterCase.title"
+                            ></label>
                         </div>
                     </div>
                 </div>
@@ -287,6 +295,7 @@ <h3 class="mb-0"><span class="badge bg-success align-text-top" style="width: 60p
                         [defaultActions]="markdownActions"
                         [colorAction]="undefined"
                         [initialEditorHeight]="'external'"
+                        [useDefaultMarkdownEditorOptions]="false"
                         [(markdown)]="questionEditorText"
                         (markdownChange)="onTextChange($event)"
                     />
diff --git a/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.ts b/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.ts
index 538966d0c15f..86264112bb2d 100644
--- a/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/short-answer-question/short-answer-question-edit.component.ts
@@ -25,8 +25,7 @@ import { markdownForHtml } from 'app/shared/util/markdown.conversion.util';
 import { generateExerciseHintExplanation, parseExerciseHintExplanation } from 'app/shared/util/markdown.util';
 import { faAngleDown, faAngleRight, faBan, faBars, faChevronDown, faChevronUp, faTrash, faUndo, faUnlink } from '@fortawesome/free-solid-svg-icons';
 import { MAX_QUIZ_QUESTION_POINTS, MAX_QUIZ_SHORT_ANSWER_TEXT_LENGTH } from 'app/shared/constants/input.constants';
-import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { MonacoBoldAction } from 'app/shared/monaco-editor/model/actions/monaco-bold.action';
 import { MonacoItalicAction } from 'app/shared/monaco-editor/model/actions/monaco-italic.action';
 import { MonacoUnderlineAction } from 'app/shared/monaco-editor/model/actions/monaco-underline.action';
diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html
index 45872ae42fa3..db2299ee644b 100644
--- a/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html
+++ b/src/main/webapp/app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component.html
@@ -5,22 +5,16 @@
     <div [hidden]="loadingState === 'success'">
         @if (loadingState !== 'error') {
             <h2>
-                <span style="color: grey"
-                    ><fa-icon [icon]="faSpinner" animation="spin" />&nbsp;<span>{{ 'artemisApp.quizQuestion.loading' | artemisTranslate }}</span></span
-                >
+                <span style="color: grey"><fa-icon [icon]="faSpinner" animation="spin" />&nbsp;<span jhiTranslate="artemisApp.quizQuestion.loading"></span></span>
             </h2>
         }
         @if (loadingState === 'error') {
             <div>
                 <h2>
-                    <span style="color: grey"
-                        ><fa-icon [icon]="faExclamationCircle" />&nbsp;<span>{{ 'artemisApp.quizQuestion.failed' | artemisTranslate }}</span></span
-                    >
+                    <span style="color: grey"><fa-icon [icon]="faExclamationCircle" />&nbsp;<span jhiTranslate="artemisApp.quizQuestion.failed"></span></span>
                 </h2>
                 <p>
-                    <button class="btn btn-default" (click)="secureImageComponent.retryLoadImage()">
-                        {{ 'artemisApp.quizQuestion.retry' | artemisTranslate }}
-                    </button>
+                    <button class="btn btn-default" (click)="secureImageComponent.retryLoadImage()" jhiTranslate="artemisApp.quizQuestion.retry"></button>
                 </p>
             </div>
         }
@@ -90,14 +84,10 @@ <h4 class="question-title-display">
                 @if (showResult && !forceSampleSolution) {
                     <div>
                         @if (!showingSampleSolution) {
-                            <div class="btn btn-outline-primary" (click)="showSampleSolution()">
-                                {{ 'artemisApp.quizQuestion.showSampleSolution' | artemisTranslate }}
-                            </div>
+                            <div class="btn btn-outline-primary" (click)="showSampleSolution()" jhiTranslate="artemisApp.quizQuestion.showSampleSolution"></div>
                         }
                         @if (showingSampleSolution) {
-                            <div class="btn btn-outline-primary" (click)="hideSampleSolution()">
-                                {{ 'artemisApp.quizQuestion.hideSampleSolution' | artemisTranslate }}
-                            </div>
+                            <div class="btn btn-outline-primary" (click)="hideSampleSolution()" jhiTranslate="artemisApp.quizQuestion.hideSampleSolution"></div>
                         }
                     </div>
                 }
diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html
index 4e8613b42c15..63e6da43a628 100644
--- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html
+++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component.html
@@ -10,10 +10,10 @@ <h4 class="question-title-display">
         <span style="color: red" jhiTranslate="artemisApp.quizQuestion.invalidText"></span>
     }
     @if (!isSingleChoice) {
-        <h6>{{ 'artemisApp.quizQuestion.allOptions' | artemisTranslate }}</h6>
+        <h6 jhiTranslate="artemisApp.quizQuestion.allOptions"></h6>
     }
     @if (isSingleChoice) {
-        <h6>{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}</h6>
+        <h6 jhiTranslate="artemisApp.quizQuestion.singleOption"></h6>
     }
     @if (question.hint || (question.explanation && showResult)) {
         <div class="hint">
@@ -98,13 +98,13 @@ <h6>{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}</h6>
     @if (showResult) {
         <table class="answer-options-result">
             <tr>
-                <th class="content">{{ 'artemisApp.multipleChoiceQuestion.answer' | artemisTranslate }}</th>
-                <th class="solution">{{ 'artemisApp.multipleChoiceQuestion.solution' | artemisTranslate }}</th>
+                <th class="content" jhiTranslate="artemisApp.multipleChoiceQuestion.answer"></th>
+                <th class="solution" jhiTranslate="artemisApp.multipleChoiceQuestion.solution"></th>
                 @if (!forceSampleSolution) {
                     <th class="result-symbol"></th>
                 }
                 @if (!forceSampleSolution) {
-                    <th class="selection">{{ 'artemisApp.multipleChoiceQuestion.you' | artemisTranslate }}</th>
+                    <th class="selection" jhiTranslate="artemisApp.multipleChoiceQuestion.you"></th>
                 }
             </tr>
             @for (answerOption of question.answerOptions; track answerOption; let i = $index) {
@@ -134,10 +134,10 @@ <h6>{{ 'artemisApp.quizQuestion.singleOption' | artemisTranslate }}</h6>
                     </td>
                     <td class="solution">
                         @if (!answerOption.invalid && !question.invalid && answerOption.isCorrect) {
-                            <span id="answer-option-{{ i }}-correct" class="correct">{{ 'artemisApp.multipleChoiceQuestion.correct' | artemisTranslate }}</span>
+                            <span id="answer-option-{{ i }}-correct" class="correct" jhiTranslate="artemisApp.multipleChoiceQuestion.correct"></span>
                         }
                         @if (!answerOption.invalid && !question.invalid && !answerOption.isCorrect) {
-                            <span id="answer-option-{{ i }}-wrong" class="wrong">{{ 'artemisApp.multipleChoiceQuestion.wrong' | artemisTranslate }}</span>
+                            <span id="answer-option-{{ i }}-wrong" class="wrong" jhiTranslate="artemisApp.multipleChoiceQuestion.wrong"></span>
                         }
                         @if (answerOption.invalid || question.invalid) {
                             <span id="answer-option-{{ i }}-invalid" class="wrong" jhiTranslate="artemisApp.quizQuestion.invalid"></span>
diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html
index 941b371f74e0..d22aaa202246 100644
--- a/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html
+++ b/src/main/webapp/app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component.html
@@ -1,5 +1,5 @@
 <div class="markdown-preview visual-mode">
-    <h4>{{ 'artemisApp.multipleChoiceQuestion.visualEditor.questionTitle' | artemisTranslate }}</h4>
+    <h4 jhiTranslate="artemisApp.multipleChoiceQuestion.visualEditor.questionTitle"></h4>
     <textarea
         id="mc-question"
         class="form-control form-group-narrow"
@@ -30,7 +30,7 @@ <h4>{{ 'artemisApp.multipleChoiceQuestion.visualEditor.questionTitle' | artemisT
             placeholder="{{ 'artemisApp.multipleChoiceQuestion.visualEditor.explanationPlaceholder' | artemisTranslate }}"
         />
     </div>
-    <h4>{{ 'artemisApp.multipleChoiceQuestion.visualEditor.answersTitle' | artemisTranslate }}</h4>
+    <h4 jhiTranslate="artemisApp.multipleChoiceQuestion.visualEditor.answersTitle"></h4>
     @for (answerOption of question.answerOptions; track answerOption; let i = $index) {
         <div id="answer-option-{{ i }}" class="visual-answer-option form-group-narrow">
             <div class="form-group-narrow visual-answer-question-container">
diff --git a/src/main/webapp/app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component.html b/src/main/webapp/app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component.html
index ee1c8a7dbaff..e348700edb56 100644
--- a/src/main/webapp/app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component.html
+++ b/src/main/webapp/app/exercises/quiz/shared/questions/short-answer-question/short-answer-question.component.html
@@ -116,14 +116,10 @@ <h4 class="question-title-display">
     @if (showResult && !forceSampleSolution) {
         <div>
             @if (!showingSampleSolution) {
-                <div class="btn btn-outline-primary" (click)="showSampleSolution()">
-                    {{ 'artemisApp.quizQuestion.showSampleSolution' | artemisTranslate }}
-                </div>
+                <div class="btn btn-outline-primary" (click)="showSampleSolution()" jhiTranslate="artemisApp.quizQuestion.showSampleSolution"></div>
             }
             @if (showingSampleSolution) {
-                <div class="btn btn-outline-primary" (click)="hideSampleSolution()">
-                    {{ 'artemisApp.quizQuestion.hideSampleSolution' | artemisTranslate }}
-                </div>
+                <div class="btn btn-outline-primary" (click)="hideSampleSolution()" jhiTranslate="artemisApp.quizQuestion.hideSampleSolution"></div>
             }
         </div>
     }
diff --git a/src/main/webapp/app/exercises/shared/assessment-progress-label/assessment-progress-label.component.html b/src/main/webapp/app/exercises/shared/assessment-progress-label/assessment-progress-label.component.html
index 82cb8923178e..01153454d473 100644
--- a/src/main/webapp/app/exercises/shared/assessment-progress-label/assessment-progress-label.component.html
+++ b/src/main/webapp/app/exercises/shared/assessment-progress-label/assessment-progress-label.component.html
@@ -1,18 +1,16 @@
 <h4>
     @if (submissions && submissions.length === 0) {
-        <small class="text-warning"> {{ 'artemisApp.assessmentDashboard.noSubmissionFound' | artemisTranslate: {} }} </small>
+        <small class="text-warning" jhiTranslate="artemisApp.assessmentDashboard.noSubmissionFound" [translateValues]="{}"></small>
     }
     @if (submissions && submissions.length > 0) {
-        <small [ngClass]="numberAssessedSubmissions === submissions.length ? 'text-success' : 'text-warning'">
-            {{
-                'artemisApp.assessmentDashboard.progressDescription'
-                    | artemisTranslate
-                        : {
-                              percentageAssessed: (numberAssessedSubmissions / submissions.length) * 100 | number: '0.0-0',
-                              numberAssessed: numberAssessedSubmissions,
-                              numberSubmissions: submissions.length,
-                          }
-            }}
-        </small>
+        <small
+            [ngClass]="numberAssessedSubmissions === submissions.length ? 'text-success' : 'text-warning'"
+            jhiTranslate="artemisApp.assessmentDashboard.progressDescription"
+            [translateValues]="{
+                percentageAssessed: (numberAssessedSubmissions / submissions.length) * 100 | number: '0.0-0',
+                numberAssessed: numberAssessedSubmissions,
+                numberSubmissions: submissions.length,
+            }"
+        ></small>
     }
 </h4>
diff --git a/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts b/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts
index f9eefb8f5d7f..c9ea1e512eb3 100644
--- a/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts
+++ b/src/main/webapp/app/exercises/shared/course-exercises/course-exercise.service.ts
@@ -1,9 +1,9 @@
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AccountService } from 'app/core/auth/account.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
index eae89aacb43b..14c1ad054fb1 100644
--- a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
+++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.html
@@ -70,9 +70,7 @@
                         [panelDescriptionHeader]="'artemisApp.exerciseAssessmentDashboard.totalYours' | artemisTranslate"
                     >
                         <div class="row g-0 mb-1">
-                            <div class="col-7">
-                                {{ 'artemisApp.assessmentDashboard.submissions' | artemisTranslate }}
-                            </div>
+                            <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.submissions"></div>
                             <div class="col-5">
                                 <span class="text-success">{{ numberOfSubmissions.inTime }}</span>
                                 @if (numberOfSubmissions.late > 0) {
@@ -88,7 +86,7 @@
 
                         @if (complaintsEnabled) {
                             <div class="row g-0 mb-1">
-                                <div class="col-7">{{ 'artemisApp.assessmentDashboard.complaints' | artemisTranslate }}</div>
+                                <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.complaints"></div>
                                 <div class="col-5">
                                     @if (exercise.isAtLeastInstructor) {
                                         <div>
@@ -115,9 +113,7 @@
 
                         @if (feedbackRequestEnabled) {
                             <div class="row g-0 mb-1">
-                                <div class="col-7">
-                                    {{ 'artemisApp.assessmentDashboard.moreFeedbackRequests' | artemisTranslate }}
-                                </div>
+                                <div class="col-7" jhiTranslate="artemisApp.assessmentDashboard.moreFeedbackRequests"></div>
                                 <div class="col-5">
                                     @if (exercise.isAtLeastInstructor) {
                                         <div>
@@ -147,13 +143,13 @@
                         }
 
                         <div class="row g-0 mb-1">
-                            <div class="col-7">{{ 'artemisApp.exerciseAssessmentDashboard.ratings' | artemisTranslate }}</div>
+                            <div class="col-7" jhiTranslate="artemisApp.exerciseAssessmentDashboard.ratings"></div>
                             <div class="col-5">{{ ratingsDashboardInfo.total }} | {{ ratingsDashboardInfo.tutor }}</div>
                         </div>
                         <div class="row g-0 mb-1">
                             <a [routerLink]="getExerciseDetailsLink()" [queryParams]="" class="btn btn-info btn-sm me-1 mb-3" id="exercise-details">
                                 <fa-icon [icon]="faListAlt" [fixedWidth]="true" />
-                                <span class="d-none d-md-inline">{{ 'artemisApp.exerciseAssessmentDashboard.exerciseDetails' | artemisTranslate }}</span>
+                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.exerciseAssessmentDashboard.exerciseDetails"></span>
                             </a>
                         </div>
                     </jhi-side-panel>
@@ -161,12 +157,12 @@
                     <div class="me-2 d-block float-end">
                         <div>
                             <div class="square bg-success d-inline-block"></div>
-                            <span>{{ 'artemisApp.exerciseAssessmentDashboard.stats.intime' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.stats.intime"></span>
                         </div>
                         @if (numberOfSubmissions.late > 0) {
                             <div>
                                 <div class="square bg-danger d-inline-block"></div>
-                                <span>{{ 'artemisApp.exerciseAssessmentDashboard.stats.late' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.stats.late"></span>
                             </div>
                         }
                     </div>
@@ -213,7 +209,7 @@
 
                 @if (exercise.type === ExerciseType.PROGRAMMING) {
                     <div class="col-12">
-                        <h4>{{ 'artemisApp.exerciseAssessmentDashboard.exampleSolution' | artemisTranslate }}</h4>
+                        <h4 jhiTranslate="artemisApp.exerciseAssessmentDashboard.exampleSolution"></h4>
                         @if (!localVCEnabled) {
                             <a jhiSecureLink [href]="programmingExercise.solutionParticipation?.repositoryUri || ''">
                                 <jhi-button jhiTranslate="artemisApp.exerciseAssessmentDashboard.programmingExercise.exampleSolution" />
@@ -236,7 +232,7 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.exampleSolution' | artemisTransla
 
                 @if (exercise.gradingCriteria && exercise.gradingCriteria.length > 0) {
                     <div class="col-md-6 mt-4">
-                        <h4>{{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' | artemisTranslate }}</h4>
+                        <h4 jhiTranslate="artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions"></h4>
                         <jhi-structured-grading-instructions-assessment-layout [readonly]="true" [criteria]="exercise.gradingCriteria || []" />
                     </div>
                 }
@@ -245,19 +241,15 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' |
 
         @if (tutorParticipationStatus === NOT_PARTICIPATED && !isTestRun) {
             <div class="col-12 text-center mt-2 mb-4">
-                <p>{{ 'artemisApp.exerciseAssessmentDashboard.pleaseContactIfUnclear' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.exerciseAssessmentDashboard.pleaseContactIfUnclear"></p>
 
                 <button id="participate-in-assessment" class="btn btn-primary guided-tour-instructions-button p-1" (click)="readInstruction()" [disabled]="isLoading">
                     @if (exercise.gradingInstructions && exercise.gradingInstructions.length > 0) {
-                        <span>
-                            {{ 'artemisApp.exerciseAssessmentDashboard.readAndUnderstood' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.readAndUnderstood"></span>
                     }
 
                     @if (!exercise.gradingInstructions || exercise.gradingInstructions.length === 0) {
-                        <span>
-                            {{ 'artemisApp.exerciseAssessmentDashboard.startYourParticipation' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.startYourParticipation"></span>
                     }
                 </button>
             </div>
@@ -294,9 +286,7 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' |
                                             (click)="openExampleSubmission(nextExampleSubmissionId, true, false)"
                                         >
                                             @if (stats.toReview.done <= 0) {
-                                                <span>
-                                                    {{ 'artemisApp.exerciseAssessmentDashboard.start' | artemisTranslate }}
-                                                </span>
+                                                <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.start"></span>
                                             } @else {
                                                 {{ 'artemisApp.exerciseAssessmentDashboard.continue' | artemisTranslate }}
                                             }
@@ -339,9 +329,7 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' |
                                             (click)="openExampleSubmission(nextExampleSubmissionId, false, true)"
                                         >
                                             @if (stats.toAssess.done <= 0) {
-                                                <span>
-                                                    {{ 'artemisApp.exerciseAssessmentDashboard.start' | artemisTranslate }}
-                                                </span>
+                                                <span jhiTranslate="artemisApp.exerciseAssessmentDashboard.start"></span>
                                             } @else {
                                                 {{ 'artemisApp.exerciseAssessmentDashboard.continue' | artemisTranslate }}
                                             }
@@ -373,22 +361,20 @@ <h4>{{ 'artemisApp.exerciseAssessmentDashboard.structuredGradingInstructions' |
                         </div>
                     }
                     @if (submissionLockLimitReached && tutorParticipationStatus !== REVIEWED_INSTRUCTIONS) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.submission.lockedSubmissionsLimitReached' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.submission.lockedSubmissionsLimitReached"></div>
                     }
                     @for (roundState of numberOfAssessmentsOfCorrectionRounds; track roundState; let correctionRound = $index) {
                         <div>
                             @if ((tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED) && !isTestRun) {
                                 @if (!isExamMode) {
-                                    <h4 class="d-inline-block">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.studentsSubmissions' | artemisTranslate }}
-                                    </h4>
+                                    <h4 class="d-inline-block" jhiTranslate="artemisApp.exerciseAssessmentDashboard.studentsSubmissions"></h4>
                                 }
                                 @if (isExamMode) {
-                                    <h4 class="d-inline-block">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.studentsSubmissionsExam' | artemisTranslate: { round: correctionRound + 1 } }}
-                                    </h4>
+                                    <h4
+                                        class="d-inline-block"
+                                        jhiTranslate="artemisApp.exerciseAssessmentDashboard.studentsSubmissionsExam"
+                                        [translateValues]="{ round: correctionRound + 1 }"
+                                    ></h4>
                                 }
                                 @if (correctionRound > 0) {
                                     <fa-icon
@@ -400,9 +386,7 @@ <h4 class="d-inline-block">
                             }
                             @if (numberOfCorrectionRoundsEnabled > correctionRound) {
                                 @if (isTestRun) {
-                                    <h4>
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.testRunSubmissions' | artemisTranslate }}
-                                    </h4>
+                                    <h4 jhiTranslate="artemisApp.exerciseAssessmentDashboard.testRunSubmissions"></h4>
                                 }
                                 @if (tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED || isTestRun) {
                                     <div class="table-responsive">
@@ -415,22 +399,25 @@ <h4>
                                                         [(ascending)]="reverseOrders[0]"
                                                         (sortChange)="sortSubmissionRows(correctionRound)"
                                                     >
-                                                        <th>#</th>
+                                                        <th jhiSortBy="id">
+                                                            <a class="th-link">Id</a>
+                                                            <fa-icon [icon]="faSort" />
+                                                        </th>
                                                         <th jhiSortBy="submissionDate">
-                                                            <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }}</a>
+                                                            <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.submissionDate"></a>
                                                             <fa-icon [icon]="faSort" />
                                                         </th>
                                                         <th jhiSortBy="results.correctionRound.score">
-                                                            <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }}</a>
+                                                            <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.result"></a>
                                                             <fa-icon [icon]="faSort" />
                                                         </th>
                                                         @if (exercise.type === ExerciseType.TEXT) {
                                                             <th jhiSortBy="language">
-                                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.language' | artemisTranslate }}</a>
+                                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.language"></a>
                                                                 <fa-icon [icon]="faSort" />
                                                             </th>
                                                         }
-                                                        <th>{{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}</th>
+                                                        <th jhiTranslate="artemisApp.exerciseAssessmentDashboard.action"></th>
                                                     </tr>
                                                 </thead>
                                                 <tbody>
@@ -473,7 +460,7 @@ <h4>
                                                     }
                                                     @for (submission of assessedSubmissionsByRound.get(correctionRound); track submission; let i = $index) {
                                                         <tr>
-                                                            <td>{{ i + 1 }}</td>
+                                                            <td>{{ submission.id }}</td>
                                                             <td>{{ submission.submissionDate | artemisDate }}</td>
                                                             <td>
                                                                 <jhi-result
@@ -536,13 +523,9 @@ <h4>
                                         } @else {
                                             <jhi-assessment-warning [exercise]="exercise" />
                                             @if (!exercise.teamMode) {
-                                                <div class="alert alert-info">
-                                                    {{ 'artemisApp.exerciseAssessmentDashboard.noSubmissions' | artemisTranslate }}
-                                                </div>
+                                                <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.noSubmissions"></div>
                                             } @else {
-                                                <div class="alert alert-warning">
-                                                    {{ 'artemisApp.exerciseAssessmentDashboard.startAssessmentFromTeamPages' | artemisTranslate }}
-                                                </div>
+                                                <div class="alert alert-warning" jhiTranslate="artemisApp.exerciseAssessmentDashboard.startAssessmentFromTeamPages"></div>
                                             }
                                         }
                                         @if (
@@ -570,17 +553,13 @@ <h4>
                                 }
                             }
                             @if (numberOfCorrectionRoundsEnabled <= correctionRound) {
-                                <div class="alert alert-info">
-                                    {{ 'artemisApp.exerciseAssessmentDashboard.correctionRoundNotYetEnabled' | artemisTranslate }}
-                                </div>
+                                <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.correctionRoundNotYetEnabled"></div>
                             }
                         </div>
                     }
                     <!-- Complaints -->
                     @if (tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED || isTestRun) {
-                        <h4 class="d-inline-block">
-                            {{ 'artemisApp.exerciseAssessmentDashboard.complaints' | artemisTranslate }}
-                        </h4>
+                        <h4 class="d-inline-block" jhiTranslate="artemisApp.exerciseAssessmentDashboard.complaints"></h4>
                         <fa-icon class="text-secondary" [icon]="faQuestionCircle" [ngbTooltip]="'artemisApp.exerciseAssessmentDashboard.complaintHint' | artemisTranslate" />
                         <div class="table-responsive">
                             @if (submissionsWithComplaints && submissionsWithComplaints!.length > 0) {
@@ -589,22 +568,22 @@ <h4 class="d-inline-block">
                                         <tr jhiSort [(predicate)]="sortPredicates[1]" [(ascending)]="reverseOrders[1]" (sortChange)="sortComplaintRows()">
                                             <th>#</th>
                                             <th jhiSortBy="complaint.submittedTime">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.submissionDate"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="submission.latestResult.score">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.result"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="responseTime">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.responseTime' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.responseTime"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="complaint.accepted">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.status' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.status"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
-                                            <th>{{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}</th>
+                                            <th jhiTranslate="artemisApp.exerciseAssessmentDashboard.action"></th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -634,19 +613,13 @@ <h4 class="d-inline-block">
                                                 </td>
                                                 <td>
                                                     @if (submissionWithComplaint.complaint.accepted === undefined) {
-                                                        <span class="text-warning">
-                                                            {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }}
-                                                        </span>
+                                                        <span class="text-warning" jhiTranslate="artemisApp.complaint.listOfComplaints.noReply"></span>
                                                     }
                                                     @if (submissionWithComplaint.complaint.accepted === true) {
-                                                        <span class="text-success">
-                                                            {{ 'artemisApp.complaint.listOfComplaints.accepted' | artemisTranslate }}
-                                                        </span>
+                                                        <span class="text-success" jhiTranslate="artemisApp.complaint.listOfComplaints.accepted"></span>
                                                     }
                                                     @if (submissionWithComplaint.complaint.accepted === false) {
-                                                        <span class="text-danger">
-                                                            {{ 'artemisApp.complaint.listOfComplaints.rejected' | artemisTranslate }}
-                                                        </span>
+                                                        <span class="text-danger" jhiTranslate="artemisApp.complaint.listOfComplaints.rejected"></span>
                                                     }
                                                 </td>
                                                 <td>
@@ -690,14 +663,10 @@ <h4 class="d-inline-block">
                                 </table>
                             } @else {
                                 @if (complaintsDashboardInfo.total === 0) {
-                                    <div class="alert alert-info">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.noComplaints' | artemisTranslate }}
-                                    </div>
+                                    <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.noComplaints"></div>
                                 }
                                 @if (complaintsDashboardInfo.total !== 0) {
-                                    <div class="alert alert-info">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.noComplaintsDisplayed' | artemisTranslate }}
-                                    </div>
+                                    <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.noComplaintsDisplayed"></div>
                                 }
                             }
                         </div>
@@ -705,9 +674,7 @@ <h4 class="d-inline-block">
 
                     <!-- More Feedback Requests -->
                     @if ((tutorParticipationStatus === TRAINED || exercise.isAtLeastInstructor || tutorParticipationStatus === COMPLETED) && !isExamMode) {
-                        <h4 class="d-inline-block">
-                            {{ 'artemisApp.exerciseAssessmentDashboard.moreFeedback' | artemisTranslate }}
-                        </h4>
+                        <h4 class="d-inline-block" jhiTranslate="artemisApp.exerciseAssessmentDashboard.moreFeedback"></h4>
                         <fa-icon
                             class="text-secondary"
                             [icon]="faQuestionCircle"
@@ -720,22 +687,22 @@ <h4 class="d-inline-block">
                                         <tr jhiSort [(predicate)]="sortPredicates[2]" [(ascending)]="reverseOrders[2]" (sortChange)="sortMoreFeedbackRows()">
                                             <th>#</th>
                                             <th jhiSortBy="complaint.submittedTime">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.submissionDate' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.submissionDate"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="submission.latestResult.score">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.result' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.result"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="responseTime">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.responseTime' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.responseTime"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
                                             <th jhiSortBy="complaint.accepted">
-                                                <a class="th-link">{{ 'artemisApp.exerciseAssessmentDashboard.status' | artemisTranslate }}</a>
+                                                <a class="th-link" jhiTranslate="artemisApp.exerciseAssessmentDashboard.status"></a>
                                                 <fa-icon [icon]="faSort" />
                                             </th>
-                                            <th>{{ 'artemisApp.exerciseAssessmentDashboard.action' | artemisTranslate }}</th>
+                                            <th jhiTranslate="artemisApp.exerciseAssessmentDashboard.action"></th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -761,14 +728,10 @@ <h4 class="d-inline-block">
                                                 </td>
                                                 <td>
                                                     @if (moreFeedbackRequest.complaint.accepted === undefined) {
-                                                        <span class="text-warning">
-                                                            {{ 'artemisApp.complaint.listOfComplaints.noReply' | artemisTranslate }}
-                                                        </span>
+                                                        <span class="text-warning" jhiTranslate="artemisApp.complaint.listOfComplaints.noReply"></span>
                                                     }
                                                     @if (moreFeedbackRequest.complaint.accepted === true) {
-                                                        <span class="text-success">
-                                                            {{ 'artemisApp.moreFeedback.accepted' | artemisTranslate }}
-                                                        </span>
+                                                        <span class="text-success" jhiTranslate="artemisApp.moreFeedback.accepted"></span>
                                                     }
                                                 </td>
                                                 <td>
@@ -813,14 +776,10 @@ <h4 class="d-inline-block">
                                 </table>
                             } @else {
                                 @if (moreFeedbackRequestsDashboardInfo.total === 0) {
-                                    <div class="alert alert-info">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests' | artemisTranslate }}
-                                    </div>
+                                    <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequests"></div>
                                 }
                                 @if (moreFeedbackRequestsDashboardInfo.total !== 0) {
-                                    <div class="alert alert-info">
-                                        {{ 'artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequestsDisplayed' | artemisTranslate }}
-                                    </div>
+                                    <div class="alert alert-info" jhiTranslate="artemisApp.exerciseAssessmentDashboard.noMoreFeedbackRequestsDisplayed"></div>
                                 }
                             }
                         </div>
@@ -833,7 +792,7 @@ <h4 class="d-inline-block">
         @if (this.tutorParticipation.status! === TRAINED || exercise.isAtLeastInstructor) {
             <div>
                 @if (!isExamMode) {
-                    <h2>{{ 'artemisApp.instructorExerciseDashboard.leaderboardTitle' | artemisTranslate }}</h2>
+                    <h2 jhiTranslate="artemisApp.instructorExerciseDashboard.leaderboardTitle"></h2>
                 }
                 <jhi-tutor-leaderboard [exam]="exam" [tutorsData]="statsForDashboard.tutorLeaderboardEntries" [exercise]="exercise" />
             </div>
diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts
index 62f371f95057..a5bffcbe5575 100644
--- a/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts
+++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/exercise-assessment-dashboard.component.ts
@@ -9,7 +9,7 @@ import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { ExampleSubmission } from 'app/entities/example-submission.model';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { UMLModel } from '@ls1intum/apollon';
 import { ComplaintService } from 'app/complaints/complaint.service';
@@ -22,7 +22,7 @@ import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.mod
 import { TranslateService } from '@ngx-translate/core';
 import { FileUploadSubmissionService } from 'app/exercises/file-upload/participate/file-upload-submission.service';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { GuidedTourService } from 'app/guided-tour/guided-tour.service';
@@ -31,8 +31,8 @@ import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exer
 import { TutorParticipation, TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
-import { Exam } from 'app/entities/exam.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { Exam } from 'app/entities/exam/exam.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { SubmissionService, SubmissionWithComplaintDTO } from 'app/exercises/shared/submission/submission.service';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { SortService } from 'app/shared/service/sort.service';
diff --git a/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts b/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts
index 6ad8422696dc..96741ee28f37 100644
--- a/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts
+++ b/src/main/webapp/app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Submission } from 'app/entities/submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 
 @Component({
     selector: 'jhi-language-table-cell',
diff --git a/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html b/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html
index ca7ed23187b1..5071bdc0cb5a 100644
--- a/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html
+++ b/src/main/webapp/app/exercises/shared/difficulty-picker/difficulty-picker.component.html
@@ -1,26 +1,26 @@
 <div class="btn-group">
-    <div class="btn" [ngClass]="{ 'btn-primary selected': !exercise.difficulty, 'btn-default': exercise.difficulty }" (click)="setDifficulty(undefined)">
-        {{ 'artemisApp.exercise.noLevel' | artemisTranslate }}
-    </div>
+    <div
+        class="btn"
+        [ngClass]="{ 'btn-primary selected': !exercise.difficulty, 'btn-default': exercise.difficulty }"
+        (click)="setDifficulty(undefined)"
+        jhiTranslate="artemisApp.exercise.noLevel"
+    ></div>
     <div
         class="btn"
         [ngClass]="{ 'btn-success selected': exercise.difficulty === DifficultyLevel.EASY, 'btn-default': exercise.difficulty !== DifficultyLevel.EASY }"
         (click)="setDifficulty(DifficultyLevel.EASY)"
-    >
-        {{ 'artemisApp.exercise.easy' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.exercise.easy"
+    ></div>
     <div
         class="btn btn-default"
         [ngClass]="{ 'btn-warning selected': exercise.difficulty === DifficultyLevel.MEDIUM, 'btn-default': exercise.difficulty !== DifficultyLevel.MEDIUM }"
         (click)="setDifficulty(DifficultyLevel.MEDIUM)"
-    >
-        {{ 'artemisApp.exercise.medium' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.exercise.medium"
+    ></div>
     <div
         class="btn btn-default"
         [ngClass]="{ 'btn-danger selected': exercise.difficulty === DifficultyLevel.HARD, 'btn-default': exercise.difficulty !== DifficultyLevel.HARD }"
         (click)="setDifficulty(DifficultyLevel.HARD)"
-    >
-        {{ 'artemisApp.exercise.hard' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.exercise.hard"
+    ></div>
 </div>
diff --git a/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts b/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts
index 79f1e755b358..49a62930183d 100644
--- a/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts
+++ b/src/main/webapp/app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component.ts
@@ -8,7 +8,7 @@ import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.ser
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { EventManager } from 'app/core/util/event-manager.service';
diff --git a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html
index c9ee6d3173e8..d6e797f436e0 100644
--- a/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html
+++ b/src/main/webapp/app/exercises/shared/example-solution/example-solution.component.html
@@ -10,7 +10,7 @@
                 <!-- PROBLEM STATEMENT START -->
                 <div class="row mt-2 mb-2 align-items-baseline" id="problem-statement">
                     <div class="col-12 col-md-12 markdown-preview problem-statement">
-                        <h3>{{ 'artemisApp.exercise.problemStatement' | artemisTranslate }}</h3>
+                        <h3 jhiTranslate="artemisApp.exercise.problemStatement"></h3>
                         <p
                             [innerHTML]="
                                 exercise?.problemStatement ? (exercise.problemStatement | htmlForMarkdown) : ('artemisApp.exercise.emptyProblemStatement' | artemisTranslate)
@@ -20,7 +20,7 @@ <h3>{{ 'artemisApp.exercise.problemStatement' | artemisTranslate }}</h3>
                 </div>
                 <!-- PROBLEM STATEMENT END -->
                 <div class="row mb-2 mt-2 align-items-baseline">
-                    <h3 class="pe-2">{{ 'artemisApp.exercise.exampleSolution' | artemisTranslate }}</h3>
+                    <h3 class="pe-2" jhiTranslate="artemisApp.exercise.exampleSolution"></h3>
                 </div>
                 <dl class="row-md jh-entity-details markdown-preview">
                     @if (exampleSolutionInfo?.exampleSolutionUML || exampleSolutionInfo?.exampleSolution) {
diff --git a/src/main/webapp/app/exercises/shared/example-submission/example-submission-import/example-submission-import.component.html b/src/main/webapp/app/exercises/shared/example-submission/example-submission-import/example-submission-import.component.html
index 85020bd48121..a4d0dd872fbb 100644
--- a/src/main/webapp/app/exercises/shared/example-submission/example-submission-import/example-submission-import.component.html
+++ b/src/main/webapp/app/exercises/shared/example-submission/example-submission-import/example-submission-import.component.html
@@ -78,10 +78,10 @@ <h4 class="modal-title" jhiTranslate="artemisApp.exampleSubmission.useAsExampleS
             </div>
         } @else {
             @if (searchTermEntered) {
-                <p>{{ 'artemisApp.assessment.dashboard.empty' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.assessment.dashboard.empty"></p>
             }
             @if (!searchTermEntered) {
-                <p>{{ 'artemisApp.assessment.dashboard.emptySearch' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.assessment.dashboard.emptySearch"></p>
             }
         }
         <div class="d-flex justify-content-between p-2">
diff --git a/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts b/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts
index 08e1b3eccb6e..5fe845bfe309 100644
--- a/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts
+++ b/src/main/webapp/app/exercises/shared/example-submission/example-submission.service.ts
@@ -6,7 +6,7 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'
 import { map } from 'rxjs/operators';
 import { Submission } from 'app/entities/submission.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { StringCountService } from 'app/exercises/text/participate/string-count.service';
 
diff --git a/src/main/webapp/app/exercises/shared/example-submission/example-submissions.component.html b/src/main/webapp/app/exercises/shared/example-submission/example-submissions.component.html
index 7b6504b0c2b6..166365065b10 100644
--- a/src/main/webapp/app/exercises/shared/example-submission/example-submissions.component.html
+++ b/src/main/webapp/app/exercises/shared/example-submission/example-submissions.component.html
@@ -3,7 +3,7 @@
         <div class="row">
             <div class="col-12 col-sm">
                 <h4>
-                    <span>{{ 'artemisApp.exampleSubmission.exampleSubmissions' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.exampleSubmission.exampleSubmissions"></span>
                 </h4>
             </div>
             <div class="col-12 col-sm-auto d-flex flex-btn-group-container me-1 mb-1">
diff --git a/src/main/webapp/app/exercises/shared/exercise-detail-common-actions/non-programming-exercise-detail-common-actions.component.html b/src/main/webapp/app/exercises/shared/exercise-detail-common-actions/non-programming-exercise-detail-common-actions.component.html
index 4f0561af8f46..98899a615586 100644
--- a/src/main/webapp/app/exercises/shared/exercise-detail-common-actions/non-programming-exercise-detail-common-actions.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-detail-common-actions/non-programming-exercise-detail-common-actions.component.html
@@ -25,7 +25,7 @@
         @if (exercise.assessmentType === AssessmentType.SEMI_AUTOMATIC || exercise.assessmentType === AssessmentType.MANUAL || exercise.allowComplaintsForAutomaticAssessments) {
             <a [routerLink]="shortBaseResource + 'assessment-dashboard/' + exercise.id" class="btn btn-info btn-sm">
                 <fa-icon [icon]="faUserCheck" />
-                <span class="d-none d-md-inline">{{ 'artemisApp.exercise.exerciseAssessmentDashboard' | artemisTranslate }}</span>
+                <span class="d-none d-md-inline" jhiTranslate="artemisApp.exercise.exerciseAssessmentDashboard"></span>
             </a>
         }
         @if (course && exercise.isAtLeastTutor) {
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html
index fc6a6fe86647..2ed3b9d18422 100644
--- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.html
@@ -86,14 +86,10 @@
                         @if (course?.presentationScore) {
                             {{ 'artemisApp.courseOverview.exerciseDetails.presented' | artemisTranslate }}
                             @if ((studentParticipation?.presentationScore ?? 0) > 0) {
-                                <span class="badge bg-success">
-                                    {{ 'global.generic.yes' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-success" jhiTranslate="global.generic.yes"></span>
                             }
                             @if ((studentParticipation?.presentationScore ?? 0) <= 0) {
-                                <span class="badge bg-secondary">
-                                    {{ 'global.generic.no' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-secondary" jhiTranslate="global.generic.no"></span>
                             }
                         } @else {
                             {{ 'artemisApp.courseOverview.exerciseDetails.presentation' | artemisTranslate }}
@@ -103,9 +99,7 @@
                                 </span>
                             }
                             @if (!studentParticipation?.presentationScore) {
-                                <span class="badge bg-secondary">
-                                    {{ 'global.generic.unset' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-secondary" jhiTranslate="global.generic.unset"></span>
                             }
                         }
                     </div>
@@ -144,14 +138,10 @@
                         @if (course?.presentationScore) {
                             {{ 'artemisApp.courseOverview.exerciseDetails.presented' | artemisTranslate }}
                             @if ((studentParticipation?.presentationScore ?? 0) > 0) {
-                                <span class="badge bg-success">
-                                    {{ 'global.generic.yes' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-success" jhiTranslate="global.generic.yes"></span>
                             }
                             @if ((studentParticipation?.presentationScore ?? 0) <= 0) {
-                                <span class="badge bg-secondary">
-                                    {{ 'global.generic.no' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-secondary" jhiTranslate="global.generic.no"></span>
                             }
                         }
                         @if (!course?.presentationScore) {
@@ -162,9 +152,7 @@
                                 </span>
                             }
                             @if (!studentParticipation?.presentationScore) {
-                                <span class="badge bg-secondary">
-                                    {{ 'global.generic.unset' | artemisTranslate }}
-                                </span>
+                                <span class="badge bg-secondary" jhiTranslate="global.generic.unset"></span>
                             }
                         }
                     </div>
@@ -176,9 +164,8 @@
                     <span
                         class="badge bg-success"
                         [ngbTooltip]="'artemisApp.courseOverview.exerciseDetails.complaintPossibleTooltip' | artemisTranslate: { days: course?.maxComplaintTimeDays }"
-                    >
-                        {{ 'global.generic.yes' | artemisTranslate }}
-                    </span>
+                        jhiTranslate="global.generic.yes"
+                    ></span>
                 </div>
             }
         </div>
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss
index a82c4ccbdcc1..152f84298691 100644
--- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss
+++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.scss
@@ -25,16 +25,15 @@
 
     .left-col {
         flex: 1 1 auto;
+        flex-direction: column;
+        min-width: 0;
+        display: flex;
+        gap: 5px;
 
         @supports (flex-basis: min-content) {
             flex: 1 1 min-content;
         }
 
-        min-width: 0;
-        display: flex;
-        flex-direction: column;
-        gap: 5px;
-
         .title-row {
             display: flex;
             gap: 5px;
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts
index 3d7af78e4a85..b89694846761 100644
--- a/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-exercise-page-with-details.component.ts
@@ -2,19 +2,19 @@ import { Component, Input, OnChanges, OnInit } from '@angular/core';
 import { SortService } from 'app/shared/service/sort.service';
 import dayjs from 'dayjs/esm';
 import { Exercise, ExerciseType, IncludedInOverallScore, getCourseFromExercise, getIcon, getIconTooltip } from 'app/entities/exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { SubmissionPolicy } from 'app/entities/submission-policy.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ComplaintService } from 'app/complaints/complaint.service';
 import { SubmissionType } from 'app/entities/submission.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html
index 4dabbf9dea73..af31df28d183 100644
--- a/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-headers/header-participation-page.component.html
@@ -4,7 +4,7 @@
             <div class="col-12 col-sm-12 col-lg-5 d-flex flex-column justify-content-center">
                 <h4 class="fw-medium"><ng-content select="[pagetitle]" /></h4>
                 <div class="d-flex align-items-center">
-                    <h6 class="me-2 mb-0 fw-medium">{{ 'artemisApp.courseOverview.exerciseDetails.dueDate' | artemisTranslate }}</h6>
+                    <h6 class="me-2 mb-0 fw-medium" jhiTranslate="artemisApp.courseOverview.exerciseDetails.dueDate"></h6>
                     <span>{{ (dueDate | artemisDate) || 'N/A' }}</span>
                     @if (dueDate) {
                         <span [ngClass]="exerciseStatusBadge" class="badge ms-2">{{ dueDate | artemisTimeAgo }}</span>
@@ -12,7 +12,7 @@ <h6 class="me-2 mb-0 fw-medium">{{ 'artemisApp.courseOverview.exerciseDetails.du
                 </div>
                 @if (exercise.categories) {
                     <div class="d-sm-flex">
-                        <h6 class="me-1 fw-medium">{{ 'artemisApp.courseOverview.exerciseDetails.categories' | artemisTranslate }}</h6>
+                        <h6 class="me-1 fw-medium" jhiTranslate="artemisApp.courseOverview.exerciseDetails.categories"></h6>
                         @for (category of exerciseCategories; track category) {
                             <h6 class="fw-medium">
                                 <span class="badge text-white me-1" [ngStyle]="{ backgroundColor: category.color }">{{ category.category }}</span>
@@ -26,7 +26,7 @@ <h6 class="fw-medium">
                     @if (exercise.maxPoints) {
                         <tr>
                             <td>
-                                <h6 class="fw-medium">{{ 'artemisApp.courseOverview.exerciseDetails.points' | artemisTranslate }}</h6>
+                                <h6 class="fw-medium" jhiTranslate="artemisApp.courseOverview.exerciseDetails.points"></h6>
                             </td>
                             <td>
                                 <span>
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html
index 1235391ec365..5c80f6e0c868 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.html
@@ -60,15 +60,8 @@ <h2 id="jhi-exercise-hint-heading" [jhiTranslate]="'artemisApp.exerciseHint.home
                         </jhi-iris-logo-button>
                     </div>
                 }
-                <div class="form-group hint-form__editor-wrapper">
-                    <jhi-markdown-editor
-                        [markdown]="exerciseHint.content"
-                        (markdownChange)="updateHintContent($event)"
-                        [resizableMinHeight]="MarkdownEditorHeight.SMALL"
-                        [resizableMaxHeight]="MarkdownEditorHeight.LARGE"
-                        [domainCommands]="domainCommands"
-                        [editorMode]="editorMode"
-                    />
+                <div class="form-group hint-form__editor-wrapper mb-3">
+                    <jhi-markdown-editor-monaco [markdown]="exerciseHint.content" (markdownChange)="updateHintContent($event)" [domainActions]="domainActions" />
                 </div>
                 @if (exerciseHint.type === HintType.CODE) {
                     <div class="form-group hint-form__editor-wrapper">
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts
index 3ea7292de040..c9d222f78ee3 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint-update.component.ts
@@ -4,14 +4,12 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable, Subscription, filter, switchMap } from 'rxjs';
 import { AlertService } from 'app/core/util/alert.service';
 import { ExerciseHintService } from '../shared/exercise-hint.service';
-import { EditorMode, MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { faBan, faCircleNotch, faSave } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseHint, HintType } from 'app/entities/hestia/exercise-hint.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
 import { ManualSolutionEntryCreationModalComponent } from 'app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
@@ -23,13 +21,14 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ButtonType } from 'app/shared/components/button.component';
 import { PROFILE_IRIS } from 'app/app.constants';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
+import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 const DEFAULT_DISPLAY_THRESHOLD = 3;
 
 @Component({
     selector: 'jhi-exercise-hint-update',
     templateUrl: './exercise-hint-update.component.html',
-    styleUrls: ['./exercise-hint.scss'],
 })
 export class ExerciseHintUpdateComponent implements OnInit, OnDestroy {
     MarkdownEditorHeight = MarkdownEditorHeight;
@@ -47,8 +46,7 @@ export class ExerciseHintUpdateComponent implements OnInit, OnDestroy {
     isGeneratingDescription: boolean;
     paramSub: Subscription;
 
-    domainCommands = [new KatexCommand()];
-    editorMode = EditorMode.LATEX;
+    domainActions = [new MonacoFormulaAction()];
 
     // Icons
     faCircleNotch = faCircleNotch;
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts
index 49829c3f3fef..3b542f17643b 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.component.ts
@@ -11,7 +11,7 @@ import { EventManager } from 'app/core/util/event-manager.service';
 import { faArrowsRotate, faCode, faEye, faFont, faPlus, faTimes, faWrench } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseHint, HintType } from 'app/entities/hestia/exercise-hint.model';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 
 @Component({
     selector: 'jhi-exercise-hint',
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss b/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss
deleted file mode 100644
index 536b30c1def3..000000000000
--- a/src/main/webapp/app/exercises/shared/exercise-hint/manage/exercise-hint.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.hint-form__editor-wrapper {
-    ::ng-deep .markdown-editor {
-        height: 300px;
-    }
-}
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
index 8f5f0b1cce9f..7dc825d8aa95 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component.html
@@ -21,12 +21,12 @@
         </mat-panel-description>
     </mat-expansion-panel-header>
     <mat-action-row>
-        <button type="button" [ngClass]="'btn btn-secondary'" (click)="collapseContent()">{{ 'artemisApp.exerciseHint.studentDialog.collapse' | artemisTranslate }}</button>
+        <button type="button" [ngClass]="'btn btn-secondary'" (click)="collapseContent()" jhiTranslate="artemisApp.exerciseHint.studentDialog.collapse"></button>
     </mat-action-row>
     @if (isLoading) {
         <div class="d-flex justify-content-center">
             <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+                <span class="sr-only" jhiTranslate="loading"></span>
             </div>
         </div>
     } @else {
diff --git a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html
index b7f412a0ef42..09c17845b507 100644
--- a/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-hint/participate/exercise-hint-student-dialog.component.html
@@ -6,10 +6,11 @@ <h4 class="modal-title" jhiTranslate="artemisApp.exerciseHint.studentDialog.titl
     @if (availableExerciseHints?.length) {
         <div class="mb-3">
             <h2 jhiTranslate="artemisApp.exerciseHint.studentDialog.availableHintsTitle"></h2>
-            <span class="mb-5">{{
-                'artemisApp.exerciseHint.studentDialog.availableHintTaskDescription'
-                    | artemisTranslate: { taskName: availableExerciseHints.first()!.programmingExerciseTask!.taskName }
-            }}</span>
+            <span
+                class="mb-5"
+                jhiTranslate="artemisApp.exerciseHint.studentDialog.availableHintTaskDescription"
+                [translateValues]="{ taskName: availableExerciseHints.first()!.programmingExerciseTask!.taskName }"
+            ></span>
             @for (hint of availableExerciseHints; track hint) {
                 <div class="mb-3">
                     <jhi-exercise-hint-expandable [exerciseHint]="hint" [hasUsed]="false" (onHintActivated)="this.onHintActivated.emit($event)" />
diff --git a/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html b/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html
index 6730415e6a25..e223cb6f2b06 100644
--- a/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-info/exercise-info.component.html
@@ -1,5 +1,5 @@
 <div class="panel-wrapper col-12 col-xxl-8">
-    <div class="panel-header">{{ 'artemisApp.exercise.details' | artemisTranslate }}</div>
+    <div class="panel-header" jhiTranslate="artemisApp.exercise.details"></div>
     <div class="vertLine"></div>
     <div class="panel-body">
         @if (exercise.releaseDate) {
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts
index 62720c9c897f..704737e2b4d0 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores-export-button.component.ts
@@ -6,12 +6,12 @@ import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exer
 import { Component, Input, OnInit } from '@angular/core';
 import { ResultService } from 'app/exercises/shared/result/result.service';
 import { getTestCaseNamesFromResults, getTestCaseResults } from 'app/exercises/shared/result/result.utils';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model';
 import { faDownload } from '@fortawesome/free-solid-svg-icons';
 import { download, generateCsv, mkConfig } from 'export-to-csv';
-import { TestCaseResult } from 'app/entities/test-case-result.model';
+import { TestCaseResult } from 'app/entities/programming/test-case-result.model';
 
 @Component({
     selector: 'jhi-exercise-scores-export-button',
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
index bd6a45ee94dc..999ab5fe4108 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.html
@@ -12,7 +12,7 @@ <h2>
             <h4 class="d-flex align-items-center">
                 <span class="me-2">
                     <strong class="text-primary"> {{ 'artemisApp.assessment.dashboard.activeFilter' | artemisTranslate }}: </strong>
-                    <span class="ms-1">{{ 'artemisApp.exercise.showingOnlyInRange' | artemisTranslate: { range: this.rangeFilter.toString() } }}</span>
+                    <span class="ms-1" jhiTranslate="artemisApp.exercise.showingOnlyInRange" [translateValues]="{ range: this.rangeFilter.toString() }"></span>
                 </span>
                 <button type="button" class="btn btn-primary" (click)="resetFilterOptions()" jhiTranslate="artemisApp.assessment.dashboard.resetFilter"></button>
             </h4>
@@ -46,17 +46,14 @@ <h4 class="d-flex align-items-center">
                     </ul>
                 </div>
                 @if (filteredParticipations.length && participationsPerFilter.get(resultCriteria.filterProp) !== filteredParticipations.length) {
-                    <span>
-                        {{
-                            'artemisApp.exercise.showingOfResults'
-                                | artemisTranslate
-                                    : {
-                                          filtered: participationsPerFilter.get(resultCriteria.filterProp),
-                                          total: filteredParticipations.length,
-                                          percent: ((participationsPerFilter.get(resultCriteria.filterProp) ?? 0) * 100) / filteredParticipations.length | number: '1.0-1',
-                                      }
-                        }}
-                    </span>
+                    <span
+                        jhiTranslate="artemisApp.exercise.showingOfResults"
+                        [translateValues]="{
+                            filtered: participationsPerFilter.get(resultCriteria.filterProp),
+                            total: filteredParticipations.length,
+                            percent: ((participationsPerFilter.get(resultCriteria.filterProp) ?? 0) * 100) / filteredParticipations.length | number: '1.0-1',
+                        }"
+                    ></span>
                 }
             </div>
             <div class="p-2">
@@ -158,7 +155,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                     <ngx-datatable-column prop="" [sortable]="true" [minWidth]="100" [width]="180">
                         <ng-template ngx-datatable-header-template>
                             <span class="datatable-header-cell-wrapper" (click)="controls.onSort(exercise.teamMode ? 'team.name' : 'student.name')">
-                                <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.name' | artemisTranslate }}</span>
+                                <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.exercise.name"></span>
                                 <fa-icon [icon]="controls.iconForSortPropField(exercise.teamMode ? 'team.name' : 'student.name')" />
                             </span>
                         </ng-template>
@@ -181,12 +178,12 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                         <ng-template ngx-datatable-header-template>
                             @if (exercise.teamMode) {
                                 <span class="datatable-header-cell-wrapper" (click)="controls.onSort('team.shortName')">
-                                    <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.teamShortName' | artemisTranslate }}</span>
+                                    <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.exercise.teamShortName"></span>
                                     <fa-icon [icon]="controls.iconForSortPropField('team.shortName')" />
                                 </span>
                             } @else {
                                 <span class="datatable-header-cell-wrapper" (click)="controls.onSort('student.login')">
-                                    <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.studentId' | artemisTranslate }}</span>
+                                    <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.exercise.studentId"></span>
                                     <fa-icon [icon]="controls.iconForSortPropField('student.login')" />
                                 </span>
                             }
@@ -204,7 +201,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                     <ngx-datatable-column prop="" [sortable]="true" [minWidth]="130" [width]="140">
                         <ng-template ngx-datatable-header-template>
                             <span class="datatable-header-cell-wrapper" (click)="controls.onSort('results?.last()?.completionDate')">
-                                <span class="datatable-header-cell-label bold sortable">{{ 'artemisApp.exercise.completionDate' | artemisTranslate }}</span>
+                                <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.exercise.completionDate"></span>
                                 <fa-icon [icon]="controls.iconForSortPropField('results?.last()?.completionDate')" />
                             </span>
                         </ng-template>
@@ -215,7 +212,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                     <ngx-datatable-column prop="" [sortable]="true" [minWidth]="250" [width]="260">
                         <ng-template ngx-datatable-header-template>
                             <span class="datatable-header-cell-wrapper" (click)="controls.onSort('results?.last()?.score')">
-                                <span class="datatable-header-cell-label bold">{{ 'artemisApp.exercise.lastResult' | artemisTranslate }}</span>
+                                <span class="datatable-header-cell-label bold" jhiTranslate="artemisApp.exercise.lastResult"></span>
                                 <fa-icon [icon]="controls.iconForSortPropField('results?.last()?.score')" />
                             </span>
                         </ng-template>
@@ -229,7 +226,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                         <ngx-datatable-column prop="" [sortable]="true" [minWidth]="130" [width]="140">
                             <ng-template ngx-datatable-header-template>
                                 <span class="datatable-header-cell-wrapper" (click)="controls.onSort('results?.last().assessmentType')">
-                                    <span class="datatable-header-cell-label bold">{{ 'artemisApp.exercise.type' | artemisTranslate }}</span>
+                                    <span class="datatable-header-cell-label bold" jhiTranslate="artemisApp.exercise.type"></span>
                                     <fa-icon [icon]="controls.iconForSortPropField('results?.last().assessmentType')" />
                                 </span>
                             </ng-template>
@@ -277,7 +274,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                     <ngx-datatable-column prop="" [sortable]="true" [minWidth]="100" [width]="110">
                         <ng-template ngx-datatable-header-template>
                             <span class="datatable-header-cell-wrapper d-inline-block w-100 text-center" (click)="controls.onSort('submissionCount')">
-                                <span class="datatable-header-cell-label bold">{{ 'artemisApp.exercise.submissionCount' | artemisTranslate }}</span>
+                                <span class="datatable-header-cell-label bold" jhiTranslate="artemisApp.exercise.submissionCount"></span>
                                 <fa-icon [icon]="controls.iconForSortPropField('submissionCount')" />
                             </span>
                         </ng-template>
@@ -296,7 +293,7 @@ <h5 jhiTranslate="artemisApp.exercise.export.options"></h5>
                     <ngx-datatable-column prop="" [sortable]="true" [minWidth]="80" [width]="90">
                         <ng-template ngx-datatable-header-template>
                             <span class="datatable-header-cell-wrapper" (click)="controls.onSort('results?.last()?.durationInMinutes')">
-                                <span class="datatable-header-cell-label bold">{{ 'artemisApp.exercise.duration' | artemisTranslate }}</span>
+                                <span class="datatable-header-cell-label bold" jhiTranslate="artemisApp.exercise.duration"></span>
                                 <fa-icon [icon]="controls.iconForSortPropField('results?.last()?.durationInMinutes')" />
                             </span>
                         </ng-template>
diff --git a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
index 1b578e4ecbd4..b518bd05bb5a 100644
--- a/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
+++ b/src/main/webapp/app/exercises/shared/exercise-scores/exercise-scores.component.ts
@@ -14,11 +14,11 @@ import { ResultService } from 'app/exercises/shared/result/result.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { formatTeamAsSearchResult } from 'app/exercises/shared/team/team.utils';
 import { faCodeBranch, faComment, faDownload, faFilter, faFolderOpen, faListAlt, faSync } from '@fortawesome/free-solid-svg-icons';
 import { faFileCode } from '@fortawesome/free-regular-svg-icons';
diff --git a/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html b/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html
index 3f1295a4ee83..026ba95b9279 100644
--- a/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html
+++ b/src/main/webapp/app/exercises/shared/exercise-update-warning/exercise-update-warning.component.html
@@ -18,9 +18,7 @@
         @if (instructionDeleted) {
             <div class="warning-info">
                 <input class="form-check-input" type="checkbox" name="deleteFeedback" id="deleteFeedback" [ngModel]="deleteFeedback" (ngModelChange)="toggleDeleteFeedback()" />
-                <label class="form-check-label text-danger" for="deleteFeedback">
-                    {{ 'artemisApp.exercise.update.warning.deleteFeedback' | artemisTranslate }}
-                </label>
+                <label class="form-check-label text-danger" for="deleteFeedback" jhiTranslate="artemisApp.exercise.update.warning.deleteFeedback"></label>
             </div>
         }
         @if (creditChanged || usageCountChanged || instructionDeleted) {
diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
index dffb26604cc7..a5c6b2febc1a 100644
--- a/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
+++ b/src/main/webapp/app/exercises/shared/exercise/exercise.service.ts
@@ -12,10 +12,10 @@ import { TranslateService } from '@ngx-translate/core';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.utils';
 import { EntityTitleService, EntityType } from 'app/shared/layouts/navbar/entity-title.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { SafeHtml } from '@angular/platform-browser';
@@ -347,7 +347,7 @@ export class ExerciseService {
      * @param exercise the exercise
      */
     static stringifyExerciseCategories(exercise: Exercise) {
-        return exercise.categories?.map((category) => JSON.stringify(category) as ExerciseCategory);
+        return exercise.categories?.map((category) => JSON.stringify(category) as unknown as ExerciseCategory);
     }
 
     /**
@@ -362,12 +362,15 @@ export class ExerciseService {
     }
 
     /**
-     * Parses the exercise categories JSON string into ExerciseCategory objects.
+     * Parses the exercise categories JSON string into {@link ExerciseCategory} objects.
      * @param exercise - the exercise
      */
     static parseExerciseCategories(exercise?: Exercise) {
         if (exercise?.categories) {
-            exercise.categories = exercise.categories.map((category) => JSON.parse(category as string) as ExerciseCategory);
+            exercise.categories = exercise.categories.map((category) => {
+                const categoryObj = JSON.parse(category as unknown as string);
+                return new ExerciseCategory(categoryObj.category, categoryObj.color);
+            });
         }
     }
 
diff --git a/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts b/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts
index 655133c142c3..091f4af5364d 100644
--- a/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts
+++ b/src/main/webapp/app/exercises/shared/exercise/exercise.utils.ts
@@ -2,7 +2,7 @@ import { SimpleChanges } from '@angular/core';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import dayjs from 'dayjs/esm';
 import { InitializationState, Participation } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { Observable, from, of } from 'rxjs';
diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
index 02ec4680e56e..5d41e4bfe798 100644
--- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
+++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.html
@@ -3,9 +3,7 @@
         @if (taskName) {
             <h3 class="modal-title" [innerHTML]="'artemisApp.result.detail.feedbackForTask' | artemisTranslate: { taskName }"></h3>
         } @else {
-            <h3 class="modal-title">
-                {{ 'artemisApp.result.detail.feedback' | artemisTranslate }}
-            </h3>
+            <h3 class="modal-title" jhiTranslate="artemisApp.result.detail.feedback"></h3>
         }
 
         @if (activeModal) {
@@ -40,26 +38,22 @@ <h6 [innerHTML]="'artemisApp.result.afterDueDateFeedbackHidden' | artemisTransla
                         <div class="d-flex justify-content-between align-items-start">
                             <h4>
                                 @if (result.assessmentType === AssessmentType.AUTOMATIC_ATHENA) {
-                                    <span>
-                                        {{ 'artemisApp.result.resultString.automaticAIFeedbackSuccessfulTooltip' | artemisTranslate }}
-                                    </span>
+                                    <span jhiTranslate="artemisApp.result.resultString.automaticAIFeedbackSuccessfulTooltip"></span>
                                 } @else {
                                     @if (!exercise?.maxPoints) {
-                                        <span>
-                                            {{ 'artemisApp.result.score' | artemisTranslate: { score: roundValueSpecifiedByCourseSettings(result.score, course) } }}
-                                        </span>
+                                        <span
+                                            jhiTranslate="artemisApp.result.score"
+                                            [translateValues]="{ score: roundValueSpecifiedByCourseSettings(result.score, course) }"
+                                        ></span>
                                     } @else {
                                         @if (exercise && exercise.maxPoints) {
-                                            <span>
-                                                {{
-                                                    'artemisApp.result.scoreWithPoints'
-                                                        | artemisTranslate
-                                                            : {
-                                                                  score: roundValueSpecifiedByCourseSettings(result.score ?? 0, course),
-                                                                  points: roundValueSpecifiedByCourseSettings(((result.score ?? 0) * exercise.maxPoints) / 100, course),
-                                                              }
-                                                }}
-                                            </span>
+                                            <span
+                                                jhiTranslate="artemisApp.result.scoreWithPoints"
+                                                [translateValues]="{
+                                                    score: roundValueSpecifiedByCourseSettings(result.score ?? 0, course),
+                                                    points: roundValueSpecifiedByCourseSettings(((result.score ?? 0) * exercise.maxPoints) / 100, course),
+                                                }"
+                                            ></span>
                                         }
                                     }
                                 }
diff --git a/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts b/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts
index 8fe19b908551..576445b7831d 100644
--- a/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts
+++ b/src/main/webapp/app/exercises/shared/feedback/feedback.component.ts
@@ -3,14 +3,14 @@ import { HttpErrorResponse } from '@angular/common/http';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { catchError, map, switchMap, tap } from 'rxjs/operators';
 import { of, throwError } from 'rxjs';
-import { BuildLogEntry, BuildLogEntryArray, BuildLogType } from 'app/entities/build-log.model';
+import { BuildLogEntry, BuildLogEntryArray, BuildLogType } from 'app/entities/programming/build-log.model';
 import { Feedback, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model';
 import { Badge, ResultService } from 'app/exercises/shared/result/result.service';
 import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model';
 import { Result } from 'app/entities/result.model';
 import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TranslateService } from '@ngx-translate/core';
 import { createCommitUrl, isProgrammingExerciseParticipation } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts b/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts
index 006f24f2fba0..8bdf9ecd30b4 100644
--- a/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts
+++ b/src/main/webapp/app/exercises/shared/feedback/group/programming-feedback-groups.ts
@@ -1,7 +1,7 @@
 import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group';
 import { FeedbackItem } from 'app/exercises/shared/feedback/item/feedback-item';
 import { Exercise } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 /**
  * Returns all FeedbackItemGroups for Programming exercises in the order, in which they will be displayed
diff --git a/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts b/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts
index 03b491da0195..8b231443aa32 100644
--- a/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts
+++ b/src/main/webapp/app/exercises/shared/feedback/item/programming-feedback-item.service.ts
@@ -11,7 +11,7 @@ import {
     SUBMISSION_POLICY_FEEDBACK_IDENTIFIER,
 } from 'app/entities/feedback.model';
 import { TranslateService } from '@ngx-translate/core';
-import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model';
+import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model';
 import { getAllFeedbackGroups } from 'app/exercises/shared/feedback/group/programming-feedback-groups';
 import { FeedbackItem } from 'app/exercises/shared/feedback/item/feedback-item';
 import { Exercise } from 'app/entities/exercise.model';
diff --git a/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts b/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts
index d0389d076607..23673a0cd2da 100644
--- a/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts
+++ b/src/main/webapp/app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 
 @Component({
     selector: 'jhi-exercise-import-wrapper',
diff --git a/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts b/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts
index 85a408c2fdc1..1fea53eaacbd 100644
--- a/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts
+++ b/src/main/webapp/app/exercises/shared/import/exercise-import.component.ts
@@ -2,7 +2,7 @@ import { Component, Injector, Input, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { FileUploadExercisePagingService } from 'app/exercises/file-upload/manage/file-upload-exercise-paging.service';
 import { ModelingExercisePagingService } from 'app/exercises/modeling/manage/modeling-exercise-paging.service';
 import { CodeAnalysisPagingService } from 'app/exercises/programming/manage/services/code-analysis-paging.service';
diff --git a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts
index bc6621cf3e64..688b7cd6fb44 100644
--- a/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts
+++ b/src/main/webapp/app/exercises/shared/import/from-file/exercise-import-from-file.component.ts
@@ -1,10 +1,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
+import { ProgrammingExerciseBuildConfig } from 'app/entities/programming/programming-exercise-build.config';
 import { MAX_FILE_SIZE } from 'app/shared/constants/input.constants';
 import { AlertService } from 'app/core/util/alert.service';
 import { faUpload } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise, ProgrammingExerciseBuildConfig, copyBuildConfigFromExerciseJson } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, copyBuildConfigFromExerciseJson } from 'app/entities/programming/programming-exercise.model';
 import JSZip from 'jszip';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html b/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html
index ca7687b905ed..edaa0ae542cc 100644
--- a/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html
+++ b/src/main/webapp/app/exercises/shared/included-in-overall-score-picker/included-in-overall-score-picker.component.html
@@ -6,9 +6,8 @@
             'btn-default': includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY,
         }"
         (click)="change(IncludedInOverallScore.INCLUDED_COMPLETELY)"
-    >
-        {{ 'artemisApp.exercise.yes' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.exercise.yes"
+    ></div>
     <div
         class="btn btn-default"
         [ngClass]="{
@@ -16,9 +15,8 @@
             'btn-default': includedInOverallScore !== IncludedInOverallScore.INCLUDED_AS_BONUS,
         }"
         (click)="change(IncludedInOverallScore.INCLUDED_AS_BONUS)"
-    >
-        {{ 'artemisApp.exercise.bonus' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.exercise.bonus"
+    ></div>
     @if (allowNotIncluded) {
         <div
             class="btn btn-default"
@@ -27,8 +25,7 @@
                 'btn-default': includedInOverallScore !== IncludedInOverallScore.NOT_INCLUDED,
             }"
             (click)="change(IncludedInOverallScore.NOT_INCLUDED)"
-        >
-            {{ 'artemisApp.exercise.no' | artemisTranslate }}
-        </div>
+            jhiTranslate="artemisApp.exercise.no"
+        ></div>
     }
 </div>
diff --git a/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts b/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts
index 5d646d031991..1697967842ad 100644
--- a/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts
+++ b/src/main/webapp/app/exercises/shared/manage/exercise-paging.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Exercise } from 'app/entities/exercise.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { PagingService } from 'app/exercises/shared/manage/paging.service';
 import { SearchResult, SearchTermPageableSearch } from 'app/shared/table/pageable-table';
 import { Observable, map } from 'rxjs';
diff --git a/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts b/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts
index 57f529b33147..733059f76d8d 100644
--- a/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts
+++ b/src/main/webapp/app/exercises/shared/participation-submission/participation-submission.component.ts
@@ -11,8 +11,8 @@ import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service'
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import dayjs from 'dayjs/esm';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TranslateService } from '@ngx-translate/core';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ButtonSize } from 'app/shared/components/button.component';
diff --git a/src/main/webapp/app/exercises/shared/participation/participation.component.html b/src/main/webapp/app/exercises/shared/participation/participation.component.html
index c81cad22ee1f..c3eadf5cd3e1 100644
--- a/src/main/webapp/app/exercises/shared/participation/participation.component.html
+++ b/src/main/webapp/app/exercises/shared/participation/participation.component.html
@@ -8,11 +8,11 @@ <h2>
                 <div class="d-flex align-items-center mt-2">
                     <label class="radio-inline mb-0 d-flex align-items-center">
                         <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
-                        <span class="ms-1">{{ 'artemisApp.exercise.showAll' | artemisTranslate }}</span>
+                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showAll"></span>
                     </label>
                     <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
                         <input type="radio" [ngModel]="participationCriteria.filterProp" (click)="updateParticipationFilter(FilterProp.FAILED)" [value]="FilterProp.FAILED" />
-                        <span class="ms-1">{{ 'artemisApp.exercise.showFailed' | artemisTranslate }}</span>
+                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showFailed"></span>
                     </label>
                     <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
                         <input
@@ -21,7 +21,7 @@ <h2>
                             (click)="updateParticipationFilter(FilterProp.NO_SUBMISSIONS)"
                             [value]="FilterProp.NO_SUBMISSIONS"
                         />
-                        <span class="ms-1">{{ 'artemisApp.exercise.showNoSubmissions' | artemisTranslate }}</span>
+                        <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoSubmissions"></span>
                     </label>
                     @if (exercise.type === ExerciseType.PROGRAMMING && afterDueDate) {
                         <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
@@ -31,7 +31,7 @@ <h2>
                                 (click)="updateParticipationFilter(FilterProp.NO_PRACTICE)"
                                 [value]="FilterProp.NO_PRACTICE"
                             />
-                            <span class="ms-1">{{ 'artemisApp.exercise.showNoPracticeMode' | artemisTranslate }}</span>
+                            <span class="ms-1" jhiTranslate="artemisApp.exercise.showNoPracticeMode"></span>
                         </label>
                     }
                 </div>
diff --git a/src/main/webapp/app/exercises/shared/participation/participation.component.ts b/src/main/webapp/app/exercises/shared/participation/participation.component.ts
index dfdb90b6d53e..627a33ce8815 100644
--- a/src/main/webapp/app/exercises/shared/participation/participation.component.ts
+++ b/src/main/webapp/app/exercises/shared/participation/participation.component.ts
@@ -17,7 +17,7 @@ import { ProgrammingExerciseStudentParticipation } from 'app/entities/participat
 import { AlertService } from 'app/core/util/alert.service';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { faCircleNotch, faCodeBranch, faEraser, faFilePowerpoint, faTable, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { GradingSystemService } from 'app/grading-system/grading-system.service';
 import { GradeStepsDTO } from 'app/entities/grade-step.model';
diff --git a/src/main/webapp/app/exercises/shared/participation/participation.utils.ts b/src/main/webapp/app/exercises/shared/participation/participation.utils.ts
index 7c7a99d3830c..5fc349f22b27 100644
--- a/src/main/webapp/app/exercises/shared/participation/participation.utils.ts
+++ b/src/main/webapp/app/exercises/shared/participation/participation.utils.ts
@@ -102,7 +102,11 @@ export const isParticipationInDueTime = (participation: Participation, exercise:
  * @param participation
  * @param showUngradedResults
  */
-export function getLatestResultOfStudentParticipation(participation: StudentParticipation, showUngradedResults: boolean): Result | undefined {
+export function getLatestResultOfStudentParticipation(participation: StudentParticipation | undefined, showUngradedResults: boolean): Result | undefined {
+    if (!participation) {
+        return undefined;
+    }
+
     // Sort participation results by completionDate desc.
     if (participation.results) {
         participation.results = _orderBy(participation.results, 'completionDate', 'desc');
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html
index c848e2b44c17..99c853afd07e 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component.html
@@ -1,12 +1,11 @@
 <div class="form-group col-auto border border-warning p-3">
     <!-- Toggle Button -->
-    <button type="button" class="btn btn-secondary me-1" (click)="isCPCCollapsed = !isCPCCollapsed">
-        {{
-            isCPCCollapsed
-                ? ('artemisApp.plagiarism.showContinuousPlagiarismControl' | artemisTranslate)
-                : ('artemisApp.plagiarism.hideContinuousPlagiarismControl' | artemisTranslate)
-        }}
-    </button>
+    <button
+        type="button"
+        class="btn btn-secondary me-1"
+        (click)="isCPCCollapsed = !isCPCCollapsed"
+        jhiTranslate="{{ isCPCCollapsed ? 'artemisApp.plagiarism.showContinuousPlagiarismControl' : 'artemisApp.plagiarism.hideContinuousPlagiarismControl' }}"
+    ></button>
     <fa-icon [icon]="faQuestionCircle" placement="bottom auto" [ngbTooltip]="'artemisApp.plagiarism.continuousPlagiarismControlTooltip' | artemisTranslate" />
     <span class="badge rounded-pill text-bg-warning ms-1">BETA</span>
     <div class="row" [hidden]="isCPCCollapsed">
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.html
index 290833345037..aff14deb4db6 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-header/plagiarism-header.component.html
@@ -12,18 +12,16 @@ <h5 class="fw-medium">
             class="btn btn-success btn-sm"
             (click)="confirmPlagiarism()"
             data-qa="confirm-plagiarism-button"
-        >
-            {{ 'artemisApp.plagiarism.confirm' | artemisTranslate }}
-        </button>
+            jhiTranslate="artemisApp.plagiarism.confirm"
+        ></button>
 
         <button
             [disabled]="comparison.status === plagiarismStatus.DENIED || isLoading || exercise.teamMode"
             class="btn btn-danger btn-sm"
             (click)="denyPlagiarism()"
             data-qa="deny-plagiarism-button"
-        >
-            {{ 'artemisApp.plagiarism.deny' | artemisTranslate }}
-        </button>
+            jhiTranslate="artemisApp.plagiarism.deny"
+        ></button>
 
         <div class="vertical-divider"></div>
 
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html
index 9dc516d097a4..1af8f423204d 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-inspector/plagiarism-inspector.component.html
@@ -4,17 +4,17 @@
             <div class="plagiarism-header-top-left">
                 <h4 class="plagiarism-page-title fw-medium" (click)="showOptions = !showOptions" [class.active]="showOptions">
                     <fa-icon class="plagiarism-options-toggle" [icon]="faChevronRight" />
-                    <span>{{ 'artemisApp.plagiarism.plagiarismDetection' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.plagiarism.plagiarismDetection"></span>
                 </h4>
                 <div class="plagiarism-warning">
                     <fa-icon [icon]="faExclamationTriangle" id="plagiarismCaution" />
-                    <span>{{ 'artemisApp.plagiarism.caution' | artemisTranslate }}</span>
+                    <span jhiTranslate="artemisApp.plagiarism.caution"></span>
                 </div>
             </div>
             <div class="plagiarism-header-top-right">
                 @if (chartFilterApplied) {
                     <button class="check-plagiarism btn btn-info" (click)="resetFilter()">
-                        <span>{{ 'artemisApp.plagiarism.resetFilter' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.plagiarism.resetFilter"></span>
                     </button>
                 }
                 <button
@@ -23,7 +23,7 @@ <h4 class="plagiarism-page-title fw-medium" (click)="showOptions = !showOptions"
                     (click)="checkPlagiarism()"
                     [overwriteDisabled]="detectionInProgress"
                 >
-                    <span>{{ plagiarismResult ? ('artemisApp.plagiarism.rerun' | artemisTranslate) : ('artemisApp.plagiarism.detect' | artemisTranslate) }}</span>
+                    <span jhiTranslate="{{ plagiarismResult ? 'artemisApp.plagiarism.rerun' : 'artemisApp.plagiarism.detect' }}"></span>
                 </button>
                 <ng-template #toggleDeleteModal let-modal>
                     <div class="modal-header">
@@ -42,9 +42,7 @@ <h4 class="modal-title">
                                 [checked]="deleteAllPlagiarismComparisons"
                                 (change)="toggleDeleteAllPlagiarismComparisons()"
                             />
-                            <label for="deleteAllPlagiarismComparisons" class="form-check-label">{{
-                                'artemisApp.plagiarism.cleanUp.confirmDialog.deleteAll' | artemisTranslate
-                            }}</label>
+                            <label for="deleteAllPlagiarismComparisons" class="form-check-label" jhiTranslate="artemisApp.plagiarism.cleanUp.confirmDialog.deleteAll"></label>
                         </div>
                         @if (deleteAllPlagiarismComparisons) {
                             <p jhiTranslate="artemisApp.plagiarism.cleanUp.confirmDialog.warning" class="text-warning"></p>
@@ -140,9 +138,7 @@ <h4 class="modal-title">
                 </div>
             }
             @if (!detectionInProgress) {
-                <span class="plagiarism-empty-label">
-                    {{ 'artemisApp.plagiarism.empty' | artemisTranslate }}
-                </span>
+                <span class="plagiarism-empty-label" jhiTranslate="artemisApp.plagiarism.empty"></span>
             }
         </div>
     }
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-run-details/plagiarism-run-details.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-run-details/plagiarism-run-details.component.html
index 1c6e8f5f8c26..57d24497648f 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-run-details/plagiarism-run-details.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-run-details/plagiarism-run-details.component.html
@@ -1,49 +1,37 @@
 <div class="plagiarism-run-details">
     <div class="plagiarism-run-details-stats">
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.numberOfDetectedSubmissions' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.numberOfDetectedSubmissions"></div>
             <div class="plagiarism-run-details-info">
                 {{ plagiarismResultStats?.numberOfDetectedSubmissions }}
             </div>
         </div>
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.averageSimilarity' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.averageSimilarity"></div>
             <div class="plagiarism-run-details-info">
                 {{ plagiarismResultStats?.averageSimilarity?.toFixed(2) + ' %' }}
             </div>
         </div>
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.maximalSimilarity' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.maximalSimilarity"></div>
             <div class="plagiarism-run-details-info">
                 {{ plagiarismResultStats?.maximalSimilarity?.toFixed(2) + ' %' }}
             </div>
         </div>
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.duration' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.duration"></div>
             <div class="plagiarism-run-details-info duration">
                 {{ plagiarismResult?.duration | date: 'HH:mm:ss' : 'GMT' }}
             </div>
         </div>
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.startedAt' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.startedAt"></div>
             <div class="plagiarism-run-details-info">
                 {{ plagiarismResult?.createdDate?.toLocaleString() | date: 'dd.MM.YY HH:mm' : 'GMT' }}
             </div>
         </div>
         <div class="plagiarism-run-details-stats-item">
-            <div class="plagiarism-run-details-label">
-                {{ 'artemisApp.plagiarism.startedBy' | artemisTranslate }}
-            </div>
+            <div class="plagiarism-run-details-label" jhiTranslate="artemisApp.plagiarism.startedBy"></div>
             <div class="plagiarism-run-details-info">
                 {{ plagiarismResultStats?.createdBy ?? 'unknown' }}
             </div>
@@ -69,15 +57,15 @@
                 (select)="onSelect($event)"
             >
                 <ng-template #tooltipTemplate let-model="model">
-                    <b>{{ 'artemisApp.plagiarism.numberIdentifiedPairs' | artemisTranslate: { amount: model.value } }} </b> <br />
-                    <span> {{ 'artemisApp.plagiarism.confirmed' | artemisTranslate: { amount: getBucketDTO(model.label).confirmed } }}</span> <br />
-                    <span> {{ 'artemisApp.plagiarism.denied' | artemisTranslate: { amount: getBucketDTO(model.label).denied } }}</span> <br />
-                    <span> {{ 'artemisApp.plagiarism.open' | artemisTranslate: { amount: getBucketDTO(model.label).open } }}</span> <br />
-                    <span>{{ 'artemisApp.plagiarism.withSimilarity' | artemisTranslate: { range: model.name } }}</span> <br />
-                    <b>{{
-                        'artemisApp.plagiarism.portionOfAllCases'
-                            | artemisTranslate: { percentage: totalDetectedPlagiarisms > 0 ? round((model.value * 100) / totalDetectedPlagiarisms, 2) : 0 }
-                    }}</b>
+                    <b jhiTranslate="artemisApp.plagiarism.numberIdentifiedPairs" [translateValues]="{ amount: model.value }"></b> <br />
+                    <span jhiTranslate="artemisApp.plagiarism.confirmed" [translateValues]="{ amount: getBucketDTO(model.label).confirmed }"></span> <br />
+                    <span jhiTranslate="artemisApp.plagiarism.denied" [translateValues]="{ amount: getBucketDTO(model.label).denied }"></span> <br />
+                    <span jhiTranslate="artemisApp.plagiarism.open" [translateValues]="{ amount: getBucketDTO(model.label).open }"></span> <br />
+                    <span jhiTranslate="artemisApp.plagiarism.withSimilarity" [translateValues]="{ range: model.name }"></span> <br />
+                    <b
+                        jhiTranslate="artemisApp.plagiarism.portionOfAllCases"
+                        [translateValues]="{ percentage: totalDetectedPlagiarisms > 0 ? round((model.value * 100) / totalDetectedPlagiarisms, 2) : 0 }"
+                    ></b>
                 </ng-template>
             </ngx-charts-bar-vertical>
         </div>
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-sidebar/plagiarism-sidebar.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-sidebar/plagiarism-sidebar.component.html
index ef1a22f6f05b..4d923eb90132 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-sidebar/plagiarism-sidebar.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-sidebar/plagiarism-sidebar.component.html
@@ -6,14 +6,14 @@
     @if (casesFiltered) {
         <div class="filter-disclaimer">
             <fa-icon class="text-warning disclaimer-icon" [icon]="faExclamationTriangle" />
-            <span>{{ 'artemisApp.plagiarism.casesFiltered' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.plagiarism.casesFiltered"></span>
         </div>
     }
     <!--  Temporary solution until #6593 is fixed  -->
     @if (comparisons?.length === 100) {
         <div class="filter-disclaimer">
             <fa-icon class="text-warning disclaimer-icon" [icon]="faExclamationTriangle" />
-            <span>{{ 'artemisApp.plagiarism.casesTrimmed' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.plagiarism.casesTrimmed"></span>
         </div>
     }
     @if (comparisons && comparisons.length) {
@@ -42,9 +42,7 @@
         </ul>
     }
     @if (!comparisons || !comparisons.length) {
-        <div class="plagiarism-empty">
-            {{ 'artemisApp.plagiarism.notFound' | artemisTranslate }}
-        </div>
+        <div class="plagiarism-empty" jhiTranslate="artemisApp.plagiarism.notFound"></div>
     }
     <div class="plagiarism-paging">
         <div class="plagiarism-paging-left" [class.disabled]="currentPage === 0" (click)="handlePageLeft()">
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/split-pane-header/split-pane-header.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/split-pane-header/split-pane-header.component.html
index 5b2de1e9f269..865d3dfe654c 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/split-pane-header/split-pane-header.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/split-pane-header/split-pane-header.component.html
@@ -16,7 +16,7 @@
                 </li>
             }
             @if (!hasFiles()) {
-                <li>{{ 'artemisApp.plagiarism.noFilesFound' | artemisTranslate }}</li>
+                <li jhiTranslate="artemisApp.plagiarism.noFilesFound"></li>
             }
         </ul>
     }
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html
index 4690d672a4e1..96315f6b7d57 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.html
@@ -8,9 +8,12 @@
     </div>
 }
 @if (!loading && !binaryFile!! && !cannotLoadFiles) {
-    <div class="text-submission-viewer" [innerHTML]="fileContent || ' '" [ngClass]="{ 'no-file': !fileContent, 'is-code': isProgrammingExercise }">
-        {{ 'artemisApp.plagiarism.noFileSelected' | artemisTranslate }}
-    </div>
+    <div
+        class="text-submission-viewer"
+        [innerHTML]="fileContent || ' '"
+        [ngClass]="{ 'no-file': !fileContent, 'is-code': isProgrammingExercise }"
+        jhiTranslate="artemisApp.plagiarism.noFileSelected"
+    ></div>
 }
 @if (loading && !cannotLoadFiles) {
     <div class="plagiarism-submission-loader">
@@ -21,7 +24,7 @@
 }
 @if (binaryFile && !cannotLoadFiles) {
     <div class="binaryFileDialogue">
-        <span class="me-1">{{ 'artemisApp.plagiarism.binaryFileNotRendered' | artemisTranslate }}</span>
-        <a class="text-primary" (click)="downloadCurrentFile()">{{ 'entity.action.download' | artemisTranslate }}</a>
+        <span class="me-1" jhiTranslate="artemisApp.plagiarism.binaryFileNotRendered"></span>
+        <a class="text-primary" (click)="downloadCurrentFile()" jhiTranslate="entity.action.download"></a>
     </div>
 }
diff --git a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts
index dc76831f9517..ba3fd8301876 100644
--- a/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts
+++ b/src/main/webapp/app/exercises/shared/plagiarism/plagiarism-split-view/text-submission-viewer/text-submission-viewer.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { FromToElement, TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { DomainChange, DomainType, FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { CodeEditorRepositoryFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
diff --git a/src/main/webapp/app/exercises/shared/rating/rating-list/rating-list.component.html b/src/main/webapp/app/exercises/shared/rating/rating-list/rating-list.component.html
index 1223db12741c..ad09e7a8e29a 100644
--- a/src/main/webapp/app/exercises/shared/rating/rating-list/rating-list.component.html
+++ b/src/main/webapp/app/exercises/shared/rating/rating-list/rating-list.component.html
@@ -2,7 +2,7 @@
     <div class="row justify-content-between">
         <div class="col-md-8">
             <h2>
-                <span>{{ 'artemisApp.ratingList.title' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.ratingList.title"></span>
             </h2>
         </div>
     </div>
@@ -10,7 +10,7 @@ <h2>
 <div class="col-12 mt-4">
     <div class="row table-responsive">
         <div [hidden]="ratings.length !== 0">
-            <span>{{ 'artemisApp.ratingList.noRatingToShow' | artemisTranslate }}</span>
+            <span jhiTranslate="artemisApp.ratingList.noRatingToShow"></span>
         </div>
         <table class="table" [hidden]="ratings.length === 0">
             <thead>
@@ -20,30 +20,30 @@ <h2>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.participation.exercise.title">
-                        <a class="th-link">{{ 'artemisApp.ratingList.exercise' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.ratingList.exercise"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.participation.exercise.type">
-                        <a class="th-link">{{ 'artemisApp.ratingList.exerciseType' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.ratingList.exerciseType"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.assessor.login">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.assessorLogin' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.assessorLogin"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="result.assessor.name">
-                        <a class="th-link">{{ 'artemisApp.complaint.listOfComplaints.assessorName' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.complaint.listOfComplaints.assessorName"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="rating.result.assessmentType">
-                        <a class="th-link">{{ 'artemisApp.ratingList.assessmentType' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.ratingList.assessmentType"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                     <th jhiSortBy="rating">
-                        <a class="th-link">{{ 'artemisApp.ratingList.rating' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.ratingList.rating"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
-                    <th class="text-center">{{ 'artemisApp.ratingList.actions' | artemisTranslate }}</th>
+                    <th class="text-center" jhiTranslate="artemisApp.ratingList.actions"></th>
                 </tr>
             </thead>
             <tbody>
@@ -73,7 +73,7 @@ <h2>
                         <td class="text-center">
                             <button class="btn btn-primary btn-sm" (click)="openResult(rating)">
                                 <fa-icon [icon]="faFolderOpen" [fixedWidth]="true" />
-                                <span>{{ 'artemisApp.ratingList.openSubmission' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.ratingList.openSubmission"></span>
                             </button>
                         </td>
                     </tr>
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.html b/src/main/webapp/app/exercises/shared/result/result.component.html
index f335b5b72c0e..acdaa2cb76fe 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.html
+++ b/src/main/webapp/app/exercises/shared/result/result.component.html
@@ -80,45 +80,48 @@
             <span [class]="textColorClass" id="test-late">
                 <fa-icon [icon]="resultIconClass" size="lg" />
                 <span class="score"> {{ resultString }}, </span>
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.exerciseLateFeedback' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseLateFeedback"></span>
             </span>
         }
         @case (ResultTemplateStatus.SUBMITTED) {
-            <span id="test-submitted" class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.exerciseSubmitted' | artemisTranslate }}</span>
+            <span id="test-submitted" class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseSubmitted"></span>
         }
         @case (ResultTemplateStatus.SUBMITTED_WAITING_FOR_GRADING) {
-            <span id="test-submitted-waiting-grading" class="text-body-secondary">{{
-                'artemisApp.courseOverview.exerciseList.exerciseSubmittedWaitingForGrading' | artemisTranslate
-            }}</span>
+            <span id="test-submitted-waiting-grading" class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseSubmittedWaitingForGrading"></span>
         }
         @case (ResultTemplateStatus.LATE_NO_FEEDBACK) {
-            <span id="test-late-no-feedback" class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.exerciseLateSubmission' | artemisTranslate }}</span>
+            <span id="test-late-no-feedback" class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseLateSubmission"></span>
         }
         @case (ResultTemplateStatus.MISSING) {
             <span class="text-danger">
                 <fa-icon [icon]="faExclamationCircle" size="lg" />&nbsp;
                 @switch (missingResultInfo) {
                     @case (MissingResultInfo.FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE) {
-                        <span [ngbTooltip]="'artemisApp.result.missing.programmingFailedSubmission.tooltipOnlineIde' | artemisTranslate">{{
-                            'artemisApp.result.missing.programmingFailedSubmission.message' | artemisTranslate
-                        }}</span>
+                        <span
+                            [ngbTooltip]="'artemisApp.result.missing.programmingFailedSubmission.tooltipOnlineIde' | artemisTranslate"
+                            jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"
+                        ></span>
                     }
                     @case (MissingResultInfo.FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE) {
-                        <span [ngbTooltip]="'artemisApp.result.missing.programmingFailedSubmission.tooltipOfflineIde' | artemisTranslate">{{
-                            'artemisApp.result.missing.programmingFailedSubmission.message' | artemisTranslate
-                        }}</span>
+                        <span
+                            [ngbTooltip]="'artemisApp.result.missing.programmingFailedSubmission.tooltipOfflineIde' | artemisTranslate"
+                            jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"
+                        ></span>
                     }
                 }
                 @if (result && exercise?.type !== ExerciseType.QUIZ) {
-                    <span [ngClass]="{ 'clickable-result': !isInSidebarCard }" class="result" (click)="showDetails(result)">
-                        {{ 'artemisApp.result.missing.viewPrevious' | artemisTranslate }}
-                    </span>
+                    <span
+                        [ngClass]="{ 'clickable-result': !isInSidebarCard }"
+                        class="result"
+                        (click)="showDetails(result)"
+                        jhiTranslate="artemisApp.result.missing.viewPrevious"
+                    ></span>
                 }
             </span>
         }
         @default {
             <span class="text-body-secondary">
-                <span> {{ (showUngradedResults ? 'artemisApp.result.noResult' : 'artemisApp.result.noGradedResult') | artemisTranslate }}</span>
+                <span jhiTranslate="{{ showUngradedResults ? 'artemisApp.result.noResult' : 'artemisApp.result.noGradedResult' }}"></span>
             </span>
         }
     }
diff --git a/src/main/webapp/app/exercises/shared/result/result.component.ts b/src/main/webapp/app/exercises/shared/result/result.component.ts
index 9bad543faa64..b323a640b21e 100644
--- a/src/main/webapp/app/exercises/shared/result/result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.component.ts
@@ -3,11 +3,11 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici
 import { MissingResultInformation, ResultTemplateStatus, evaluateTemplateStatus, getResultIconClass, getTextColorClass } from 'app/exercises/shared/result/result.utils';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import dayjs from 'dayjs/esm';
 import { isProgrammingExerciseStudentParticipation, isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
 import { Participation, ParticipationType, getExercise } from 'app/entities/participation/participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Submission, SubmissionExerciseType } from 'app/entities/submission.model';
 import { Exercise, ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model';
 import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component';
diff --git a/src/main/webapp/app/exercises/shared/result/result.service.ts b/src/main/webapp/app/exercises/shared/result/result.service.ts
index 72390f6979c8..800fe1b4aecd 100644
--- a/src/main/webapp/app/exercises/shared/result/result.service.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.service.ts
@@ -14,8 +14,8 @@ import { convertDateFromClient, convertDateFromServer } from 'app/utils/date.uti
 import { TranslateService } from '@ngx-translate/core';
 import { roundValueSpecifiedByCourseSettings } from 'app/shared/util/utils';
 import { isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { captureException } from '@sentry/angular';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import { SubmissionService } from 'app/exercises/shared/submission/submission.service';
diff --git a/src/main/webapp/app/exercises/shared/result/result.utils.ts b/src/main/webapp/app/exercises/shared/result/result.utils.ts
index 9a997cd2be69..b8b43ed63c80 100644
--- a/src/main/webapp/app/exercises/shared/result/result.utils.ts
+++ b/src/main/webapp/app/exercises/shared/result/result.utils.ts
@@ -4,9 +4,9 @@ import { StudentParticipation } from 'app/entities/participation/student-partici
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
 import { isProgrammingExerciseStudentParticipation, isResultPreliminary } from 'app/exercises/programming/shared/utils/programming-exercise.utils';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Submission, SubmissionExerciseType } from 'app/entities/submission.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheckCircle, faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
@@ -16,7 +16,7 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import dayjs from 'dayjs/esm';
 import { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model';
-import { TestCaseResult } from 'app/entities/test-case-result.model';
+import { TestCaseResult } from 'app/entities/programming/test-case-result.model';
 
 /**
  * Enumeration object representing the possible options that
diff --git a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts
index 375582cb5132..55cde780b0ec 100644
--- a/src/main/webapp/app/exercises/shared/result/updating-result.component.ts
+++ b/src/main/webapp/app/exercises/shared/result/updating-result.component.ts
@@ -6,7 +6,7 @@ import { RepositoryService } from 'app/exercises/shared/result/repository.servic
 import dayjs from 'dayjs/esm';
 import { ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/exercises/programming/participate/programming-submission.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ResultService } from 'app/exercises/shared/result/result.service';
 import { Submission, SubmissionType } from 'app/entities/submission.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html
index be9cf1f0e6cd..a339415dfbd0 100644
--- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html
+++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.html
@@ -46,27 +46,27 @@
                                     <thead>
                                         <tr>
                                             <th width="10%">
-                                                <span>{{ 'artemisApp.exercise.credits' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.credits"></span>
                                                 <jhi-help-icon text="artemisApp.exercise.creditsHint" class="me-1" />
                                             </th>
                                             <th width="10%">
-                                                <span>{{ 'artemisApp.exercise.gradingScale' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.gradingScale"></span>
                                                 <jhi-help-icon text="artemisApp.exercise.gradingScaleHint" class="me-1" />
                                             </th>
                                             <th width="30%">
-                                                <span>{{ 'artemisApp.exercise.instructionDescription' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.instructionDescription"></span>
                                                 <jhi-help-icon text="artemisApp.exercise.descriptionHint" class="me-1" />
                                             </th>
                                             <th width="30%">
-                                                <span>{{ 'artemisApp.exercise.feedback' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.feedback"></span>
                                                 <jhi-help-icon text="artemisApp.exercise.feedbackHint" class="me-1" />
                                             </th>
                                             <th width="10%">
-                                                <span>{{ 'artemisApp.exercise.limit' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.limit"></span>
                                                 <jhi-help-icon text="artemisApp.exercise.usageCountHint" class="me-1" />
                                             </th>
                                             <th width="5%">
-                                                <span>{{ 'artemisApp.exercise.action' | artemisTranslate }}</span>
+                                                <span jhiTranslate="artemisApp.exercise.action"></span>
                                             </th>
                                         </tr>
                                     </thead>
@@ -151,15 +151,17 @@
             <!--- Edit Text Mode --->
             @if (!showEditMode) {
                 <div>
-                    <jhi-markdown-editor
+                    <jhi-markdown-editor-monaco
                         #markdownEditor
                         class="markdown-editor"
                         [markdown]="markdownEditorText"
                         [showPreviewButton]="false"
                         [showEditButton]="false"
-                        [domainCommands]="domainCommands"
+                        [domainActions]="domainActionsForMainEditor"
+                        [enableResize]="false"
+                        [initialEditorHeight]="MarkdownEditorHeight.MEDIUM"
                         (markdownChange)="prepareForSave()"
-                        (textWithDomainCommandsFound)="domainCommandsFound($event)"
+                        (textWithDomainActionsFound)="onDomainActionsFound($event)"
                     />
                 </div>
             }
@@ -172,13 +174,13 @@
     <div class="edit-sqi">
         <div class="grading-instructions-update-border">
             <div class="instructions pb-2 row-cols-2">
-                <jhi-markdown-editor
+                <jhi-markdown-editor-monaco
                     #markdownEditor
                     class="editor col-md-8"
                     [markdown]="markdownEditorText"
-                    [domainCommands]="domainCommandsGradingInstructions"
+                    [domainActions]="domainActionsForGradingInstructionParsing"
                     (markdownChange)="prepareForSave()"
-                    (textWithDomainCommandsFound)="setExerciseGradingInstructionText($event)"
+                    (textWithDomainActionsFound)="setExerciseGradingInstructionText($event)"
                     [enableFileUpload]="false"
                     [showEditButton]="false"
                     [showPreviewButton]="false"
@@ -189,7 +191,7 @@
                     <div class="criteria-content pb-2">
                         <div class="row">
                             <div class="col-md-10 text-start">
-                                <div class="input-group" style="height: 33px; width: 75%">
+                                <div class="input-group mb-1" [style.width.%]="75">
                                     <input
                                         class="form-control"
                                         type="text"
@@ -216,22 +218,25 @@
                         </div>
                         @if (criteria.structuredGradingInstructions!) {
                             <div>
-                                @for (instruction of criteria.structuredGradingInstructions; track instruction) {
+                                @for (instruction of criteria.structuredGradingInstructions; track instruction; let index = $index) {
                                     <div>
-                                        <div class="instructions row-cols-2">
-                                            <jhi-markdown-editor
+                                        <div class="instructions row-cols-2 mb-1">
+                                            <jhi-markdown-editor-monaco
                                                 #markdownEditors
                                                 class="editor col-md-8"
-                                                [metaCommands]="[]"
-                                                [defaultCommands]="[]"
-                                                [headerCommands]="[]"
-                                                [colorCommands]="[]"
+                                                [metaActions]="[]"
+                                                [defaultActions]="[]"
+                                                [headerActions]="undefined"
+                                                [colorAction]="undefined"
                                                 [showEditButton]="false"
                                                 [showPreviewButton]="false"
-                                                [domainCommands]="domainCommandsGradingInstructions"
+                                                [domainActions]="[]"
                                                 (markdownChange)="prepareForSave()"
-                                                (textWithDomainCommandsFound)="onInstructionChange($event, instruction)"
+                                                (textWithDomainActionsFound)="onInstructionChange($event, instruction)"
                                                 [enableFileUpload]="false"
+                                                [enableResize]="false"
+                                                [resizableMinHeight]="MarkdownEditorHeight.INLINE"
+                                                [linkEditorHeightToContentHeight]="true"
                                             />
                                             <div class="form-group text-center col-md-4" style="display: block">
                                                 <span class="re-evaluate-button" id="reset-button" (click)="resetInstruction(instruction, criteria)">
diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss
index 6ec55ecf1d9e..74e64144c104 100644
--- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss
+++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.scss
@@ -37,10 +37,6 @@
             width: auto;
         }
 
-        .input-group > input {
-            height: 100%;
-        }
-
         .form-group {
             display: flex;
             align-items: center;
diff --git a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts
index 0215dcbfe5d5..7f6fa6f89ccd 100644
--- a/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts
+++ b/src/main/webapp/app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component.ts
@@ -1,18 +1,18 @@
 import { AfterContentInit, ChangeDetectorRef, Component, Input, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
-import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command';
-import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command';
-import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model';
-import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand';
-import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command';
-import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command';
-import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand';
 import { Exercise } from 'app/entities/exercise.model';
 import { cloneDeep } from 'lodash-es';
 import { faPlus, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons';
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action';
+import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action';
+import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action';
+import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action';
+import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action';
+import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action';
 
 @Component({
     selector: 'jhi-grading-instructions-details',
@@ -20,45 +20,43 @@ import { faPlus, faTrash, faUndo } from '@fortawesome/free-solid-svg-icons';
     styleUrls: ['./grading-instructions-details.component.scss'],
 })
 export class GradingInstructionsDetailsComponent implements OnInit, AfterContentInit {
-    /** Ace Editor configuration constants **/
-    markdownEditorText = '';
     @ViewChildren('markdownEditors')
-    private markdownEditors: QueryList<MarkdownEditorComponent>;
+    private markdownEditors: QueryList<MarkdownEditorMonacoComponent>;
     @ViewChild('markdownEditor', { static: false })
-    private markdownEditor: MarkdownEditorComponent;
+    private markdownEditor: MarkdownEditorMonacoComponent;
     @Input()
     exercise: Exercise;
     private instructions: GradingInstruction[];
     private criteria: GradingCriterion[];
 
     backupExercise: Exercise;
-
-    gradingCriterionCommand = new GradingCriterionCommand();
-    gradingInstructionCommand = new GradingInstructionCommand();
-    creditsCommand = new CreditsCommand();
-    gradingScaleCommand = new GradingScaleCommand();
-    instructionDescriptionCommand = new InstructionDescriptionCommand();
-    feedbackCommand = new FeedbackCommand();
-    usageCountCommand = new UsageCountCommand();
-
+    markdownEditorText = '';
     showEditMode: boolean;
 
-    domainCommands: DomainCommand[] = [
-        this.creditsCommand,
-        this.gradingScaleCommand,
-        this.instructionDescriptionCommand,
-        this.feedbackCommand,
-        this.usageCountCommand,
-        this.gradingCriterionCommand,
-        this.gradingInstructionCommand,
+    creditsAction = new MonacoGradingCreditsAction();
+    gradingScaleAction = new MonacoGradingScaleAction();
+    descriptionAction = new MonacoGradingDescriptionAction();
+    feedbackAction = new MonacoGradingFeedbackAction();
+    usageCountAction = new MonacoGradingUsageCountAction();
+    gradingInstructionAction = new MonacoGradingInstructionAction(this.creditsAction, this.gradingScaleAction, this.descriptionAction, this.feedbackAction, this.usageCountAction);
+    gradingCriterionAction = new MonacoGradingCriterionAction(this.gradingInstructionAction);
+
+    domainActionsForMainEditor = [
+        this.creditsAction,
+        this.gradingScaleAction,
+        this.descriptionAction,
+        this.feedbackAction,
+        this.usageCountAction,
+        this.gradingInstructionAction,
+        this.gradingCriterionAction,
     ];
 
-    domainCommandsGradingInstructions: DomainCommand[] = [
-        this.creditsCommand,
-        this.gradingScaleCommand,
-        this.instructionDescriptionCommand,
-        this.feedbackCommand,
-        this.usageCountCommand,
+    domainActionsForGradingInstructionParsing: MonacoEditorDomainAction[] = [
+        this.creditsAction,
+        this.gradingScaleAction,
+        this.descriptionAction,
+        this.feedbackAction,
+        this.usageCountAction,
     ];
 
     // Icons
@@ -66,6 +64,8 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     faTrash = faTrash;
     faUndo = faUndo;
 
+    protected readonly MarkdownEditorHeight = MarkdownEditorHeight;
+
     constructor(private changeDetector: ChangeDetectorRef) {}
 
     ngOnInit() {
@@ -87,7 +87,7 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         this.changeDetector.detectChanges();
         this.criteria!.forEach((criterion) => {
             criterion.structuredGradingInstructions.forEach((instruction) => {
-                this.markdownEditors.get(index)!.markdownTextChange(this.generateInstructionText(instruction));
+                this.markdownEditors.get(index)!.markdown = this.generateInstructionText(instruction);
                 index += 1;
             });
         });
@@ -99,10 +99,10 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         if (this.exercise.gradingCriteria) {
             for (const criterion of this.exercise.gradingCriteria) {
                 if (criterion.title == undefined) {
-                    // if it is a dummy criterion, leave out the command identifier
+                    // if it is a dummy criterion, leave out the action identifier
                     markdownText += this.generateInstructionsMarkdown(criterion);
                 } else {
-                    markdownText += GradingCriterionCommand.IDENTIFIER + criterion.title + '\n' + '\t' + this.generateInstructionsMarkdown(criterion);
+                    markdownText += `${MonacoGradingCriterionAction.IDENTIFIER} ${criterion.title}\n\t${this.generateInstructionsMarkdown(criterion)}`;
                 }
             }
         }
@@ -130,7 +130,7 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     generateInstructionText(instruction: GradingInstruction): string {
         let markdownText = '';
         markdownText =
-            GradingInstructionCommand.IDENTIFIER +
+            MonacoGradingInstructionAction.IDENTIFIER +
             '\n' +
             '\t' +
             this.generateCreditsText(instruction) +
@@ -152,59 +152,52 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     }
 
     generateCreditsText(instruction: GradingInstruction): string {
+        const creditsText = MonacoGradingCreditsAction.TEXT;
+        const creditsIdentifier = MonacoGradingCreditsAction.IDENTIFIER;
         if (instruction.credits == undefined) {
-            instruction.credits = parseFloat(CreditsCommand.TEXT);
-            return CreditsCommand.IDENTIFIER + ' ' + CreditsCommand.TEXT;
+            instruction.credits = parseFloat(creditsText) || 0;
         }
-        return CreditsCommand.IDENTIFIER + ' ' + instruction.credits;
+        return `${creditsIdentifier} ${instruction.credits || creditsText}`;
     }
 
     generateGradingScaleText(instruction: GradingInstruction): string {
         if (instruction.gradingScale == undefined) {
-            instruction.gradingScale = GradingScaleCommand.TEXT;
-            return GradingScaleCommand.IDENTIFIER + ' ' + GradingScaleCommand.TEXT;
+            instruction.gradingScale = MonacoGradingScaleAction.TEXT;
         }
-        return GradingScaleCommand.IDENTIFIER + ' ' + instruction.gradingScale;
+        return `${MonacoGradingScaleAction.IDENTIFIER} ${instruction.gradingScale}`;
     }
 
     generateInstructionDescriptionText(instruction: GradingInstruction): string {
         if (instruction.instructionDescription == undefined) {
-            instruction.instructionDescription = InstructionDescriptionCommand.TEXT;
-            return InstructionDescriptionCommand.IDENTIFIER + ' ' + InstructionDescriptionCommand.TEXT;
+            instruction.instructionDescription = MonacoGradingDescriptionAction.TEXT;
         }
-        return InstructionDescriptionCommand.IDENTIFIER + ' ' + instruction.instructionDescription;
+        return `${MonacoGradingDescriptionAction.IDENTIFIER} ${instruction.instructionDescription}`;
     }
 
     generateInstructionFeedback(instruction: GradingInstruction): string {
         if (instruction.feedback == undefined) {
-            instruction.feedback = FeedbackCommand.TEXT;
-            return FeedbackCommand.IDENTIFIER + ' ' + FeedbackCommand.TEXT;
+            instruction.feedback = MonacoGradingFeedbackAction.TEXT;
         }
-        return FeedbackCommand.IDENTIFIER + ' ' + instruction.feedback;
+        return `${MonacoGradingFeedbackAction.IDENTIFIER} ${instruction.feedback}`;
     }
 
     generateUsageCount(instruction: GradingInstruction): string {
         if (instruction.usageCount == undefined) {
-            instruction.usageCount = parseInt(UsageCountCommand.TEXT, 10);
-            return UsageCountCommand.IDENTIFIER + ' ' + UsageCountCommand.TEXT;
+            instruction.usageCount = parseInt(MonacoGradingUsageCountAction.TEXT, 10) || 0;
         }
-        return UsageCountCommand.IDENTIFIER + ' ' + instruction.usageCount;
+        return `${MonacoGradingUsageCountAction.IDENTIFIER} ${instruction.usageCount}`;
     }
 
     initializeExerciseGradingInstructionText(): string {
-        if (this.exercise.gradingInstructions) {
-            return this.exercise.gradingInstructions + '\n\n';
-        } else {
-            return 'Add Assessment Instruction text here' + '\n\n';
-        }
+        return `${this.exercise.gradingInstructions || 'Add Assessment Instruction text here'}\n\n`;
     }
 
     prepareForSave(): void {
         this.cleanupExerciseGradingInstructions();
-        this.markdownEditor.parse();
+        this.markdownEditor.parseMarkdown();
         if (this.exercise.gradingInstructionFeedbackUsed) {
             this.markdownEditors.forEach((component) => {
-                component.parse();
+                component.parseMarkdown(this.domainActionsForGradingInstructionParsing);
             });
         }
     }
@@ -217,37 +210,33 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         this.exercise.gradingInstructions = undefined;
     }
 
-    hasCriterionCommand(domainCommands: [string, DomainCommand | null][]): boolean {
-        return domainCommands.some(([, command]) => command instanceof GradingCriterionCommand);
+    hasCriterionAction(textWithDomainActions: TextWithDomainAction[]): boolean {
+        return textWithDomainActions.some(({ action }) => action instanceof MonacoGradingCriterionAction);
     }
 
     /**
-     * @function createSubInstructionCommands
-     * @desc 1. divides the input: domainCommands in two subarrays:
-     *          instructionCommands, which consists of all stand-alone instructions
-     *          criteriaCommands, which consists of instructions that belong to a criterion
-     *       2. for each subarrray a method is called to create the criterion and instruction objects
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Creates criterion and instruction objects based on the parsed markdown text.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    createSubInstructionCommands(domainCommands: [string, DomainCommand | null][]): void {
-        let instructionCommands;
-        let criteriaCommands;
-        let endOfInstructionsCommand = 0;
-        if (!this.hasCriterionCommand(domainCommands)) {
-            this.setParentForInstructionsWithNoCriterion(domainCommands);
+    createSubInstructionActions(textWithDomainActions: TextWithDomainAction[]): void {
+        let instructionActions;
+        let criterionActions;
+        let endOfInstructionsAction = 0;
+        if (!this.hasCriterionAction(textWithDomainActions)) {
+            this.setParentForInstructionsWithNoCriterion(textWithDomainActions);
         } else {
-            for (const [, command] of domainCommands) {
-                endOfInstructionsCommand++;
-                this.setExerciseGradingInstructionText(domainCommands);
-                if (command instanceof GradingCriterionCommand) {
-                    instructionCommands = domainCommands.slice(0, endOfInstructionsCommand - 1);
-                    if (instructionCommands.length !== 0) {
-                        this.setParentForInstructionsWithNoCriterion(instructionCommands);
+            for (const { action } of textWithDomainActions) {
+                endOfInstructionsAction++;
+                this.setExerciseGradingInstructionText(textWithDomainActions);
+                if (action instanceof MonacoGradingCriterionAction) {
+                    instructionActions = textWithDomainActions.slice(0, endOfInstructionsAction - 1);
+                    if (instructionActions.length !== 0) {
+                        this.setParentForInstructionsWithNoCriterion(instructionActions);
                     }
-                    criteriaCommands = domainCommands.slice(endOfInstructionsCommand - 1);
-                    if (criteriaCommands.length !== 0) {
+                    criterionActions = textWithDomainActions.slice(endOfInstructionsAction - 1);
+                    if (criterionActions.length !== 0) {
                         this.instructions = []; // resets the instructions array to be filled with the instructions of the criteria
-                        this.groupInstructionsToCriteria(criteriaCommands); // creates criterion object for each criterion and their corresponding instruction objects
+                        this.groupInstructionsToCriteria(criterionActions);
                     }
                     break;
                 }
@@ -256,14 +245,13 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     }
 
     /**
-     * @function setParentForInstructionsWithNoCriterion
-     * @desc 1. creates a dummy criterion object for each stand-alone instruction
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Creates a dummy grading criterion object for each instruction that does not belong to a criterion and assigns the instruction to it.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    setParentForInstructionsWithNoCriterion(domainCommands: [string, DomainCommand | null][]): void {
-        for (const [, command] of domainCommands) {
-            this.setExerciseGradingInstructionText(domainCommands);
-            if (command instanceof GradingInstructionCommand) {
+    setParentForInstructionsWithNoCriterion(textWithDomainActions: TextWithDomainAction[]): void {
+        for (const { action } of textWithDomainActions) {
+            this.setExerciseGradingInstructionText(textWithDomainActions);
+            if (action instanceof MonacoGradingInstructionAction) {
                 const dummyCriterion = new GradingCriterion();
                 const newInstruction = new GradingInstruction();
                 dummyCriterion.structuredGradingInstructions = [];
@@ -273,68 +261,63 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
             }
         }
         this.exercise.gradingCriteria = this.criteria;
-        this.setInstructionParameters(domainCommands);
+        this.setInstructionParameters(textWithDomainActions);
     }
 
     /**
-     * @function groupInstructionsToCriteria
-     * @desc 1. creates a criterion for each GradingCriterionCommandIdentifier
-     *          and creates the instruction objects of this criterion then assigns them to their parent criterion
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Creates a grading criterion object for each criterion action found in the parsed markdown text and assigns the corresponding grading instructions to it.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    groupInstructionsToCriteria(domainCommands: [string, DomainCommand | null][]): void {
-        const initialCriteriaCommands = domainCommands;
+    groupInstructionsToCriteria(textWithDomainActions: TextWithDomainAction[]): void {
+        const initialCriterionActions = textWithDomainActions;
         if (this.exercise.gradingCriteria == undefined) {
             this.exercise.gradingCriteria = [];
         }
-        for (const [text, command] of domainCommands) {
-            if (command instanceof GradingCriterionCommand) {
+        for (const { text, action } of textWithDomainActions) {
+            if (action instanceof MonacoGradingCriterionAction) {
                 const newCriterion = new GradingCriterion();
                 newCriterion.title = text;
                 this.exercise.gradingCriteria.push(newCriterion);
                 newCriterion.structuredGradingInstructions = [];
-                const modifiedArray = domainCommands.slice(1); // remove GradingCriterionCommandIdentifier after creating its criterion object
+                const arrayWithoutCriterion = textWithDomainActions.slice(1); // remove the identifier after creating its criterion object
                 let endOfCriterion = 0;
-                for (const [, instrCommand] of modifiedArray) {
+                for (const remainingTextWithDomainAction of arrayWithoutCriterion) {
+                    const instrAction = remainingTextWithDomainAction.action;
                     endOfCriterion++;
-                    if (instrCommand instanceof GradingInstructionCommand) {
+                    if (instrAction instanceof MonacoGradingInstructionAction) {
                         const newInstruction = new GradingInstruction(); // create instruction objects that belong to the above created criterion
                         newCriterion.structuredGradingInstructions.push(newInstruction);
                         this.instructions.push(newInstruction);
                     }
-                    if (instrCommand instanceof GradingCriterionCommand) {
-                        domainCommands = domainCommands.slice(endOfCriterion, domainCommands.length);
+                    if (instrAction instanceof MonacoGradingCriterionAction) {
+                        textWithDomainActions = textWithDomainActions.slice(endOfCriterion, textWithDomainActions.length);
                         break;
                     }
                 }
             }
         }
-        this.setInstructionParameters(initialCriteriaCommands.filter(([, command]) => !(command instanceof GradingCriterionCommand)));
+        this.setInstructionParameters(initialCriterionActions.filter(({ action }) => !(action instanceof MonacoGradingCriterionAction)));
     }
 
     /**
-     * @function setInstructionParameters
-     * @desc 1. Gets a tuple of text and domainCommandIdentifiers not including GradingCriterionCommandIdentifiers and assigns text values according to the domainCommandIdentifiers
-     *       2. The tuple order is the same as the order of the commands in the markdown text inserted by the user
-     *       instruction objects must be created before the method gets triggered
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Sets the parameters of the GradingInstruction objects based on the parsed markdown text. Note that the instruction objects must be created before this method is called.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-
-    setInstructionParameters(domainCommands: [string, DomainCommand | null][]): void {
+    setInstructionParameters(textWithDomainActions: TextWithDomainAction[]): void {
         let index = 0;
-        for (const [text, command] of domainCommands) {
+        for (const { text, action } of textWithDomainActions) {
             if (!this.instructions[index]) {
                 break;
             }
-            if (command instanceof CreditsCommand) {
+            if (action instanceof MonacoGradingCreditsAction) {
                 this.instructions[index].credits = parseFloat(text);
-            } else if (command instanceof GradingScaleCommand) {
+            } else if (action instanceof MonacoGradingScaleAction) {
                 this.instructions[index].gradingScale = text;
-            } else if (command instanceof InstructionDescriptionCommand) {
+            } else if (action instanceof MonacoGradingDescriptionAction) {
                 this.instructions[index].instructionDescription = text;
-            } else if (command instanceof FeedbackCommand) {
+            } else if (action instanceof MonacoGradingFeedbackAction) {
                 this.instructions[index].feedback = text;
-            } else if (command instanceof UsageCountCommand) {
+            } else if (action instanceof MonacoGradingUsageCountAction) {
                 this.instructions[index].usageCount = parseInt(text, 10);
                 index++; // index must be increased after the last parameter of the instruction to continue with the next instruction object
             }
@@ -342,28 +325,19 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     }
 
     /**
-     * @function domainCommandsFound
-     * @desc 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers
-     *       2. The tuple order is the same as the order of the commands in the markdown text inserted by the user
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Updates the grading instructions of the exercise based on the parsed markdown text.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    domainCommandsFound(domainCommands: [string, DomainCommand | null][]): void {
+    onDomainActionsFound(textWithDomainActions: TextWithDomainAction[]): void {
         this.instructions = [];
         this.criteria = [];
         this.exercise.gradingCriteria = [];
-        this.createSubInstructionCommands(domainCommands);
+        this.createSubInstructionActions(textWithDomainActions);
     }
 
-    /**
-     * @function onInstructionChange
-     * @desc 1. Gets a tuple of text and domainCommandIdentifiers and assigns text values according to the domainCommandIdentifiers
-     *       2. The tuple order is the same as the order of the commands in the markdown text inserted by the user
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
-     * @param {GradingInstruction} instruction
-     */
-    onInstructionChange(domainCommands: [string, DomainCommand | null][], instruction: GradingInstruction): void {
+    onInstructionChange(textWithDomainActions: TextWithDomainAction[], instruction: GradingInstruction): void {
         this.instructions = [instruction];
-        this.setInstructionParameters(domainCommands);
+        this.setInstructionParameters(textWithDomainActions);
     }
 
     /**
@@ -423,9 +397,8 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
     }
 
     /**
-     * @function addNewInstruction
-     * @desc Adds new grading instruction for desired grading criteria
-     * @param criterion {GradingCriterion} the criteria, which includes the instruction that will be inserted
+     * Adds a new grading instruction for the specified grading criterion.
+     * @param criterion The grading criterion that contains the instruction to insert.
      */
     addNewInstruction(criterion: GradingCriterion) {
         const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion);
@@ -438,10 +411,6 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         this.initializeMarkdown();
     }
 
-    /**
-     * @function addNewGradingCriteria
-     * @desc Adds new grading criteria for the exercise
-     */
     addNewGradingCriterion() {
         const criterion = new GradingCriterion();
         criterion.structuredGradingInstructions = [];
@@ -453,21 +422,11 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         }
     }
 
-    /**
-     * @function onCriteriaTitleChange
-     * @desc Detects changes for grading criteria title
-     * @param {GradingCriterion} criterion the criteria, which includes title that will be changed
-     */
     onCriterionTitleChange($event: any, criterion: GradingCriterion) {
         const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion);
         this.exercise.gradingCriteria![criterionIndex].title = $event.target.value;
     }
 
-    /**
-     * @function resetCriteriaTitle
-     * @desc Resets the whole grading criteria title
-     * @param criterion {GradingCriterion} the criteria, which includes title that will be reset
-     */
     resetCriterionTitle(criterion: GradingCriterion) {
         const criterionIndex = this.findCriterionIndex(criterion, this.exercise);
         const backupCriterionIndex = this.findCriterionIndex(criterion, this.backupExercise);
@@ -478,24 +437,21 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         }
     }
 
-    /**
-     * @function deleteGradingCriteria
-     * @desc Deletes the grading criteria with sub-grading instructions
-     * @param criterion {GradingCriterion} the criteria, which will be deleted
-     */
     deleteGradingCriterion(criterion: GradingCriterion) {
         const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion);
         this.exercise.gradingCriteria!.splice(criterionIndex, 1);
     }
 
     /**
-     * @function setExerciseGradingInstructionText
-     * @desc Gets a tuple of text and domainCommandIdentifiers and assigns text values as grading instructions of exercise
-     * @param domainCommands containing tuples of [text, domainCommandIdentifiers]
+     * Extracts the exercise grading instruction text from the start of the parsed markdown text.
+     * @param textWithDomainActions The parsed text segments with their corresponding domain actions.
      */
-    setExerciseGradingInstructionText(domainCommands: [string, DomainCommand | null][]): void {
-        const [text, command] = domainCommands[0];
-        if (command === null && text.length > 0) {
+    setExerciseGradingInstructionText(textWithDomainActions: TextWithDomainAction[]): void {
+        if (!textWithDomainActions.length) {
+            return;
+        }
+        const { text, action } = textWithDomainActions[0];
+        if (action === undefined && text.length > 0) {
             this.exercise.gradingInstructions = text;
         }
     }
@@ -509,12 +465,6 @@ export class GradingInstructionsDetailsComponent implements OnInit, AfterContent
         this.markdownEditorText = this.generateMarkdown();
     }
 
-    /**
-     * Updates given grading instruction in exercise
-     *
-     * @param instruction needs to be updated
-     * @param criterion includes instruction needs to be updated
-     */
     updateGradingInstruction(instruction: GradingInstruction, criterion: GradingCriterion) {
         const criterionIndex = this.exercise.gradingCriteria!.indexOf(criterion);
         const instructionIndex = this.exercise.gradingCriteria![criterionIndex].structuredGradingInstructions.indexOf(instruction);
diff --git a/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts b/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts
index 0271a489f45f..08961c9407d6 100644
--- a/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts
+++ b/src/main/webapp/app/exercises/shared/submission-policy/submission-policy-update.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { LockRepositoryPolicy, SubmissionPenaltyPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 
 @Component({
@@ -18,9 +18,9 @@ import { FormControl, FormGroup, Validators } from '@angular/forms';
                 id="field_submissionPolicy"
                 [disabled]="!editable"
             >
-                <option value="none">{{ 'artemisApp.programmingExercise.submissionPolicy.none.optionLabel' | artemisTranslate }}</option>
-                <option value="lock_repository">{{ 'artemisApp.programmingExercise.submissionPolicy.lockRepository.optionLabel' | artemisTranslate }}</option>
-                <option value="submission_penalty">{{ 'artemisApp.programmingExercise.submissionPolicy.submissionPenalty.optionLabel' | artemisTranslate }}</option>
+                <option value="none" jhiTranslate="artemisApp.programmingExercise.submissionPolicy.none.optionLabel"></option>
+                <option value="lock_repository" jhiTranslate="artemisApp.programmingExercise.submissionPolicy.lockRepository.optionLabel"></option>
+                <option value="submission_penalty" jhiTranslate="artemisApp.programmingExercise.submissionPolicy.submissionPenalty.optionLabel"></option>
             </select>
         </div>
         @if (!isNonePolicy) {
diff --git a/src/main/webapp/app/exercises/shared/submission/submission.service.ts b/src/main/webapp/app/exercises/shared/submission/submission.service.ts
index 4ab2d0ccdf10..d2cad659ac83 100644
--- a/src/main/webapp/app/exercises/shared/submission/submission.service.ts
+++ b/src/main/webapp/app/exercises/shared/submission/submission.service.ts
@@ -5,7 +5,7 @@ import { createRequestOption } from 'app/shared/util/request.util';
 import { Result } from 'app/entities/result.model';
 import { Submission, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model';
 import { filter, map, tap } from 'rxjs/operators';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { ComplaintResponseService } from 'app/complaints/complaint-response.service';
diff --git a/src/main/webapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss b/src/main/webapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss
index 574b3a2ed27f..f2535c3285e2 100644
--- a/src/main/webapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss
+++ b/src/main/webapp/app/exercises/shared/team/team-participate/team-students-online-list.component.scss
@@ -35,20 +35,20 @@
     }
 
     .student-status {
-        @include status-change-transition;
-
         display: inline-flex;
         color: var(--secondary);
-    }
 
-    .student-name {
         @include status-change-transition;
+    }
 
+    .student-name {
         max-width: 190px;
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
         color: var(--secondary);
+
+        @include status-change-transition;
     }
 
     .online {
diff --git a/src/main/webapp/app/exercises/shared/team/team-participation-table/team-participation-table.component.html b/src/main/webapp/app/exercises/shared/team/team-participation-table/team-participation-table.component.html
index eaf550d3861b..370f1915587f 100644
--- a/src/main/webapp/app/exercises/shared/team/team-participation-table/team-participation-table.component.html
+++ b/src/main/webapp/app/exercises/shared/team/team-participation-table/team-participation-table.component.html
@@ -53,13 +53,9 @@
             <ngx-datatable-column [minWidth]="120" [width]="120" [maxWidth]="120" [frozenLeft]="true">
                 <ng-template ngx-datatable-cell-template let-value="row">
                     @if (exercise.id !== value.id) {
-                        <a (click)="onActivate()" [routerLink]="['/courses', course.id, 'exercises', value.id, 'teams', value.team.id]">
-                            {{ 'entity.action.view' | artemisTranslate }}
-                        </a>
+                        <a (click)="onActivate()" [routerLink]="['/courses', course.id, 'exercises', value.id, 'teams', value.team.id]" jhiTranslate="entity.action.view"></a>
                     } @else {
-                        <span class="current-team">
-                            {{ 'entity.action.view' | artemisTranslate }}
-                        </span>
+                        <span class="current-team" jhiTranslate="entity.action.view"></span>
                     }
                 </ng-template>
             </ngx-datatable-column>
@@ -67,9 +63,7 @@
                 <ngx-datatable-column prop="participation" [minWidth]="150" [width]="150" [maxWidth]="150">
                     <ng-template ngx-datatable-header-template>
                         <span class="datatable-header-cell-wrapper" (click)="controls.onSort('id')">
-                            <span class="datatable-header-cell-label bold sortable">
-                                {{ 'artemisApp.team.detail.participationsTable.columns.participationId.label' | artemisTranslate }}
-                            </span>
+                            <span class="datatable-header-cell-label bold sortable" jhiTranslate="artemisApp.team.detail.participationsTable.columns.participationId.label"></span>
                             <fa-icon [icon]="controls.iconForSortPropField('id')" />
                         </span>
                     </ng-template>
diff --git a/src/main/webapp/app/exercises/shared/team/teams-import-dialog/teams-import-dialog.component.html b/src/main/webapp/app/exercises/shared/team/teams-import-dialog/teams-import-dialog.component.html
index 129c574ad4ea..972d620dfc31 100644
--- a/src/main/webapp/app/exercises/shared/team/teams-import-dialog/teams-import-dialog.component.html
+++ b/src/main/webapp/app/exercises/shared/team/teams-import-dialog/teams-import-dialog.component.html
@@ -191,11 +191,13 @@ <h4 class="modal-title">
                         <div class="ms-2 radio-label-with-explanation">
                             <strong>
                                 {{ 'artemisApp.team.importStrategy.options.purgeExisting.label' | artemisTranslate }}
-                                <span class="badge bg-danger ms-1">{{ 'artemisApp.team.importStrategy.options.purgeExisting.badge' | artemisTranslate }}</span>
+                                <span class="badge bg-danger ms-1" jhiTranslate="artemisApp.team.importStrategy.options.purgeExisting.badge"></span>
                             </strong>
-                            <p [class.text-body-secondary]="importStrategy !== ImportStrategy.PURGE_EXISTING" class="explanation mb-2">
-                                {{ 'artemisApp.team.importStrategy.options.purgeExisting.explanation' | artemisTranslate }}
-                            </p>
+                            <p
+                                [class.text-body-secondary]="importStrategy !== ImportStrategy.PURGE_EXISTING"
+                                class="explanation mb-2"
+                                jhiTranslate="artemisApp.team.importStrategy.options.purgeExisting.explanation"
+                            ></p>
                         </div>
                     </label>
                     <label class="d-flex align-items-start">
@@ -210,11 +212,13 @@ <h4 class="modal-title">
                         <div class="ms-2 radio-label-with-explanation">
                             <strong>
                                 {{ 'artemisApp.team.importStrategy.options.createOnly.label' | artemisTranslate }}
-                                <span class="badge bg-success ms-1">{{ 'artemisApp.team.importStrategy.options.createOnly.badge' | artemisTranslate }}</span>
+                                <span class="badge bg-success ms-1" jhiTranslate="artemisApp.team.importStrategy.options.createOnly.badge"></span>
                             </strong>
-                            <p [class.text-body-secondary]="importStrategy !== ImportStrategy.CREATE_ONLY" class="explanation mb-0">
-                                {{ 'artemisApp.team.importStrategy.options.createOnly.explanation' | artemisTranslate }}
-                            </p>
+                            <p
+                                [class.text-body-secondary]="importStrategy !== ImportStrategy.CREATE_ONLY"
+                                class="explanation mb-0"
+                                jhiTranslate="artemisApp.team.importStrategy.options.createOnly.explanation"
+                            ></p>
                         </div>
                     </label>
                 </div>
@@ -226,28 +230,26 @@ <h4 class="modal-title">
             <div class="flex-shrink-0 me-2 d-flex">
                 @if (studentsAppearInMultipleTeams) {
                     <div>
-                        <strong>{{ 'artemisApp.team.importPreview.studentsInMultipleTeams' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.team.importPreview.studentsInMultipleTeams"></strong>
                     </div>
                 } @else {
                     @if (numberOfTeamsToBeImported! === 0) {
                         <div>
                             @if (sourceTeams.length === 0) {
-                                <strong>{{ 'artemisApp.team.importPreview.noTeamsToImport' | artemisTranslate }}</strong>
+                                <strong jhiTranslate="artemisApp.team.importPreview.noTeamsToImport"></strong>
                             }
                             @if (sourceTeams.length > 0) {
-                                <strong>{{ 'artemisApp.team.importPreview.noConflictFreeTeamsToImport' | artemisTranslate }}</strong>
+                                <strong jhiTranslate="artemisApp.team.importPreview.noConflictFreeTeamsToImport"></strong>
                             }
                         </div>
                     }
                     @if (numberOfTeamsToBeImported! > 0) {
                         @if (numberOfTeamsToBeDeleted! > 0) {
-                            <div class="me-3">
-                                <strong>{{ 'artemisApp.team.importPreview.teamsToBeDeleted' | artemisTranslate }}</strong> {{ numberOfTeamsToBeDeleted! }}
-                            </div>
+                            <div class="me-3"><strong jhiTranslate="artemisApp.team.importPreview.teamsToBeDeleted"></strong> {{ numberOfTeamsToBeDeleted! }}</div>
                         }
                         @if (numberOfTeamsToBeImported! !== numberOfTeamsAfterImport!) {
                             <div class="me-3">
-                                <strong>{{ 'artemisApp.team.importPreview.teamsToBeImported' | artemisTranslate }}</strong> {{ numberOfTeamsToBeImported! }}
+                                <strong jhiTranslate="artemisApp.team.importPreview.teamsToBeImported"></strong> {{ numberOfTeamsToBeImported! }}
                                 @if (numberOfTeamsToBeImported! < sourceTeams.length) {
                                     <span jhiTranslate="artemisApp.team.importPreview.outOf" [translateValues]="{ number: sourceTeams.length }">
                                         (out of {{ sourceTeams.length }})
@@ -255,9 +257,7 @@ <h4 class="modal-title">
                                 }
                             </div>
                         }
-                        <div>
-                            <strong>{{ 'artemisApp.team.importPreview.totalTeamsAfterImport' | artemisTranslate }}</strong> {{ numberOfTeamsAfterImport! }}
-                        </div>
+                        <div><strong jhiTranslate="artemisApp.team.importPreview.totalTeamsAfterImport"></strong> {{ numberOfTeamsAfterImport! }}</div>
                     }
                 }
             </div>
diff --git a/src/main/webapp/app/exercises/shared/team/teams.component.html b/src/main/webapp/app/exercises/shared/team/teams.component.html
index 75e445c5c04b..bf2c964ac2ac 100644
--- a/src/main/webapp/app/exercises/shared/team/teams.component.html
+++ b/src/main/webapp/app/exercises/shared/team/teams.component.html
@@ -7,11 +7,11 @@ <h2 class="mb-1">
             <div class="d-flex align-items-center">
                 <label class="radio-inline mb-0 d-flex align-items-center">
                     <input type="radio" [ngModel]="teamCriteria.filterProp" (click)="updateTeamFilter(FilterProp.ALL)" [value]="FilterProp.ALL" />
-                    <span class="ms-1">{{ 'artemisApp.team.filters.all' | artemisTranslate }}</span>
+                    <span class="ms-1" jhiTranslate="artemisApp.team.filters.all"></span>
                 </label>
                 <label class="radio-inline ms-2 mb-0 d-flex align-items-center">
                     <input type="radio" [ngModel]="teamCriteria.filterProp" (click)="updateTeamFilter(FilterProp.OWN)" [value]="FilterProp.OWN" />
-                    <span class="ms-1">{{ 'artemisApp.team.filters.own' | artemisTranslate }}</span>
+                    <span class="ms-1" jhiTranslate="artemisApp.team.filters.own"></span>
                 </label>
             </div>
         </div>
diff --git a/src/main/webapp/app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component.html b/src/main/webapp/app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component.html
index 684ca88ff890..0f6975db8be5 100644
--- a/src/main/webapp/app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component.html
+++ b/src/main/webapp/app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component.html
@@ -1,14 +1,17 @@
 <div (drop)="createAssessmentOnDrop($event)" (dragover)="$event.preventDefault()">
     <div class="col-md-6">
-        <button class="add-unreferenced-feedback btn btn-success mt-4" (click)="addUnreferencedFeedback()" [disabled]="readOnly">
-            {{ 'artemisApp.fileUploadAssessment.addFeedback' | artemisTranslate }}
-        </button>
+        <button
+            class="add-unreferenced-feedback btn btn-success mt-4"
+            (click)="addUnreferencedFeedback()"
+            [disabled]="readOnly"
+            jhiTranslate="artemisApp.fileUploadAssessment.addFeedback"
+        ></button>
         <div class="row mt-4">
             <h4 class="col-12" jhiTranslate="artemisApp.assessment.detail.feedback"></h4>
             @if (unreferencedFeedback.length + feedbackSuggestions.length === 0) {
                 <div class="col-12 col-lg-8 col-xl-6">
                     <div class="alert alert-secondary text-center" role="alert">
-                        <p>{{ 'artemisApp.fileUploadAssessment.assessInstructionWithDropOption' | artemisTranslate }}</p>
+                        <p jhiTranslate="artemisApp.fileUploadAssessment.assessInstructionWithDropOption"></p>
                     </div>
                 </div>
             }
diff --git a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts
index d37a8a428dd1..22178ca78f3c 100644
--- a/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts
+++ b/src/main/webapp/app/exercises/text/assess/analytics/text-assesment-analytics.service.ts
@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
-import { TextAssessmentEvent, TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEvent, TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { Location } from '@angular/common';
 
diff --git a/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts b/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts
index 094acf5431b8..5c9c22ab595f 100644
--- a/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { wordSelection } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component';
 
diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.html b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.html
index 48bcfce2053a..e170a8cd1f32 100644
--- a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.html
+++ b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.html
@@ -23,10 +23,11 @@
     />
 }
 <div>
-    <span class="badge bg-primary mb-2" id="text-assessment-word-count">
-        {{ 'artemisApp.textExercise.wordCount' | artemisTranslate: { count: wordCount } }}
-    </span>
-    <span class="badge bg-primary mb-2" id="text-assessment-character-count">
-        {{ 'artemisApp.textExercise.characterCount' | artemisTranslate: { count: characterCount } }}
-    </span>
+    <span class="badge bg-primary mb-2" id="text-assessment-word-count" jhiTranslate="artemisApp.textExercise.wordCount" [translateValues]="{ count: wordCount }"></span>
+    <span
+        class="badge bg-primary mb-2"
+        id="text-assessment-character-count"
+        jhiTranslate="artemisApp.textExercise.characterCount"
+        [translateValues]="{ count: characterCount }"
+    ></span>
 </div>
diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts
index f834639f59f0..200f7b69d95a 100644
--- a/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-assessment-area/text-assessment-area.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, HostListener, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { StringCountService } from 'app/exercises/text/participate/string-count.service';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 
diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts
index 69eb2bb1847a..8c1f564182d5 100644
--- a/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-assessment-base.component.ts
@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlock, TextBlockType } from 'app/entities/text-block.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Result } from 'app/entities/result.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
diff --git a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
index 8e2274337833..d996953e4cf6 100644
--- a/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-assessment.service.ts
@@ -6,11 +6,11 @@ import { Result } from 'app/entities/result.model';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { TextBlock } from 'app/entities/text-block.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { Submission, getLatestSubmissionResult, getSubmissionResultByCorrectionRound, getSubmissionResultById, setLatestSubmissionResult } from 'app/entities/submission.model';
 import { Participation } from 'app/entities/participation/participation.model';
-import { TextAssessmentEvent } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEvent } from 'app/entities/text/text-assesment-event.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { convertDateFromServer } from 'app/utils/date.utils';
 
diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
index f35fe3bb044d..875555a1492c 100644
--- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.component.ts
@@ -6,8 +6,8 @@ import { AlertService } from 'app/core/util/alert.service';
 import dayjs from 'dayjs/esm';
 import { AccountService } from 'app/core/auth/account.service';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Result } from 'app/entities/result.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { ComplaintService } from 'app/complaints/complaint.service';
@@ -34,9 +34,9 @@ import { Course } from 'app/entities/course.model';
 import { isAllowedToModifyFeedback } from 'app/assessment/assessment.service';
 import { faListAlt } from '@fortawesome/free-regular-svg-icons';
 import { AssessmentAfterComplaint } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { AthenaService } from 'app/assessment/athena.service';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { Subscription } from 'rxjs';
 
 @Component({
diff --git a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts
index 517009175196..83e63bcd21b1 100644
--- a/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts
+++ b/src/main/webapp/app/exercises/text/assess/text-submission-assessment.route.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { of } from 'rxjs';
 import { UserRouteAccessService } from 'app/core/auth/user-route-access-service';
 import { TextSubmissionAssessmentComponent } from './text-submission-assessment.component';
diff --git a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts
index 1498affd1415..2a34e2b47136 100644
--- a/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component.ts
@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component';
 import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { ActivatedRoute } from '@angular/router';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
diff --git a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts
index f99baf73f449..72d8ef60ad19 100644
--- a/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component.ts
@@ -1,11 +1,11 @@
 import { AfterViewInit, Component, ElementRef, EventEmitter, HostBinding, Input, Output, ViewChild } from '@angular/core';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component';
 import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute } from '@angular/router';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { faAngleRight, faEdit, faExclamation, faExclamationTriangle, faLightbulb, faQuestionCircle, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
diff --git a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.html b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.html
index 878e6050d678..b723733cb65e 100644
--- a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.html
+++ b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.html
@@ -3,7 +3,7 @@
         <div class="col-6">
             <h2>
                 @if (isNewSubmission) {
-                    <span>{{ 'artemisApp.exampleSubmission.createNew' | artemisTranslate }} </span>
+                    <span jhiTranslate="artemisApp.exampleSubmission.createNew"></span>
                 }
                 {{ 'artemisApp.exampleSubmission.pageHeader' | artemisTranslate }}
                 {{ exercise?.title }}
@@ -11,7 +11,7 @@ <h2>
             @if (state.ui === UIStates.ASSESSMENT && toComplete && referencedBlocksInExampleSubmission && referencedBlocksInExampleSubmission.length > 0) {
                 <div class="col">
                     <div class="my-2 text-center hint">
-                        <span>{{ 'artemisApp.exampleSubmission.textHint' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.exampleSubmission.textHint"></span>
                     </div>
                 </div>
             }
@@ -20,7 +20,7 @@ <h2>
             <div class="col-4 text-end d-flex align-items-center gap-2 justify-content-end">
                 <div>
                     <div class="text-start">
-                        <span>{{ 'artemisApp.exampleSubmission.assessmentTraining' | artemisTranslate }}</span>
+                        <span jhiTranslate="artemisApp.exampleSubmission.assessmentTraining"></span>
                         <jhi-help-icon [text]="'artemisApp.exampleSubmission.selectModelExplanation'" />
                     </div>
                     <div class="btn-group" role="group">
@@ -35,7 +35,7 @@ <h2>
                             [ngModel]="selectedMode"
                             (ngModelChange)="onModeChange($event)"
                         />
-                        <label class="btn btn-outline-secondary" for="read-and-confirm-button">{{ 'artemisApp.exampleSubmission.readAndConfirm' | artemisTranslate }}</label>
+                        <label class="btn btn-outline-secondary" for="read-and-confirm-button" jhiTranslate="artemisApp.exampleSubmission.readAndConfirm"></label>
                         <input
                             [disabled]="state.submissionEditButton === 3"
                             type="radio"
@@ -47,7 +47,7 @@ <h2>
                             [ngModel]="selectedMode"
                             (ngModelChange)="onModeChange($event)"
                         />
-                        <label class="btn btn-outline-secondary" for="only-not-imported">{{ 'artemisApp.exampleSubmission.assessCorrectly' | artemisTranslate }}</label>
+                        <label class="btn btn-outline-secondary" for="only-not-imported" jhiTranslate="artemisApp.exampleSubmission.assessCorrectly"></label>
                     </div>
                 </div>
                 @switch (state.submissionEditButton) {
@@ -102,7 +102,7 @@ <h2>
     </div>
 </div>
 @if (toComplete) {
-    <h5 class="fw-light mt-3">{{ 'artemisApp.exampleSubmission.home.assessmentTraining' | artemisTranslate }}</h5>
+    <h5 class="fw-light mt-3" jhiTranslate="artemisApp.exampleSubmission.home.assessmentTraining"></h5>
 }
 <jhi-resizeable-container class="col-12 mt-3">
     <!--region Left Panel-->
@@ -163,9 +163,13 @@ <h5 class="fw-light mt-3">{{ 'artemisApp.exampleSubmission.home.assessmentTraini
 }
 @if (toComplete) {
     <div class="col-12 text-end pt-2">
-        <button class="btn btn-primary col-3 guided-tour-check-assessment" (click)="checkAssessment()" [disabled]="!assessmentsAreValid" id="checkAssessment">
-            {{ 'artemisApp.exampleSubmission.submitAssessment' | artemisTranslate }}
-        </button>
+        <button
+            class="btn btn-primary col-3 guided-tour-check-assessment"
+            (click)="checkAssessment()"
+            [disabled]="!assessmentsAreValid"
+            id="checkAssessment"
+            jhiTranslate="artemisApp.exampleSubmission.submitAssessment"
+        ></button>
     </div>
 }
 @if (readOnly) {
diff --git a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts
index 3db47679dc4a..1640da7b1978 100644
--- a/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/example-text-submission/example-text-submission.component.ts
@@ -11,8 +11,8 @@ import { tutorAssessmentTour } from 'app/guided-tour/tours/tutor-assessment-tour
 import { ExampleSubmission, ExampleSubmissionMode } from 'app/entities/example-submission.model';
 import { Feedback, FeedbackCorrectionError, FeedbackType } from 'app/entities/feedback.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import { setLatestSubmissionResult } from 'app/entities/submission.model';
 import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-assessment-base.component';
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
index 72a0414b70fe..4199461314b2 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-detail.component.ts
@@ -3,7 +3,7 @@ import { SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute } from '@angular/router';
 import { HttpResponse } from '@angular/common/http';
 import { Subscription } from 'rxjs';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TextExerciseService } from './text-exercise.service';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts
index df3c7f767a84..ed167d578dd0 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-paging.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExercisePagingService } from 'app/exercises/shared/manage/exercise-paging.service';
 
 @Injectable({ providedIn: 'root' })
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts
index fff2f2a799f8..00e2973a5cc6 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component.ts
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { Subject } from 'rxjs';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { faBook, faTable, faTrash, faUsers, faWrench } from '@fortawesome/free-solid-svg-icons';
 import { faListAlt } from '@fortawesome/free-regular-svg-icons';
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html
index 2e5a417b7c41..9200b885485c 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.html
@@ -33,12 +33,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.mode" id="artemisApp.exercise.sec
         <h3 jhiTranslate="artemisApp.exercise.sections.problem" id="artemisApp.exercise.sections.problem"></h3>
         <div class="form-group">
             <label jhiTranslate="artemisApp.exercise.problemStatement" for="problemStatement"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 id="problemStatement"
                 class="markdown-editor"
-                [domainCommands]="domainCommandsProblemStatement"
+                [domainActions]="domainActionsProblemStatement"
                 [(markdown)]="textExercise.problemStatement"
-                [editorMode]="EditorMode.LATEX"
                 (markdownChange)="calculateFormSectionStatus()"
             />
         </div>
@@ -57,12 +56,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.problem" id="artemisApp.exercise.
         <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise.sections.solution"></h3>
         <div class="form-group">
             <label jhiTranslate="artemisApp.exercise.exampleSolution" for="exampleSolution"></label>
-            <jhi-markdown-editor
+            <jhi-markdown-editor-monaco
                 id="exampleSolution"
                 class="markdown-editor"
-                [domainCommands]="domainCommandsSampleSolution"
+                [domainActions]="domainActionsExampleSolution"
                 [(markdown)]="textExercise.exampleSolution"
-                [editorMode]="EditorMode.LATEX"
                 (markdownChange)="calculateFormSectionStatus()"
             />
         </div>
@@ -78,7 +76,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.solution" id="artemisApp.exercise
                     (valueChange)="validateDate()"
                 />
                 @if (textExercise.exampleSolutionPublicationDateError) {
-                    <span class="invalid-feedback">{{ 'artemisApp.exercise.exampleSolutionPublicationDateError' | artemisTranslate }}</span>
+                    <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.exampleSolutionPublicationDateError"></span>
                 }
             </div>
         }
@@ -112,7 +110,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="textExercise.startDate"
                     />
                     @if (textExercise.startDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.startDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.startDateError"></span>
                     }
                 </div>
             </div>
@@ -131,7 +129,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="textExercise.dueDate"
                     />
                     @if (textExercise.dueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.dueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.dueDateError"></span>
                     }
                 </div>
                 <div class="form-group flex-grow-1 ms-3">
@@ -148,13 +146,13 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="textExercise.assessmentDueDate"
                     />
                     @if (textExercise.assessmentDueDateError) {
-                        <span class="invalid-feedback">{{ 'artemisApp.exercise.assessmentDueDateError' | artemisTranslate }}</span>
+                        <span class="invalid-feedback" jhiTranslate="artemisApp.exercise.assessmentDueDateError"></span>
                     }
                 </div>
             </div>
         }
         <div class="form-group">
-            <label class="form-control-label">{{ 'artemisApp.exercise.includedInOverallScore' + (textExercise.course ? 'Course' : 'Exam') + 'Label' | artemisTranslate }}</label>
+            <label class="form-control-label" jhiTranslate="artemisApp.exercise.includedInOverallScore{{ textExercise.course ? 'Course' : 'Exam' }}Label"></label>
             <div>
                 <jhi-included-in-overall-score-picker
                     [(includedInOverallScore)]="textExercise.includedInOverallScore"
@@ -179,9 +177,7 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         [(ngModel)]="textExercise.maxPoints"
                     />
                     @if (points?.invalid && (points?.dirty || points?.touched) && points?.errors) {
-                        <div class="alert alert-danger">
-                            {{ 'artemisApp.exercise.pointsError' | artemisTranslate }}
-                        </div>
+                        <div class="alert alert-danger" jhiTranslate="artemisApp.exercise.pointsError"></div>
                     }
                 </div>
             </div>
@@ -200,9 +196,11 @@ <h3 jhiTranslate="artemisApp.exercise.sections.grading" id="artemisApp.exercise.
                         #bonusPoints="ngModel"
                     />
                     @if (bonusPoints?.invalid && (bonusPoints?.dirty || bonusPoints?.touched) && bonusPoints?.errors) {
-                        <div class="alert alert-danger" [hidden]="textExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY">
-                            {{ 'artemisApp.exercise.bonusPointsError' | artemisTranslate }}
-                        </div>
+                        <div
+                            class="alert alert-danger"
+                            [hidden]="textExercise.includedInOverallScore !== IncludedInOverallScore.INCLUDED_COMPLETELY"
+                            jhiTranslate="artemisApp.exercise.bonusPointsError"
+                        ></div>
                     }
                 </div>
             </div>
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts
index 21011cacb571..a9304c422e89 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise-update.component.ts
@@ -1,14 +1,12 @@
-import { AfterViewInit, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { HttpErrorResponse } from '@angular/common/http';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TextExerciseService } from './text-exercise.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ExerciseMode, IncludedInOverallScore, resetForImport } from 'app/entities/exercise.model';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { switchMap, tap } from 'rxjs/operators';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { NgForm, NgModel } from '@angular/forms';
@@ -31,10 +29,12 @@ import { FormSectionStatus } from 'app/forms/form-status-bar/form-status-bar.com
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 
 @Component({
     selector: 'jhi-text-exercise-update',
     templateUrl: './text-exercise-update.component.html',
+    changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterViewInit {
     readonly IncludedInOverallScore = IncludedInOverallScore;
@@ -56,7 +56,6 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView
     isExamMode: boolean;
     isImport = false;
     goBackAfterSaving = false;
-    EditorMode = EditorMode;
     AssessmentType = AssessmentType;
     isAthenaEnabled$: Observable<boolean> | undefined;
 
@@ -67,8 +66,8 @@ export class TextExerciseUpdateComponent implements OnInit, OnDestroy, AfterView
     existingCategories: ExerciseCategory[];
     notificationText?: string;
 
-    domainCommandsProblemStatement = [new KatexCommand()];
-    domainCommandsSampleSolution = [new KatexCommand()];
+    domainActionsProblemStatement = [new MonacoFormulaAction()];
+    domainActionsExampleSolution = [new MonacoFormulaAction()];
 
     formSectionStatus: FormSectionStatus[];
 
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts
index 7714fe2a28eb..ac46f89650d7 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TextExerciseService } from './text-exercise.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts
index 67c3f64a6dd4..2e3198bc4186 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.route.ts
@@ -2,7 +2,7 @@ import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router';
 import { UserRouteAccessService } from 'app/core/auth/user-route-access-service';
 import { TextExerciseDetailComponent } from './text-exercise-detail.component';
 import { TextExerciseUpdateComponent } from './text-exercise-update.component';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Injectable } from '@angular/core';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
diff --git a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts
index 6cdfb5c91e95..994f1ac75eeb 100644
--- a/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts
+++ b/src/main/webapp/app/exercises/text/manage/text-exercise/text-exercise.service.ts
@@ -3,7 +3,7 @@ import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { createRequestOption } from 'app/shared/util/request.util';
 import { ExerciseServicable, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult';
diff --git a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
index 08be104f935c..82d8de5b26cf 100644
--- a/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-editor.component.ts
@@ -14,10 +14,10 @@ import { TextSubmissionService } from 'app/exercises/text/participate/text-submi
 import { ComponentCanDeactivate } from 'app/shared/guard/can-deactivate.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ButtonType } from 'app/shared/components/button.component';
 import { Result } from 'app/entities/result.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { StringCountService } from 'app/exercises/text/participate/string-count.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { getFirstResultWithComplaint, getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model';
diff --git a/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts b/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts
index 2ed52a5002fa..33960c213bcc 100644
--- a/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-result/text-result-block.ts
@@ -1,7 +1,7 @@
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { faCheck, faCheckCircle, faCircle, faDotCircle, faTimes, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
 import { Feedback } from 'app/entities/feedback.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { convertToHtmlLinebreaks, escapeString } from 'app/utils/text.utils';
 
 enum FeedbackType {
diff --git a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts
index 681266e5ef85..c63aaece1335 100644
--- a/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-result/text-result.component.ts
@@ -1,10 +1,10 @@
 import { Component, Input } from '@angular/core';
 import { Feedback, buildFeedbackTextForReview, checkSubsequentFeedbackInAssessment } from 'app/entities/feedback.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import { TextResultBlock } from './text-result-block';
 import { TranslateService } from '@ngx-translate/core';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { faExclamationTriangle } from '@fortawesome/free-solid-svg-icons';
 import { LocaleConversionService } from 'app/shared/service/locale-conversion.service';
 import { Course } from 'app/entities/course.model';
diff --git a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts
index 26d493d36b75..2c90d0c7188c 100644
--- a/src/main/webapp/app/exercises/text/participate/text-submission.service.ts
+++ b/src/main/webapp/app/exercises/text/participate/text-submission.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { createRequestOption } from 'app/shared/util/request.util';
 import { stringifyCircular } from 'app/shared/util/utils';
 import { getLatestSubmissionResult, setLatestSubmissionResult } from 'app/entities/submission.model';
diff --git a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts
index d4cd37b3b8a6..1a846ba58988 100644
--- a/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts
+++ b/src/main/webapp/app/exercises/text/shared/manual-text-selection/manual-text-selection.component.ts
@@ -1,10 +1,10 @@
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { ActivatedRoute } from '@angular/router';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { TextBlockRefGroup } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component';
 
 export type wordSelection = {
diff --git a/src/main/webapp/app/feature-overview/feature-overview.component.html b/src/main/webapp/app/feature-overview/feature-overview.component.html
index 990dbda9f0cd..52eab3bfe420 100644
--- a/src/main/webapp/app/feature-overview/feature-overview.component.html
+++ b/src/main/webapp/app/feature-overview/feature-overview.component.html
@@ -1,6 +1,6 @@
 <div class="wrapper">
     <div class="header">
-        <h1>{{ 'featureOverview.title' | artemisTranslate }}</h1>
+        <h1 jhiTranslate="featureOverview.title"></h1>
     </div>
     <div class="content mx-auto">
         <div class="features-overview">
@@ -17,7 +17,7 @@ <h3 class="title">{{ feature.title | artemisTranslate }}</h3>
                 </div>
             }
         </div>
-        <h2>{{ 'featureOverview.featureDetails' | artemisTranslate }}</h2>
+        <h2 jhiTranslate="featureOverview.featureDetails"></h2>
         @for (feature of features; track feature) {
             <div id="feature{{ feature.id }}" class="feature-content">
                 <h3>{{ feature.title | artemisTranslate }}</h3>
diff --git a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
index a2497a318085..edd4cffc59e1 100644
--- a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
+++ b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.html
@@ -1,20 +1,19 @@
-<div class="form-status-bar-container pt-2 pb-1">
-    <hr class="form-status-line" />
-    <div class="d-flex justify-content-between">
-        @for (formStatusSection of formStatusSections; track formStatusSection.title) {
-            <div class="d-flex flex-column align-items-center">
-                <div
-                    class="d-flex align-items-center justify-content-center border rounded-circle border-secondary form-status-circle"
-                    (click)="scrollToHeadline(formStatusSection.title)"
-                >
-                    <jhi-checklist-check
-                        [checkAttribute]="formStatusSection.valid"
-                        [iconColor]="formStatusSection.empty && formStatusSection.valid ? 'var(--bs-gray)' : undefined"
-                        class="fa-sm"
-                    />
+@if (formStatusSections) {
+    <div #statusBar class="form-status-bar-container pt-2 pb-1">
+        <hr class="form-status-line" />
+        <div class="d-flex justify-content-between">
+            @for (formStatusSection of formStatusSections; track formStatusSection.title; let index = $index) {
+                <div class="d-flex flex-column align-items-center" id="status-bar-section-item-{{ index }}">
+                    <div class="form-status-circle border rounded-circle" (click)="scrollToHeadline(formStatusSection.title)">
+                        <jhi-checklist-check
+                            [checkAttribute]="formStatusSection.valid"
+                            [iconColor]="formStatusSection.empty && formStatusSection.valid ? 'var(--bs-gray)' : undefined"
+                            class="fa-sm position-absolute top-50 start-50 translate-middle"
+                        />
+                    </div>
+                    <a (click)="scrollToHeadline(formStatusSection.title)" class="d-none d-sm-inline link-primary">{{ formStatusSection.title | artemisTranslate }}</a>
                 </div>
-                <a (click)="scrollToHeadline(formStatusSection.title)" class="d-none d-sm-inline link-primary">{{ formStatusSection.title | artemisTranslate }}</a>
-            </div>
-        }
+            }
+        </div>
     </div>
-</div>
+}
diff --git a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.scss b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.scss
index c4049cd93601..43b8b2720cec 100644
--- a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.scss
+++ b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.scss
@@ -16,8 +16,8 @@
 .form-status-circle {
     position: relative;
     z-index: 8;
-    height: 28px;
-    width: 28px;
+    height: 1.5rem;
+    width: 1.5rem;
     background-color: var(--bs-card-bg);
     cursor: pointer;
 }
diff --git a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
index 0e41d2f84710..ff512756dd83 100644
--- a/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
+++ b/src/main/webapp/app/forms/form-status-bar/form-status-bar.component.ts
@@ -1,4 +1,5 @@
-import { AfterViewInit, Component, HostListener, Input } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, HostListener, Input, ViewChild } from '@angular/core';
+import { updateHeaderHeight } from 'app/shared/util/navbar.util';
 
 export type FormSectionStatus = {
     title: string;
@@ -15,23 +16,28 @@ export class FormStatusBarComponent implements AfterViewInit {
     @Input()
     formStatusSections: FormSectionStatus[];
 
+    @ViewChild('statusBar', { static: false }) statusBar?: ElementRef;
+
     @HostListener('window:resize')
-    onResize() {
-        setTimeout(() => {
-            const headerHeight = (document.querySelector('jhi-navbar') as HTMLElement).offsetHeight;
-            document.documentElement.style.setProperty('--header-height', `${headerHeight}px`);
-        });
+    onResizeAddDistanceFromStatusBarToNavbar() {
+        updateHeaderHeight();
     }
 
     ngAfterViewInit() {
-        this.onResize();
+        this.onResizeAddDistanceFromStatusBarToNavbar();
     }
 
     scrollToHeadline(id: string) {
         const element = document.getElementById(id);
         if (element) {
-            element.style.scrollMarginTop = 'calc(2rem + 78px)';
-            element.scrollIntoView();
+            const navbarHeight = (document.querySelector('jhi-navbar') as HTMLElement)?.getBoundingClientRect().height;
+            const statusBarHeight = this.statusBar?.nativeElement.getBoundingClientRect().height;
+
+            /** Needs to be applied to the scrollMarginTop to ensure that the scroll to element is not hidden behind header elements */
+            const scrollOffsetInPx = navbarHeight + statusBarHeight;
+
+            element.style.scrollMarginTop = `${scrollOffsetInPx}px`;
+            element.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' });
         }
     }
 }
diff --git a/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts b/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts
index a53bc9c26f75..21e2a3aef781 100644
--- a/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts
+++ b/src/main/webapp/app/grading-system/base-grading-system/base-grading-system.component.ts
@@ -9,7 +9,7 @@ import { HttpResponse } from '@angular/common/http';
 import { catchError, finalize } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { download, generateCsv, mkConfig } from 'export-to-csv';
diff --git a/src/main/webapp/app/grading-system/bonus/bonus.component.html b/src/main/webapp/app/grading-system/bonus/bonus.component.html
index 938d819d26e3..2676e6a068e1 100644
--- a/src/main/webapp/app/grading-system/bonus/bonus.component.html
+++ b/src/main/webapp/app/grading-system/bonus/bonus.component.html
@@ -11,7 +11,7 @@
     }
 </ng-template>
 <article class="bonus-form-start">
-    <h2>{{ 'artemisApp.bonus.title' | artemisTranslate }}</h2>
+    <h2 jhiTranslate="artemisApp.bonus.title"></h2>
     <div class="row mt-4">
         <div class="bonus-form-step col-1"></div>
         <div class="form-group col">
@@ -61,10 +61,10 @@ <h2>{{ 'artemisApp.bonus.title' | artemisTranslate }}</h2>
                 <table class="table table-striped">
                     <thead>
                         <tr>
-                            <th>{{ 'artemisApp.exam.examSummary.bonus' | artemisTranslate }}</th>
-                            <th>{{ 'artemisApp.exam.examSummary.interval' | artemisTranslate }}</th>
+                            <th jhiTranslate="artemisApp.exam.examSummary.bonus"></th>
+                            <th jhiTranslate="artemisApp.exam.examSummary.interval"></th>
                             @if (hasPointsSet()) {
-                                <th>{{ 'artemisApp.exam.examSummary.intervalPoints' | artemisTranslate }}</th>
+                                <th jhiTranslate="artemisApp.exam.examSummary.intervalPoints"></th>
                             }
                         </tr>
                     </thead>
@@ -87,7 +87,7 @@ <h2>{{ 'artemisApp.bonus.title' | artemisTranslate }}</h2>
             </div>
         }
         @if (bonus.bonusStrategy && bonus.sourceGradingScale && bonus.weight) {
-            <h5 class="mb-0">{{ 'artemisApp.bonus.formula.title' | artemisTranslate }}</h5>
+            <h5 class="mb-0" jhiTranslate="artemisApp.bonus.formula.title"></h5>
             @if (bonus.bonusStrategy && bonus.weight && bonusToGradeStepsDTO) {
                 <div class="fs-3 mb-4">
                     <div class="d-flex pb-2 align-items-center">
@@ -113,13 +113,9 @@ <h5 class="mb-0">{{ 'artemisApp.bonus.formula.title' | artemisTranslate }}</h5>
                         </div>
                     </div>
                     @if (bonus.bonusStrategy === BonusStrategy.POINTS) {
-                        <div class="row fs-6 ps-2">
-                            {{ 'artemisApp.bonus.formula.finalGradeFromPoints' | artemisTranslate }}
-                        </div>
+                        <div class="row fs-6 ps-2" jhiTranslate="artemisApp.bonus.formula.finalGradeFromPoints"></div>
                     }
-                    <div class="row fs-6 ps-2">
-                        {{ 'artemisApp.bonus.formula.finalGradeLimit' | artemisTranslate: { maxPossibleGrade: maxPossibleGrade() } }}
-                    </div>
+                    <div class="row fs-6 ps-2" jhiTranslate="artemisApp.bonus.formula.finalGradeLimit" [translateValues]="{ maxPossibleGrade: maxPossibleGrade() }"></div>
                 </div>
             }
             @if (hasBonusStrategyWeightMismatch) {
@@ -127,19 +123,19 @@ <h5 class="mb-0">{{ 'artemisApp.bonus.formula.title' | artemisTranslate }}</h5>
             }
             @if (examples.length) {
                 <div>
-                    <h5>{{ 'artemisApp.bonus.examples.title' | artemisTranslate }}</h5>
-                    <p class="mb-1">{{ 'artemisApp.bonus.examples.helpText' | artemisTranslate }}</p>
+                    <h5 jhiTranslate="artemisApp.bonus.examples.title"></h5>
+                    <p class="mb-1" jhiTranslate="artemisApp.bonus.examples.helpText"></p>
                     <table class="table table-striped">
                         <thead>
                             <tr>
-                                <th>{{ 'artemisApp.bonus.examples.examPoints' | artemisTranslate }}</th>
-                                <th>{{ 'artemisApp.bonus.examples.examGrade' | artemisTranslate }}</th>
-                                <th>{{ 'artemisApp.bonus.examples.bonusSourceStudentPoints' | artemisTranslate }}</th>
-                                <th>{{ 'artemisApp.bonus.examples.bonusGrade' | artemisTranslate }}</th>
+                                <th jhiTranslate="artemisApp.bonus.examples.examPoints"></th>
+                                <th jhiTranslate="artemisApp.bonus.examples.examGrade"></th>
+                                <th jhiTranslate="artemisApp.bonus.examples.bonusSourceStudentPoints"></th>
+                                <th jhiTranslate="artemisApp.bonus.examples.bonusGrade"></th>
                                 @if (currentBonusStrategyOption === BonusStrategyOption.POINTS) {
-                                    <th>{{ 'artemisApp.bonus.examples.finalPoints' | artemisTranslate }}</th>
+                                    <th jhiTranslate="artemisApp.bonus.examples.finalPoints"></th>
                                 }
-                                <th>{{ 'artemisApp.bonus.examples.finalGrade' | artemisTranslate }}</th>
+                                <th jhiTranslate="artemisApp.bonus.examples.finalGrade"></th>
                             </tr>
                         </thead>
                         <tbody>
diff --git a/src/main/webapp/app/grading-system/bonus/bonus.component.scss b/src/main/webapp/app/grading-system/bonus/bonus.component.scss
index e4be0728ad57..609f5fcf18fd 100644
--- a/src/main/webapp/app/grading-system/bonus/bonus.component.scss
+++ b/src/main/webapp/app/grading-system/bonus/bonus.component.scss
@@ -8,11 +8,6 @@ $numbering-margin: calc($numbering-size / 2 - $numbering-border); // To make num
 }
 
 .bonus-form-step {
-    &::before {
-        counter-increment: bonus-step-counter;
-        content: counter(bonus-step-counter);
-    }
-
     border-radius: $numbering-size;
     width: $numbering-size;
     height: $numbering-size;
@@ -20,6 +15,11 @@ $numbering-margin: calc($numbering-size / 2 - $numbering-border); // To make num
     border: $numbering-border solid;
     text-align: center;
     margin-left: $numbering-margin;
+
+    &::before {
+        counter-increment: bonus-step-counter;
+        content: counter(bonus-step-counter);
+    }
 }
 
 .bonus-calculated {
diff --git a/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html b/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html
index 88cc248eb61e..a1d61c9b289e 100644
--- a/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html
+++ b/src/main/webapp/app/grading-system/detailed-grading-system/detailed-grading-system.component.html
@@ -4,31 +4,21 @@
             <thead>
                 <tr>
                     <th>
-                        <span>
-                            {{ 'artemisApp.gradingSystem.min' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.gradingSystem.min"></span>
                     </th>
                     <th>
-                        <span>
-                            {{ 'artemisApp.gradingSystem.minPoints' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.gradingSystem.minPoints"></span>
                     </th>
                     <th>
-                        <span> {{ 'artemisApp.gradingSystem.max' | artemisTranslate }} </span>
+                        <span jhiTranslate="artemisApp.gradingSystem.max"></span>
                     </th>
                     <th>
-                        <span>
-                            {{ 'artemisApp.gradingSystem.maxPoints' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.gradingSystem.maxPoints"></span>
                     </th>
                     <th [colSpan]="2">
-                        <span>
-                            {{
-                                this.gradingScale.gradeType === GradeType.GRADE
-                                    ? ('artemisApp.gradingSystem.gradeName' | artemisTranslate)
-                                    : ('artemisApp.gradingSystem.bonusPoints' | artemisTranslate)
-                            }}
-                        </span>
+                        <span
+                            [jhiTranslate]="this.gradingScale.gradeType === GradeType.GRADE ? 'artemisApp.gradingSystem.gradeName' : 'artemisApp.gradingSystem.bonusPoints'"
+                        ></span>
                     </th>
                 </tr>
             </thead>
diff --git a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html
index e8d2049f27c0..9b959a75bbdb 100644
--- a/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html
+++ b/src/main/webapp/app/grading-system/grading-key-overview/grading-key-overview.component.html
@@ -5,7 +5,7 @@ <h1 class="text-center mb-3">
             {{ title }}
         </h1>
         @if (!isExam) {
-            <h6>{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}</h6>
+            <h6 jhiTranslate="artemisApp.gradingSystem.overview.info"></h6>
         }
         <jhi-grade-key-table />
         <button type="button" class="btn btn-secondary" (click)="previousState()"><fa-icon [icon]="faChevronLeft" />&nbsp;<span jhiTranslate="entity.action.back"></span></button>
diff --git a/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html b/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html
index 299ba8a449c5..96f12a89ac13 100644
--- a/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html
+++ b/src/main/webapp/app/grading-system/grading-key-overview/grading-key/grading-key-table.component.html
@@ -1,15 +1,15 @@
 <div>
     @if (!isExam) {
-        <h6>{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}</h6>
+        <h6 jhiTranslate="artemisApp.gradingSystem.overview.info"></h6>
     }
     <div>
         <table class="table table-striped w-auto">
             <thead>
                 <tr>
-                    <th>{{ isBonus ? ('artemisApp.exam.examSummary.bonus' | artemisTranslate) : ('artemisApp.exam.examSummary.grade' | artemisTranslate) }}</th>
-                    <th>{{ 'artemisApp.exam.examSummary.interval' | artemisTranslate }}</th>
+                    <th jhiTranslate="{{ isBonus ? 'artemisApp.exam.examSummary.bonus' : 'artemisApp.exam.examSummary.grade' }}"></th>
+                    <th jhiTranslate="artemisApp.exam.examSummary.interval"></th>
                     @if (hasPointsSet) {
-                        <th>{{ 'artemisApp.exam.examSummary.intervalPoints' | artemisTranslate }}</th>
+                        <th jhiTranslate="artemisApp.exam.examSummary.intervalPoints"></th>
                     }
                 </tr>
             </thead>
@@ -57,7 +57,7 @@ <h6>{{ 'artemisApp.gradingSystem.overview.info' | artemisTranslate }}</h6>
         </table>
     </div>
     <div>
-        <h6>{{ 'artemisApp.gradingSystem.overview.intervals.title' | artemisTranslate }}</h6>
+        <h6 jhiTranslate="artemisApp.gradingSystem.overview.intervals.title"></h6>
         <ul>
             <li><span style="font-weight: bold">[a, b)</span>: {{ 'artemisApp.gradingSystem.overview.intervals.leftInclusiveRightExclusive' | artemisTranslate }}</li>
             <li><span style="font-weight: bold">(a, b]</span>: {{ 'artemisApp.gradingSystem.overview.intervals.leftExclusiveRightInclusive' | artemisTranslate }}</li>
diff --git a/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html b/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html
index a16bf94026ba..d59b5dd01694 100644
--- a/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html
+++ b/src/main/webapp/app/grading-system/grading-system-info-modal/grading-system-info-modal.component.html
@@ -1,38 +1,38 @@
 <ng-template #info let-c="close" let-d="dismiss">
     <div class="modal-header">
-        <h4 class="modal-title">{{ 'artemisApp.gradingSystem.info.title' | artemisTranslate }}</h4>
+        <h4 class="modal-title" jhiTranslate="artemisApp.gradingSystem.info.title"></h4>
         <button type="button" class="btn-close" aria-label="Close" (click)="d()"><span aria-hidden="true"></span></button>
     </div>
     <div class="modal-body">
         <table class="table">
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.general.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.general.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.general.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.general.explanation"></td>
             </tr>
             <hr />
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.maxPoints.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.maxPoints.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.maxPoints.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.maxPoints.explanation"></td>
             </tr>
             <hr />
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.gradeType.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.gradeType.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.gradeType.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.gradeType.explanation"></td>
             </tr>
             <hr />
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.inclusivity.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.inclusivity.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.inclusivity.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.inclusivity.explanation"></td>
             </tr>
             <hr />
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.firstPassingGrade.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.firstPassingGrade.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.firstPassingGrade.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.firstPassingGrade.explanation"></td>
             </tr>
             <hr />
             <tr>
-                <th>{{ 'artemisApp.gradingSystem.info.importExport.title' | artemisTranslate }}</th>
-                <td>{{ 'artemisApp.gradingSystem.info.importExport.explanation' | artemisTranslate }}</td>
+                <th jhiTranslate="artemisApp.gradingSystem.info.importExport.title"></th>
+                <td jhiTranslate="artemisApp.gradingSystem.info.importExport.explanation"></td>
             </tr>
         </table>
     </div>
diff --git a/src/main/webapp/app/grading-system/grading-system.component.html b/src/main/webapp/app/grading-system/grading-system.component.html
index 65f83944d3ef..73eff43a322e 100644
--- a/src/main/webapp/app/grading-system/grading-system.component.html
+++ b/src/main/webapp/app/grading-system/grading-system.component.html
@@ -24,9 +24,7 @@ <h2>
         </div>
         <div class="dropdown-container">
             <div class="form-group">
-                <span class="colon-suffix no-flex-shrink">{{
-                    isExam ? ('artemisApp.examManagement.maxPoints.title' | artemisTranslate) : ('artemisApp.course.maxPoints.title' | artemisTranslate)
-                }}</span>
+                <span class="colon-suffix no-flex-shrink" jhiTranslate="{{ isExam ? 'artemisApp.examManagement.maxPoints.title' : 'artemisApp.course.maxPoints.title' }}"></span>
                 @if (!isExam) {
                     <jhi-help-icon text="artemisApp.course.maxPoints.info" />
                 }
@@ -68,12 +66,8 @@ <h2>
 <div class="tab-bar" id="tab-bar">
     <div class="col-12 no-indent">
         <div>
-            <div class="tab-item interval" routerLink="interval" routerLinkActive="active">
-                {{ 'artemisApp.gradingSystem.intervalTab.title' | artemisTranslate }}
-            </div>
-            <div class="tab-item detailed" routerLink="detailed" routerLinkActive="active">
-                {{ 'artemisApp.gradingSystem.detailedTab.title' | artemisTranslate }}
-            </div>
+            <div class="tab-item interval" routerLink="interval" routerLinkActive="active" jhiTranslate="artemisApp.gradingSystem.intervalTab.title"></div>
+            <div class="tab-item detailed" routerLink="detailed" routerLinkActive="active" jhiTranslate="artemisApp.gradingSystem.detailedTab.title"></div>
         </div>
     </div>
 </div>
diff --git a/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html b/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html
index 8b30dabedbd5..3b8a116ef2cc 100644
--- a/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html
+++ b/src/main/webapp/app/grading-system/interval-grading-system/interval-grading-system.component.html
@@ -12,9 +12,7 @@
             <thead>
                 <tr>
                     <th>
-                        <span>
-                            {{ 'artemisApp.gradingSystem.intervalTab.title' | artemisTranslate }}
-                        </span>
+                        <span jhiTranslate="artemisApp.gradingSystem.intervalTab.title"></span>
                     </th>
                     <th>
                         <span>
@@ -29,13 +27,9 @@
                         </span>
                     </th>
                     <th [colSpan]="2">
-                        <span>
-                            {{
-                                this.gradingScale.gradeType === GradeType.GRADE
-                                    ? ('artemisApp.gradingSystem.gradeName' | artemisTranslate)
-                                    : ('artemisApp.gradingSystem.bonusPoints' | artemisTranslate)
-                            }}
-                        </span>
+                        <span
+                            [jhiTranslate]="this.gradingScale.gradeType === GradeType.GRADE ? 'artemisApp.gradingSystem.gradeName' : 'artemisApp.gradingSystem.bonusPoints'"
+                        ></span>
                     </th>
                 </tr>
             </thead>
diff --git a/src/main/webapp/app/guided-tour/guided-tour.component.html b/src/main/webapp/app/guided-tour/guided-tour.component.html
index 2e3beed56c91..b970883717e9 100644
--- a/src/main/webapp/app/guided-tour/guided-tour.component.html
+++ b/src/main/webapp/app/guided-tour/guided-tour.component.html
@@ -40,7 +40,7 @@
                         @if (currentTourStep.headlineTranslateKey) {
                             <h3 class="headline">
                                 @if (!guidedTourService.isOnResizeMessage && guidedTourService.currentTour && guidedTourService.currentTour.steps.length > 1) {
-                                    <span>{{ 'tour.step' | artemisTranslate: { string: guidedTourService.getCurrentStepString() } }} </span>
+                                    <span jhiTranslate="tour.step" [translateValues]="{ string: guidedTourService.getCurrentStepString() }"></span>
                                 }
                                 {{ currentTourStep.headlineTranslateKey | artemisTranslate }}
                             </h3>
@@ -92,7 +92,7 @@ <h5 jhiTranslate="{{ currentTourStep.subHeadlineTranslateKey }}" class="sub-head
                                         @if (currentTourStep.userInteractionEvent === UserInteractionEvent.CLICK) {
                                             <fa-icon [icon]="faHandPointUp" />
                                         }
-                                        @if (currentTourStep.userInteractionEvent === UserInteractionEvent.ACE_EDITOR) {
+                                        @if (currentTourStep.userInteractionEvent === UserInteractionEvent.MONACO_EDITOR) {
                                             <fa-icon [icon]="faICursor" />
                                         }
                                         @if (currentTourStep.userInteractionEvent === UserInteractionEvent.WAIT_FOR_SELECTOR) {
@@ -110,7 +110,7 @@ <h5 jhiTranslate="{{ currentTourStep.subHeadlineTranslateKey }}" class="sub-head
                                     @if (currentTourStep.userInteractionEvent === UserInteractionEvent.CLICK) {
                                         <span [jhiTranslate]="'tour.clickHint.text'"></span>
                                     }
-                                    @if (currentTourStep.userInteractionEvent === UserInteractionEvent.ACE_EDITOR) {
+                                    @if (currentTourStep.userInteractionEvent === UserInteractionEvent.MONACO_EDITOR) {
                                         <span [jhiTranslate]="'tour.typeHint.text'"></span>
                                     }
                                     @if (currentTourStep.userInteractionEvent === UserInteractionEvent.WAIT_FOR_SELECTOR) {
diff --git a/src/main/webapp/app/guided-tour/guided-tour.constants.ts b/src/main/webapp/app/guided-tour/guided-tour.constants.ts
index 58605d5f213c..5c2e08c5a322 100644
--- a/src/main/webapp/app/guided-tour/guided-tour.constants.ts
+++ b/src/main/webapp/app/guided-tour/guided-tour.constants.ts
@@ -34,7 +34,7 @@ export enum UserInteractionEvent {
     /** Listen for click events */
     CLICK = 'click',
     /** Observe added or removed lines in the code editor */
-    ACE_EDITOR = 'ace-editor',
+    MONACO_EDITOR = 'monaco-editor',
     /** Wait for the highlight element of the next tour step to be shown in the DOM */
     WAIT_FOR_SELECTOR = 'wait-for-selector',
     /** Observe and assess the given modeling task in the Apollon editor */
diff --git a/src/main/webapp/app/guided-tour/guided-tour.service.ts b/src/main/webapp/app/guided-tour/guided-tour.service.ts
index 71865327a9cc..dcf2872f1f98 100644
--- a/src/main/webapp/app/guided-tour/guided-tour.service.ts
+++ b/src/main/webapp/app/guided-tour/guided-tour.service.ts
@@ -641,9 +641,9 @@ export class GuidedTourService {
                     },
                     false,
                 );
-            } else if (userInteraction === UserInteractionEvent.ACE_EDITOR) {
-                /** We observe any added or removed lines in the .ace_text-layer node and trigger enableNextStepClick() */
-                targetNode = document.querySelector('.ace_text-layer') as HTMLElement;
+            } else if (userInteraction === UserInteractionEvent.MONACO_EDITOR) {
+                /** We observe any added or removed lines in the Monaco editor's .view-lines node and trigger enableNextStepClick() */
+                targetNode = document.querySelector('.monaco-editor .view-lines') as HTMLElement;
                 this.observeMutations(targetNode, options)
                     .pipe(
                         filter(
diff --git a/src/main/webapp/app/guided-tour/tours/code-editor-tour.ts b/src/main/webapp/app/guided-tour/tours/code-editor-tour.ts
index a213c1f0dcb0..19c2067ff031 100644
--- a/src/main/webapp/app/guided-tour/tours/code-editor-tour.ts
+++ b/src/main/webapp/app/guided-tour/tours/code-editor-tour.ts
@@ -24,11 +24,11 @@ export const codeEditorTour: GuidedTour = {
         }),
         new UserInterActionTourStep({
             highlightSelector: '.guided-tour-editor',
-            headlineTranslateKey: 'tour.programmingExercise.codeEditor.aceEditor.headline',
-            contentTranslateKey: 'tour.programmingExercise.codeEditor.aceEditor.content',
+            headlineTranslateKey: 'tour.programmingExercise.codeEditor.monacoEditor.headline',
+            contentTranslateKey: 'tour.programmingExercise.codeEditor.monacoEditor.content',
             highlightPadding: 5,
             orientation: Orientation.RIGHT,
-            userInteractionEvent: UserInteractionEvent.ACE_EDITOR,
+            userInteractionEvent: UserInteractionEvent.MONACO_EDITOR,
         }),
         new UserInterActionTourStep({
             highlightSelector: '.guided-tour-save-button',
diff --git a/src/main/webapp/app/home/home.component.html b/src/main/webapp/app/home/home.component.html
index 09685f917014..2ac14640fc07 100644
--- a/src/main/webapp/app/home/home.component.html
+++ b/src/main/webapp/app/home/home.component.html
@@ -13,8 +13,8 @@ <h1 jhiTranslate="home.title"></h1>
                     <div [jhiTranslate]="'home.login.traditional.pleaseSignIn'" class="lead text-center">Please sign in with your account.</div>
                 }
                 @if (accountName) {
-                    <div [jhiTranslate]="'home.login.traditional.pleaseSignInAccount'" [translateValues]="{ account: accountName }" class="lead text-center">
-                        Please sign in with your account.
+                    <div [jhiTranslate]="'home.login.traditional.pleaseSignInAccount'" [translateValues]="{ account: accountName }" class="lead text-center mb-4">
+                        Sign in with your account.
                     </div>
                 }
                 <div class="login-form">
@@ -22,12 +22,12 @@ <h1 jhiTranslate="home.title"></h1>
                         <div class="form-group">
                             @if (authenticationError) {
                                 <div class="alert alert-danger my-3" jhiTranslate="home.errors.failedToLogin">
-                                    <span class="bold">Failed to sign in!</span> Please check your username and password and try again.
+                                    <span class="bold">Failed to sign in!</span> Please check your login and password and try again.
                                 </div>
                             }
                         </div>
-                        <div class="form-group">
-                            <label class="font-weight-bold" for="username" jhiTranslate="global.form.username"></label>
+                        <div class="form-group pb-2">
+                            <label class="mb-2" for="username" jhiTranslate="global.form.username"></label>
                             <input
                                 #usernameForm="ngModel"
                                 [(ngModel)]="username"
@@ -37,26 +37,35 @@ <h1 jhiTranslate="home.title"></h1>
                                 class="form-control"
                                 id="username"
                                 name="username"
-                                placeholder="{{ 'global.form.username.placeholder' | artemisTranslate }}"
+                                [placeholder]="usernamePlaceholderTranslated"
                                 type="text"
                             />
                             @if (usernameForm.errors && (usernameForm.dirty || usernameForm.touched)) {
-                                <div [jhiTranslate]="errorMessageUsername" class="help-block">
-                                    <p class="text-primary small">Invalid username</p>
-                                </div>
+                                <span class="mt-1 text-danger small" [jhiTranslate]="errorMessageUsername"></span>
                             }
                         </div>
                         <div class="form-group">
-                            <label class="font-weight-bold" for="password" jhiTranslate="login.form.password"></label>
+                            <div class="d-flex mb-2">
+                                <label for="password" jhiTranslate="login.form.password"></label>
+                                <div class="ms-auto">
+                                    <a class="text-primary small" jhiTranslate="login.password.forgot" routerLink="account/reset/request"></a>
+                                </div>
+                            </div>
                             <input
+                                #passwordForm="ngModel"
                                 [(ngModel)]="password"
+                                [ngModelOptions]="{ updateOn: 'blur' }"
                                 autocomplete="current-password"
                                 class="form-control"
                                 id="password"
                                 name="password"
-                                placeholder="{{ 'login.form.password.placeholder' | artemisTranslate }}"
                                 type="password"
+                                [minlength]="PASSWORD_MIN_LENGTH"
+                                [maxLength]="PASSWORD_MAX_LENGTH"
                             />
+                            @if (passwordForm.errors && (passwordForm.dirty || passwordForm.touched)) {
+                                <span class="mt-1 text-danger small" jhiTranslate="home.errors.passwordIncorrect"></span>
+                            }
                         </div>
                         <div class="form-group">
                             <div class="form-check">
@@ -84,7 +93,7 @@ <h1 jhiTranslate="home.title"></h1>
                                     !username ||
                                     username.length < USERNAME_MIN_LENGTH
                                 "
-                                class="btn btn-primary"
+                                class="btn btn-primary w-100"
                                 id="login-button"
                                 type="submit"
                             >
@@ -99,10 +108,9 @@ <h1 jhiTranslate="home.title"></h1>
                         @if (isRegistrationEnabled) {
                             <div>
                                 <span jhiTranslate="global.messages.info.register.noaccount"></span>&nbsp;
-                                <a class="alert-link" jhiTranslate="global.messages.info.register.link" routerLink="account/register"></a>
+                                <a class="text-primary" jhiTranslate="global.messages.info.register.link" routerLink="account/register"></a>
                             </div>
                         }
-                        <a class="alert-link" jhiTranslate="login.password.forgot" routerLink="account/reset/request"></a>
                     </div>
                 </div>
             </div>
diff --git a/src/main/webapp/app/home/home.component.ts b/src/main/webapp/app/home/home.component.ts
index e3d2faa1cb75..fb4577b51cd2 100644
--- a/src/main/webapp/app/home/home.component.ts
+++ b/src/main/webapp/app/home/home.component.ts
@@ -1,9 +1,8 @@
-import { AfterViewChecked, Component, ElementRef, OnInit, Renderer2 } from '@angular/core';
+import { AfterViewChecked, Component, OnInit, Renderer2 } from '@angular/core';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ActivatedRoute, Router } from '@angular/router';
 import { User } from 'app/core/user/user.model';
 import { Credentials } from 'app/core/auth/auth-jwt.service';
-import { GuidedTourService } from 'app/guided-tour/guided-tour.service';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { isOrion } from 'app/shared/orion/orion';
 import { ModalConfirmAutofocusComponent } from 'app/shared/orion/modal-confirm-autofocus/modal-confirm-autofocus.component';
@@ -12,10 +11,11 @@ import { LoginService } from 'app/core/login/login.service';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { StateStorageService } from 'app/core/auth/state-storage.service';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
-import { PASSWORD_MIN_LENGTH, USERNAME_MIN_LENGTH } from 'app/app.constants';
+import { PASSWORD_MAX_LENGTH, PASSWORD_MIN_LENGTH, USERNAME_MIN_LENGTH } from 'app/app.constants';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
     selector: 'jhi-home',
@@ -25,6 +25,7 @@ import { faCircleNotch } from '@fortawesome/free-solid-svg-icons';
 export class HomeComponent implements OnInit, AfterViewChecked {
     USERNAME_MIN_LENGTH = USERNAME_MIN_LENGTH;
     PASSWORD_MIN_LENGTH = PASSWORD_MIN_LENGTH;
+    PASSWORD_MAX_LENGTH = PASSWORD_MAX_LENGTH;
     authenticationError = false;
     account: User;
     modalRef: NgbModalRef;
@@ -40,9 +41,11 @@ export class HomeComponent implements OnInit, AfterViewChecked {
     loading = true;
     mainElementFocused = false;
 
+    usernamePlaceholder = 'global.form.username.placeholder'; // default, might be overridden
+    usernamePlaceholderTranslated = 'Login or email'; // default, might be overridden
     // if the server is not connected to an external user management, we accept all valid username patterns
-    usernameRegexPattern = /^[a-z0-9_-]{3,50}$/; // default, might be overridden in ngOnInit
-    errorMessageUsername = 'home.errors.usernameIncorrect'; // default, might be overridden in ngOnInit
+    usernameRegexPattern = /^[a-z0-9.@_-]{4,50}$/; // default (at least 4, at most 50 characters), might be overridden
+    errorMessageUsername = 'home.errors.usernameIncorrect'; // default, might be overridden
     accountName?: string; // additional information in the welcome message
 
     externalUserManagementActive = true;
@@ -60,14 +63,13 @@ export class HomeComponent implements OnInit, AfterViewChecked {
         private accountService: AccountService,
         private loginService: LoginService,
         private stateStorageService: StateStorageService,
-        private elementRef: ElementRef,
         private renderer: Renderer2,
         private eventManager: EventManager,
-        private guidedTourService: GuidedTourService,
         private orionConnectorService: OrionConnectorService,
         private modalService: NgbModal,
         private profileService: ProfileService,
         private alertService: AlertService,
+        private translateService: TranslateService,
     ) {}
 
     ngOnInit() {
@@ -101,9 +103,20 @@ export class HomeComponent implements OnInit, AfterViewChecked {
         this.externalUserManagementActive = false;
 
         this.accountName = profileInfo.accountName;
+        if (profileInfo.allowedLdapUsernamePattern) {
+            this.usernameRegexPattern = new RegExp(profileInfo.allowedLdapUsernamePattern);
+        }
         if (this.accountName === 'TUM') {
+            this.usernamePlaceholder = 'global.form.username.tumPlaceholder';
             this.errorMessageUsername = 'home.errors.tumWarning';
+            // Temporary workaround: Do not show a warning when TUM users login with an email address with a specific ending
+            // allow emails with exactly one @ and usernames between 7 and 50 characters (shorter TUM usernames are not possible)
+            this.usernameRegexPattern = new RegExp(/^(?!.*@.*@)[a-z0-9.@_-]{7,50}$/);
         }
+        this.usernamePlaceholderTranslated = this.translateService.instant(this.usernamePlaceholder);
+        this.translateService.onLangChange.subscribe(() => {
+            this.usernamePlaceholderTranslated = this.translateService.instant(this.usernamePlaceholder);
+        });
 
         this.isRegistrationEnabled = !!profileInfo.registrationEnabled;
         this.needsToAcceptTerms = !!profileInfo.needsToAcceptTerms;
diff --git a/src/main/webapp/app/iris/about-iris/about-iris.component.html b/src/main/webapp/app/iris/about-iris/about-iris.component.html
index 82f59de31e50..947df8f6bef0 100644
--- a/src/main/webapp/app/iris/about-iris/about-iris.component.html
+++ b/src/main/webapp/app/iris/about-iris/about-iris.component.html
@@ -6,16 +6,14 @@
                     <jhi-iris-logo [size]="IrisLogoSize.BIG" />
                 </div>
                 <div class="col-8">
-                    <h2 class="mt-2 font-weight-bold">
-                        {{ 'artemisApp.exerciseChatbot.title' | artemisTranslate }}
-                    </h2>
+                    <h2 class="mt-2 font-weight-bold" jhiTranslate="artemisApp.exerciseChatbot.title"></h2>
                     <div class="ms-2 d-none d-md-block">
-                        <p class="mt-1 font-weight-normal">{{ 'artemisApp.exerciseChatbot.subtext' | artemisTranslate }}</p>
+                        <p class="mt-1 font-weight-normal" jhiTranslate="artemisApp.exerciseChatbot.subtext"></p>
                     </div>
                 </div>
             </div>
             <div class="row d-md-none">
-                <p class="mt-1 font-weight-normal">{{ 'artemisApp.exerciseChatbot.subtext' | artemisTranslate }}</p>
+                <p class="mt-1 font-weight-normal" jhiTranslate="artemisApp.exerciseChatbot.subtext"></p>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html
index 0c3b9c5e57f0..9734b552d14d 100644
--- a/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html
+++ b/src/main/webapp/app/iris/base-chatbot/iris-base-chatbot.component.html
@@ -179,7 +179,7 @@ <h3 jhiTranslate="artemisApp.iris.chat.helpOffer"></h3>
                     this.hasActiveStage
                 "
             />
-            <span class="disclaimer-message">{{ 'artemisApp.exerciseChatbot.disclaimer' | artemisTranslate }}</span>
+            <span class="disclaimer-message" jhiTranslate="artemisApp.exerciseChatbot.disclaimer"></span>
         </div>
     }
 </div>
diff --git a/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html b/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html
index e231aae3390b..4132e9fab587 100644
--- a/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html
+++ b/src/main/webapp/app/iris/settings/iris-settings-update/iris-common-sub-settings-update/iris-common-sub-settings-update.component.html
@@ -9,12 +9,20 @@
     }
 }
 <div class="btn-group">
-    <div class="btn" [ngClass]="{ 'btn-success selected': enabled, 'btn-default': !enabled }" [class.disabled]="isSettingsSwitchDisabled" (click)="onEnable()">
-        {{ 'artemisApp.iris.settings.subSettings.enabled.on' | artemisTranslate }}
-    </div>
-    <div class="btn" [ngClass]="{ 'btn-danger selected': !enabled, 'btn-default': enabled }" [class.disabled]="isSettingsSwitchDisabled" (click)="onDisable()">
-        {{ 'artemisApp.iris.settings.subSettings.enabled.off' | artemisTranslate }}
-    </div>
+    <div
+        class="btn"
+        [ngClass]="{ 'btn-success selected': enabled, 'btn-default': !enabled }"
+        [class.disabled]="isSettingsSwitchDisabled"
+        (click)="onEnable()"
+        jhiTranslate="artemisApp.iris.settings.subSettings.enabled.on"
+    ></div>
+    <div
+        class="btn"
+        [ngClass]="{ 'btn-danger selected': !enabled, 'btn-default': enabled }"
+        [class.disabled]="isSettingsSwitchDisabled"
+        (click)="onDisable()"
+        jhiTranslate="artemisApp.iris.settings.subSettings.enabled.off"
+    ></div>
 </div>
 <h4 class="form-label mt-3" jhiTranslate="artemisApp.iris.settings.subSettings.models.title"></h4>
 <span><span class="fw-bold fs-5" jhiTranslate="artemisApp.iris.settings.subSettings.models.allowedModels.title"></span>: </span>
diff --git a/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html b/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html
index 17d26de15f89..baeaca3cdf6a 100644
--- a/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html
+++ b/src/main/webapp/app/iris/settings/shared/iris-enabled.component.html
@@ -4,15 +4,13 @@
         [ngClass]="{ 'btn-success selected': irisSubSettings?.enabled, 'btn-default': !irisSubSettings?.enabled }"
         [class.disabled]="disabled"
         (click)="setEnabled(true)"
-    >
-        {{ 'artemisApp.iris.settings.subSettings.enabled.on' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.iris.settings.subSettings.enabled.on"
+    ></div>
     <div
         class="btn btn-default"
         [ngClass]="{ 'btn-danger selected': !irisSubSettings?.enabled, 'btn-default': irisSubSettings?.enabled }"
         [class.disabled]="disabled"
         (click)="setEnabled(false)"
-    >
-        {{ 'artemisApp.iris.settings.subSettings.enabled.off' | artemisTranslate }}
-    </div>
+        jhiTranslate="artemisApp.iris.settings.subSettings.enabled.off"
+    ></div>
 </div>
diff --git a/src/main/webapp/app/lecture/attachment.service.ts b/src/main/webapp/app/lecture/attachment.service.ts
index 57d22c64d550..49f6739bfd8d 100644
--- a/src/main/webapp/app/lecture/attachment.service.ts
+++ b/src/main/webapp/app/lecture/attachment.service.ts
@@ -135,4 +135,15 @@ export class AttachmentService {
         }
         return formData;
     }
+
+    /**
+     * Retrieve the file associated with a given attachment ID as a Blob object
+     *
+     * @param courseId The ID of the course that the attachment belongs to
+     * @param attachmentId The ID of the attachment to retrieve
+     * @returns An Observable that emits the Blob object of the file when the HTTP request completes successfully
+     */
+    getAttachmentFile(courseId: number, attachmentId: number): Observable<Blob> {
+        return this.http.get(`api/files/courses/${courseId}/attachments/${attachmentId}`, { responseType: 'blob' });
+    }
 }
diff --git a/src/main/webapp/app/lecture/lecture-attachments.component.html b/src/main/webapp/app/lecture/lecture-attachments.component.html
index b5bd8a61163f..c20d21a173c5 100644
--- a/src/main/webapp/app/lecture/lecture-attachments.component.html
+++ b/src/main/webapp/app/lecture/lecture-attachments.component.html
@@ -79,6 +79,17 @@ <h4 jhiTranslate="artemisApp.lecture.attachments.attachments"></h4>
                                                 </td>
                                                 <td class="text-end">
                                                     <div class="flex-btn-group-container">
+                                                        @if (viewButtonAvailable[attachment.id!]) {
+                                                            <button
+                                                                type="button"
+                                                                class="btn btn-primary btn-sm me-1"
+                                                                [routerLink]="['/course-management', lecture.course?.id, 'lectures', lecture.id, 'attachments', attachment.id]"
+                                                                [ngbTooltip]="'entity.action.view' | artemisTranslate"
+                                                            >
+                                                                <fa-icon [icon]="faEye" />
+                                                                <span class="d-none d-md-inline" jhiTranslate="entity.action.view"></span>
+                                                            </button>
+                                                        }
                                                         <button
                                                             [disabled]="attachmentToBeCreated?.id === attachment?.id"
                                                             type="submit"
@@ -103,9 +114,7 @@ <h4 jhiTranslate="artemisApp.lecture.attachments.attachments"></h4>
                                                     </div>
                                                 </td>
                                                 @if (attachmentToBeCreated?.id === attachment?.id) {
-                                                    <div class="edit-overlay">
-                                                        {{ 'artemisApp.lecture.attachments.isBeingEdited' | artemisTranslate }}
-                                                    </div>
+                                                    <div class="edit-overlay" jhiTranslate="artemisApp.lecture.attachments.isBeingEdited"></div>
                                                 }
                                             </tr>
                                         }
@@ -140,7 +149,7 @@ <h4 jhiTranslate="artemisApp.lecture.attachments.editAttachment"></h4>
                                         jhiTranslate="artemisApp.lecture.attachments.file"
                                         >File</label
                                     >
-                                    <small id="fileHelp" class="form-text text-body-secondary">{{ 'artemisApp.lecture.attachments.fileLimitation' | artemisTranslate }} </small>
+                                    <small id="fileHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.lecture.attachments.fileLimitation"></small>
                                     <fa-icon
                                         [icon]="faQuestionCircle"
                                         [ngbTooltip]="'artemisApp.lecture.attachments.fileLimitationTooltip' | artemisTranslate: { extensions: allowedFileExtensions }"
diff --git a/src/main/webapp/app/lecture/lecture-attachments.component.ts b/src/main/webapp/app/lecture/lecture-attachments.component.ts
index 7b44b4f9a904..18e51fe70d38 100644
--- a/src/main/webapp/app/lecture/lecture-attachments.component.ts
+++ b/src/main/webapp/app/lecture/lecture-attachments.component.ts
@@ -8,7 +8,7 @@ import { Subject } from 'rxjs';
 import { FileService } from 'app/shared/http/file.service';
 import { Attachment, AttachmentType } from 'app/entities/attachment.model';
 import { AttachmentService } from 'app/lecture/attachment.service';
-import { faPaperclip, faPencilAlt, faQuestionCircle, faSpinner, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faEye, faPaperclip, faPencilAlt, faQuestionCircle, faSpinner, faTimes, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { FILE_EXTENSIONS } from 'app/shared/constants/file-extensions.constants';
 import { LectureService } from 'app/lecture/lecture.service';
 
@@ -31,6 +31,7 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy {
     notificationText?: string;
     erroredFile?: File;
     errorMessage?: string;
+    viewButtonAvailable: Record<number, boolean> = {};
 
     // A human-readable list of allowed file extensions
     readonly allowedFileExtensions = FILE_EXTENSIONS.join(', ');
@@ -47,6 +48,7 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy {
     faPencilAlt = faPencilAlt;
     faPaperclip = faPaperclip;
     faQuestionCircle = faQuestionCircle;
+    faEye = faEye;
 
     constructor(
         protected activatedRoute: ActivatedRoute,
@@ -75,6 +77,9 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy {
     loadAttachments(): void {
         this.attachmentService.findAllByLectureId(this.lecture.id!).subscribe((attachmentsResponse: HttpResponse<Attachment[]>) => {
             this.attachments = attachmentsResponse.body!;
+            this.attachments.forEach((attachment) => {
+                this.viewButtonAvailable[attachment.id!] = this.isViewButtonAvailable(attachment.link!);
+            });
         });
     }
 
@@ -82,6 +87,10 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy {
         this.dialogErrorSource.unsubscribe();
     }
 
+    isViewButtonAvailable(attachmentLink: string): boolean {
+        return attachmentLink.endsWith('.pdf') ?? false;
+    }
+
     get isSubmitPossible(): boolean {
         return !!(this.attachmentToBeCreated?.name && (this.attachmentFile || this.attachmentToBeCreated?.link));
     }
@@ -130,9 +139,13 @@ export class LectureAttachmentsComponent implements OnInit, OnDestroy {
             this.attachmentService.create(this.attachmentToBeCreated!, this.attachmentFile!).subscribe({
                 next: (attachmentRes: HttpResponse<Attachment>) => {
                     this.attachments.push(attachmentRes.body!);
+                    this.lectureService.findWithDetails(this.lecture.id!).subscribe((lectureResponse: HttpResponse<Lecture>) => {
+                        this.lecture = lectureResponse.body!;
+                    });
                     this.attachmentFile = undefined;
                     this.attachmentToBeCreated = undefined;
                     this.attachmentBackup = undefined;
+                    this.loadAttachments();
                 },
                 error: (error: HttpErrorResponse) => this.handleFailedUpload(error),
             });
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.html
index 9d7cb956a39c..414beb7b9666 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-unit-form/attachment-unit-form.component.html
@@ -13,20 +13,16 @@
                 @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (nameControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.attachmentUnit.createAttachmentUnit.nameRequiredValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.nameRequiredValidationError"></div>
                         }
                         @if (nameControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.attachmentUnit.createAttachmentUnit.nameMaxLengthValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.nameMaxLengthValidationError"></div>
                         }
                     </div>
                 }
             </div>
             <div class="form-group">
-                <label for="description">{{ 'artemisApp.attachmentUnit.createAttachmentUnit.description' | artemisTranslate }}</label>
+                <label for="description" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.description"></label>
                 <textarea
                     class="form-control"
                     id="description"
@@ -37,16 +33,14 @@
                 @if (descriptionControl?.invalid && (descriptionControl?.dirty || descriptionControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (descriptionControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.attachmentUnit.createAttachmentUnit.descriptionMaxLengthValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.descriptionMaxLengthValidationError"></div>
                         }
                     </div>
                 }
             </div>
             <div class="form-group">
                 <label>{{ 'artemisApp.attachmentUnit.createAttachmentUnit.file' | artemisTranslate }}*</label>
-                <small id="fileHelp" class="form-text text-body-secondary">{{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileLimitation' | artemisTranslate }} </small>
+                <small id="fileHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.fileLimitation"></small>
                 <fa-icon
                     [icon]="faQuestionCircle"
                     [ngbTooltip]="'artemisApp.attachmentUnit.createAttachmentUnit.fileLimitationTooltip' | artemisTranslate: { extensions: allowedFileExtensions }"
@@ -73,9 +67,7 @@
                     </div>
                 }
                 @if (!fileName && fileInputTouched) {
-                    <div class="alert alert-danger">
-                        {{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileRequiredValidationError' | artemisTranslate }}
-                    </div>
+                    <div class="alert alert-danger" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.fileRequiredValidationError"></div>
                 }
             </div>
             <div class="form-group">
@@ -90,7 +82,7 @@
                 />
             </div>
             <div class="form-group" [hidden]="!isEditMode">
-                <label for="updateNotificationText">{{ 'artemisApp.attachmentUnit.createAttachmentUnit.updateNotificationText' | artemisTranslate }}</label>
+                <label for="updateNotificationText" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.updateNotificationText"></label>
                 <textarea
                     class="form-control"
                     id="updateNotificationText"
@@ -102,21 +94,19 @@
                 @if (updateNotificationTextControl?.invalid && (updateNotificationTextControl?.dirty || updateNotificationTextControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (updateNotificationTextControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.attachmentUnit.createAttachmentUnit.updateNotificationTextMaxLengthValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.updateNotificationTextMaxLengthValidationError"></div>
                         }
                     </div>
                 }
             </div>
             <div class="form-group">
-                <label for="version">{{ 'artemisApp.attachmentUnit.createAttachmentUnit.version' | artemisTranslate }}</label>
+                <label for="version" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.version"></label>
                 <input id="version" class="form-control disabled" type="text" readonly formControlName="version" />
             </div>
             <div class="row">
                 <div class="col-12">
                     <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                        <span>{{ 'entity.action.submit' | artemisTranslate }}</span>
+                        <span jhiTranslate="entity.action.submit"></span>
                     </button>
                     @if (hasCancelButton) {
                         <button type="button" (click)="cancelForm()" class="btn btn-default">
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-units/attachment-units.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-units/attachment-units.component.html
index a5521571870d..38e8728489b5 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-units/attachment-units.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachment-units/attachment-units.component.html
@@ -77,12 +77,12 @@ <h2 id="page-heading">
         </table>
     </div>
     <div class="mt-3 mb-3">
-        <span class="px-1">{{ 'artemisApp.attachmentUnit.createAttachmentUnits.removeSlides' | artemisTranslate }}</span>
+        <span class="px-1" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.removeSlides"></span>
         <div>
             <div class="alert alert-warning mt-3 ml-3">
                 <ul>
-                    <li>{{ 'artemisApp.attachmentUnit.createAttachmentUnits.removeSlidesInfo.firstLine' | artemisTranslate }}</li>
-                    <li>{{ 'artemisApp.attachmentUnit.createAttachmentUnits.removeSlidesInfo.secondLine' | artemisTranslate }}</li>
+                    <li jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.removeSlidesInfo.firstLine"></li>
+                    <li jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.removeSlidesInfo.secondLine"></li>
                     <li>
                         {{ 'artemisApp.attachmentUnit.createAttachmentUnits.removeSlidesInfo.thirdLine' | artemisTranslate }}
                         {{ removedSlidesNumbers.length > 0 ? removedSlidesNumbers : '-' }}
@@ -112,7 +112,7 @@ <h2 id="page-heading">
         [disabled]="units.length < 1"
         class="btn btn-primary"
     >
-        <span>{{ 'entity.action.submit' | artemisTranslate }}</span>
+        <span jhiTranslate="entity.action.submit"></span>
     </button>
     <button (click)="cancelSplit()" class="btn btn-default"><fa-icon [icon]="faBan" />&nbsp;<span jhiTranslate="entity.action.cancel"></span></button>
     @if (invalidUnitTableMessage) {
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts
index e2e3372e6190..533d454f9a06 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service.ts
@@ -60,4 +60,15 @@ export class AttachmentUnitService {
         const params = new HttpParams().set('commaSeparatedKeyPhrases', keyPhrases);
         return this.httpClient.get<Array<number>>(`${this.resourceURL}/lectures/${lectureId}/attachment-units/slides-to-remove/${filename}`, { params, observe: 'response' });
     }
+
+    /**
+     * Retrieve the file associated with a given attachment ID as a Blob object
+     *
+     * @param courseId The ID of the course that the Attachment Unit belongs to
+     * @param attachmentUnitId The ID of the attachment to retrieve
+     * @returns An Observable that emits the Blob object of the file when the HTTP request completes successfully
+     */
+    getAttachmentFile(courseId: number, attachmentUnitId: number): Observable<Blob> {
+        return this.httpClient.get(`${this.resourceURL}/files/courses/${courseId}/attachment-units/${attachmentUnitId}`, { responseType: 'blob' });
+    }
 }
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
index 8fed64368500..f4d559178079 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/create-exercise-unit/create-exercise-unit.component.html
@@ -1,19 +1,19 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 } @else {
     <div class="container">
         <div class="row">
             <div class="col-12 mx-auto">
-                <h2>{{ 'artemisApp.exerciseUnit.createExerciseUnit.headline' | artemisTranslate }}</h2>
+                <h2 jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.headline"></h2>
             </div>
         </div>
         <div class="row">
             <div class="col-sm-6 mx-auto">
-                <p>{{ 'artemisApp.exerciseUnit.createExerciseUnit.description' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.exerciseUnit.createExerciseUnit.description"></p>
             </div>
             <div class="col-sm-6 mx-auto text-end">
                 @if (hasCancelButton) {
@@ -22,13 +22,22 @@ <h2>{{ 'artemisApp.exerciseUnit.createExerciseUnit.headline' | artemisTranslate
                     </button>
                 }
                 @if (hasCreateExerciseButton) {
-                    <button id="createExerciseButton" type="button" class="btn btn-primary" (click)="createNewExercise()">
-                        {{ 'artemisApp.lecture.wizardMode.newExercise' | artemisTranslate }}
-                    </button>
+                    <button
+                        id="createExerciseButton"
+                        type="button"
+                        class="btn btn-primary"
+                        (click)="createNewExercise()"
+                        jhiTranslate="artemisApp.lecture.wizardMode.newExercise"
+                    ></button>
                 }
-                <button id="createButton" type="button" class="btn btn-primary" [disabled]="exercisesToCreateUnitFor.length === 0" (click)="createExerciseUnits()">
-                    {{ 'entity.action.submit' | artemisTranslate }}
-                </button>
+                <button
+                    id="createButton"
+                    type="button"
+                    class="btn btn-primary"
+                    [disabled]="exercisesToCreateUnitFor.length === 0"
+                    (click)="createExerciseUnits()"
+                    jhiTranslate="entity.action.submit"
+                ></button>
             </div>
         </div>
         <div class="row">
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
index ee71cdb80fc3..1320a915b14f 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-layout/lecture-unit-layout.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 } @else {
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html
index 60173be6523b..2dea431d4934 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 }
@@ -71,6 +71,16 @@
                         @if (lecture.course?.id && showCompetencies) {
                             <jhi-competencies-popover [courseId]="lecture.course!.id!" [competencies]="lectureUnit.competencies || []" [navigateTo]="'competencyManagement'" />
                         }
+                        @if (viewButtonAvailable[lectureUnit.id!]) {
+                            <a
+                                type="button"
+                                class="btn btn-primary btn-sm flex-grow-1"
+                                [routerLink]="['/course-management', lecture.course?.id, 'lectures', lecture.id, 'unit-management', 'attachment-units', lectureUnit.id, 'view']"
+                                [ngbTooltip]="'entity.action.view' | artemisTranslate"
+                            >
+                                <fa-icon [icon]="faEye" />
+                            </a>
+                        }
                         <div class="d-flex gap-1 w-100">
                             @if (this.emitEditEvents) {
                                 @if (editButtonAvailable(lectureUnit)) {
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts
index 66ddcf166ced..dd3897bf0318 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component.ts
@@ -12,7 +12,7 @@ import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-manage
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
 import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
 import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
-import { faPencilAlt, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { faEye, faPencilAlt, faTrash } from '@fortawesome/free-solid-svg-icons';
 import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
 
 @Component({
@@ -34,8 +34,11 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy {
     lecture: Lecture;
     isLoading = false;
     updateOrderSubject: Subject<any>;
+    viewButtonAvailable: Record<number, boolean> = {};
+
     updateOrderSubjectSubscription: Subscription;
     navigationEndSubscription: Subscription;
+
     readonly LectureUnitType = LectureUnitType;
     readonly ActionType = ActionType;
     private dialogErrorSource = new Subject<string>();
@@ -51,6 +54,7 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy {
     // Icons
     faTrash = faTrash;
     faPencilAlt = faPencilAlt;
+    faEye = faEye;
 
     constructor(
         private activatedRoute: ActivatedRoute,
@@ -104,6 +108,9 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy {
                     this.lecture = lecture;
                     if (lecture?.lectureUnits) {
                         this.lectureUnits = lecture?.lectureUnits;
+                        this.lectureUnits.forEach((lectureUnit) => {
+                            this.viewButtonAvailable[lectureUnit.id!] = this.isViewButtonAvailable(lectureUnit);
+                        });
                     } else {
                         this.lectureUnits = [];
                     }
@@ -186,6 +193,17 @@ export class LectureUnitManagementComponent implements OnInit, OnDestroy {
         });
     }
 
+    isViewButtonAvailable(lectureUnit: LectureUnit): boolean {
+        switch (lectureUnit!.type) {
+            case LectureUnitType.ATTACHMENT: {
+                const attachmentUnit = <AttachmentUnit>lectureUnit;
+                return attachmentUnit.attachment?.link?.endsWith('.pdf') ?? false;
+            }
+            default:
+                return false;
+        }
+    }
+
     editButtonAvailable(lectureUnit: LectureUnit) {
         switch (lectureUnit?.type) {
             case LectureUnitType.ATTACHMENT:
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.route.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.route.ts
index c6c1658df6bf..c16ee3266283 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.route.ts
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.route.ts
@@ -1,4 +1,8 @@
-import { Routes } from '@angular/router';
+import { Injectable } from '@angular/core';
+import { HttpResponse } from '@angular/common/http';
+import { ActivatedRouteSnapshot, Resolve, Routes } from '@angular/router';
+import { Observable, of } from 'rxjs';
+import { filter, map } from 'rxjs/operators';
 import { Authority } from 'app/shared/constants/authority.constants';
 import { UserRouteAccessService } from 'app/core/auth/user-route-access-service';
 import { LectureUnitManagementComponent } from 'app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.component';
@@ -12,6 +16,27 @@ import { EditVideoUnitComponent } from 'app/lecture/lecture-unit/lecture-unit-ma
 import { CreateOnlineUnitComponent } from 'app/lecture/lecture-unit/lecture-unit-management/create-online-unit/create-online-unit.component';
 import { EditOnlineUnitComponent } from 'app/lecture/lecture-unit/lecture-unit-management/edit-online-unit/edit-online-unit.component';
 import { AttachmentUnitsComponent } from 'app/lecture/lecture-unit/lecture-unit-management/attachment-units/attachment-units.component';
+import { PdfPreviewComponent } from 'app/lecture/pdf-preview/pdf-preview.component';
+import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
+import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service';
+import { CourseManagementResolve } from 'app/course/manage/course-management-resolve.service';
+
+@Injectable({ providedIn: 'root' })
+export class AttachmentUnitResolve implements Resolve<AttachmentUnit> {
+    constructor(private attachmentUnitService: AttachmentUnitService) {}
+
+    resolve(route: ActivatedRouteSnapshot): Observable<AttachmentUnit> {
+        const lectureId = route.params['lectureId'];
+        const attachmentUnitId = route.params['attachmentUnitId'];
+        if (attachmentUnitId) {
+            return this.attachmentUnitService.findById(attachmentUnitId, lectureId).pipe(
+                filter((response: HttpResponse<AttachmentUnit>) => response.ok),
+                map((attachmentUnit: HttpResponse<AttachmentUnit>) => attachmentUnit.body!),
+            );
+        }
+        return of(new AttachmentUnit());
+    }
+}
 
 export const lectureUnitRoute: Routes = [
     {
@@ -86,6 +111,14 @@ export const lectureUnitRoute: Routes = [
                     pageTitle: 'artemisApp.attachmentUnit.editAttachmentUnit.title',
                 },
             },
+            {
+                path: 'attachment-units/:attachmentUnitId/view',
+                component: PdfPreviewComponent,
+                resolve: {
+                    course: CourseManagementResolve,
+                    attachmentUnit: AttachmentUnitResolve,
+                },
+            },
             {
                 path: 'video-units/:videoUnitId/edit',
                 component: EditVideoUnitComponent,
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.html
index f6d25a0b3864..0758f7f02a87 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/online-unit-form/online-unit-form.component.html
@@ -11,20 +11,14 @@
                     [placeholder]="'artemisApp.onlineUnit.createOnlineUnit.sourcePlaceHolder' | artemisTranslate"
                     (change)="onLinkChanged()"
                 />
-                <small id="urlHelperExplanation" class="form-text text-body-secondary">{{
-                    'artemisApp.onlineUnit.createOnlineUnit.urlHelperPlaceholder' | artemisTranslate
-                }}</small>
+                <small id="urlHelperExplanation" class="form-text text-body-secondary" jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.urlHelperPlaceholder"></small>
                 @if (sourceControl?.invalid && (sourceControl?.dirty || sourceControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (sourceControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.onlineUnit.createOnlineUnit.sourceRequiredValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.sourceRequiredValidationError"></div>
                         }
                         @if (sourceControl?.errors?.invalidUrl) {
-                            <div>
-                                {{ 'artemisApp.onlineUnit.createOnlineUnit.sourceURLValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.sourceURLValidationError"></div>
                         }
                     </div>
                 }
@@ -41,20 +35,16 @@
                 @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (nameControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.onlineUnit.createOnlineUnit.nameRequiredValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.nameRequiredValidationError"></div>
                         }
                         @if (nameControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.onlineUnit.createOnlineUnit.nameMaxLengthValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.nameMaxLengthValidationError"></div>
                         }
                     </div>
                 }
             </div>
             <div class="form-group">
-                <label for="description">{{ 'artemisApp.onlineUnit.createOnlineUnit.description' | artemisTranslate }}</label>
+                <label for="description" jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.description"></label>
                 <textarea
                     class="form-control"
                     id="description"
@@ -65,9 +55,7 @@
                 @if (descriptionControl?.invalid && (descriptionControl?.dirty || descriptionControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (descriptionControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.onlineUnit.createOnlineUnit.descriptionMaxLengthValidationError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.onlineUnit.createOnlineUnit.descriptionMaxLengthValidationError"></div>
                         }
                     </div>
                 }
@@ -86,7 +74,7 @@
             <div class="row">
                 <div class="col-12">
                     <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                        <span>{{ 'entity.action.submit' | artemisTranslate }}</span>
+                        <span jhiTranslate="entity.action.submit"></span>
                     </button>
                     @if (hasCancelButton) {
                         <button type="button" (click)="cancelForm()" class="btn btn-default">
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html
index 0bf5784ea593..8f0eccda8242 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/text-unit-form/text-unit-form.component.html
@@ -14,14 +14,10 @@
                     @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (nameControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.textUnit.createTextUnit.nameRequiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.textUnit.createTextUnit.nameRequiredValidationError"></div>
                             }
                             @if (nameControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.textUnit.createTextUnit.nameMaxLengthValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.textUnit.createTextUnit.nameMaxLengthValidationError"></div>
                             }
                         </div>
                     }
@@ -38,18 +34,24 @@
                     />
                 </div>
                 <div class="form-group">
-                    <label class="d-block" for="content">{{ 'artemisApp.textUnit.createTextUnit.content' | artemisTranslate }}</label>
+                    <label class="d-block" for="content" jhiTranslate="artemisApp.textUnit.createTextUnit.content"></label>
                     <small id="contentHelp" class="form-text mb-1 text-body-secondary">
                         {{ 'artemisApp.textUnit.markdownHelp' | artemisTranslate }}
                         <a href="https://guides.github.com/features/mastering-markdown/"> GitHub Markdown Guide</a>
                     </small>
                     <!-- not included in reactive form -->
-                    <jhi-markdown-editor aria-describedby="contentHelp" id="content" class="markdown-editor" [(markdown)]="content" (markdownChange)="onMarkdownChange($event)" />
+                    <jhi-markdown-editor-monaco
+                        aria-describedby="contentHelp"
+                        id="content"
+                        class="markdown-editor"
+                        [(markdown)]="content"
+                        (markdownChange)="onMarkdownChange($event)"
+                    />
                 </div>
                 <div class="row">
                     <div class="col-12">
                         <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                            <span>{{ 'entity.action.submit' | artemisTranslate }}</span>
+                            <span jhiTranslate="entity.action.submit"></span>
                         </button>
                         @if (hasCancelButton) {
                             <button type="button" (click)="cancelForm()" class="btn btn-default">
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.html b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.html
index 299ddc2f7c93..4253c17c54cb 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.html
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/video-unit-form/video-unit-form.component.html
@@ -14,20 +14,16 @@
                     @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (nameControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.videoUnit.createVideoUnit.nameRequiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.nameRequiredValidationError"></div>
                             }
                             @if (nameControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.videoUnit.createVideoUnit.nameMaxLengthValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.nameMaxLengthValidationError"></div>
                             }
                         </div>
                     }
                 </div>
                 <div class="form-group">
-                    <label for="description">{{ 'artemisApp.videoUnit.createVideoUnit.description' | artemisTranslate }}</label>
+                    <label for="description" jhiTranslate="artemisApp.videoUnit.createVideoUnit.description"></label>
                     <textarea
                         class="form-control"
                         id="description"
@@ -38,9 +34,7 @@
                     @if (descriptionControl?.invalid && (descriptionControl?.dirty || descriptionControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (descriptionControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.videoUnit.createVideoUnit.descriptionMaxLengthValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.descriptionMaxLengthValidationError"></div>
                             }
                         </div>
                     }
@@ -63,7 +57,7 @@
                         </div>
                         <div class="col-1"></div>
                         <div class="col-7">
-                            <label for="urlHelper">{{ 'artemisApp.videoUnit.createVideoUnit.urlVideoHelper' | artemisTranslate }}</label>
+                            <label for="urlHelper" jhiTranslate="artemisApp.videoUnit.createVideoUnit.urlVideoHelper"></label>
                         </div>
                     </div>
                     <div class="row">
@@ -90,29 +84,21 @@
                             @if (sourceControl?.invalid && (sourceControl?.dirty || sourceControl?.touched)) {
                                 <div class="alert alert-danger">
                                     @if (sourceControl?.errors?.required) {
-                                        <div>
-                                            {{ 'artemisApp.videoUnit.createVideoUnit.sourceRequiredValidationError' | artemisTranslate }}
-                                        </div>
+                                        <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.sourceRequiredValidationError"></div>
                                     }
                                     @if (sourceControl?.errors?.invalidVideoUrl) {
-                                        <div>
-                                            {{ 'artemisApp.videoUnit.createVideoUnit.sourceURLValidationError' | artemisTranslate }}
-                                        </div>
+                                        <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.sourceURLValidationError"></div>
                                     }
                                 </div>
                             }
                         </div>
                         <div class="col-1"></div>
                         <div class="col-7">
-                            <small id="urlHelperExplanation" class="form-text text-body-secondary">{{
-                                'artemisApp.videoUnit.createVideoUnit.urlHelperPlaceholder' | artemisTranslate
-                            }}</small>
+                            <small id="urlHelperExplanation" class="form-text text-body-secondary" jhiTranslate="artemisApp.videoUnit.createVideoUnit.urlHelperPlaceholder"></small>
                             @if (urlHelperControl?.invalid && (urlHelperControl?.dirty || urlHelperControl?.touched)) {
                                 <div class="alert alert-danger">
                                     @if (urlHelperControl?.errors?.invalidVideoUrl) {
-                                        <div>
-                                            {{ 'artemisApp.videoUnit.createVideoUnit.urlHelperValidationError' | artemisTranslate }}
-                                        </div>
+                                        <div jhiTranslate="artemisApp.videoUnit.createVideoUnit.urlHelperValidationError"></div>
                                     }
                                 </div>
                             }
@@ -122,7 +108,7 @@
                 <div class="row">
                     <div class="col-12">
                         <button id="submitButton" class="btn btn-primary" type="submit" [disabled]="!isSubmitPossible">
-                            <span>{{ 'entity.action.submit' | artemisTranslate }}</span>
+                            <span jhiTranslate="entity.action.submit"></span>
                         </button>
                         @if (hasCancelButton) {
                             <button type="button" (click)="cancelForm()" class="btn btn-default">
diff --git a/src/main/webapp/app/lecture/lecture-update.component.html b/src/main/webapp/app/lecture/lecture-update.component.html
index 67f423adda06..9ba49083c37c 100644
--- a/src/main/webapp/app/lecture/lecture-update.component.html
+++ b/src/main/webapp/app/lecture/lecture-update.component.html
@@ -30,12 +30,7 @@ <h2 id="jhi-lecture-heading" jhiTranslate="artemisApp.lecture.home.createOrEditL
                     <jhi-lecture-title-channel-name [lecture]="lecture" />
                     <div class="form-group" id="field_description">
                         <label class="form-control-label" jhiTranslate="artemisApp.lecture.description" for="field_description"></label>
-                        <jhi-markdown-editor
-                            class="markdown-editor"
-                            [domainCommands]="domainCommandsDescription"
-                            [(markdown)]="lecture.description"
-                            [editorMode]="EditorMode.LATEX"
-                        />
+                        <jhi-markdown-editor-monaco class="markdown-editor" [domainActions]="domainActionsDescription" [(markdown)]="lecture.description" />
                     </div>
                     <div class="d-flex">
                         <div class="form-group flex-grow-1">
@@ -77,22 +72,22 @@ <h2 id="jhi-lecture-heading" jhiTranslate="artemisApp.lecture.home.createOrEditL
                 </div>
                 <div class="py-2">
                     <input class="form-check-input" type="checkbox" name="processUnit" (change)="onSelectProcessUnit()" [disabled]="editForm.form.invalid || isSaving" />
-                    <span class="px-1">{{ 'artemisApp.attachmentUnit.createAttachmentUnits.processAutomatically' | artemisTranslate }}</span>
+                    <span class="px-1" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.processAutomatically"></span>
                     <fa-icon [icon]="faQuestionCircle" [ngbTooltip]="'artemisApp.attachmentUnit.createAttachmentUnits.lectureFileToolTip' | artemisTranslate" />
                 </div>
                 @if (processUnitMode) {
                     <div class="alert alert-warning mt-3">
                         <ul class="informative-text">
-                            <li>{{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.firstLine' | artemisTranslate }}</li>
-                            <li>{{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.secondLine' | artemisTranslate }}</li>
-                            <li>{{ 'artemisApp.attachmentUnit.createAttachmentUnits.informativeText.note' | artemisTranslate }}</li>
+                            <li jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.informativeText.firstLine"></li>
+                            <li jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.informativeText.secondLine"></li>
+                            <li jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnits.informativeText.note"></li>
                         </ul>
                     </div>
                 }
                 @if (processUnitMode) {
                     <div class="form-group">
                         <label>{{ 'artemisApp.attachmentUnit.createAttachmentUnit.file' | artemisTranslate }}*</label>
-                        <small id="fileHelp" class="form-text text-body-secondary">{{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileLimitation' | artemisTranslate }} </small>
+                        <small id="fileHelp" class="form-text text-body-secondary" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.fileLimitation"></small>
                         <fa-icon
                             [icon]="faQuestionCircle"
                             [ngbTooltip]="'artemisApp.attachmentUnit.createAttachmentUnit.fileLimitationTooltip' | artemisTranslate: { extensions: allowedFileExtensions }"
@@ -112,9 +107,7 @@ <h2 id="jhi-lecture-heading" jhiTranslate="artemisApp.lecture.home.createOrEditL
                             </div>
                         </div>
                         @if (!fileName && fileInputTouched) {
-                            <div class="alert alert-danger">
-                                {{ 'artemisApp.attachmentUnit.createAttachmentUnit.fileRequiredValidationError' | artemisTranslate }}
-                            </div>
+                            <div class="alert alert-danger" jhiTranslate="artemisApp.attachmentUnit.createAttachmentUnit.fileRequiredValidationError"></div>
                         }
                     </div>
                 }
diff --git a/src/main/webapp/app/lecture/lecture-update.component.ts b/src/main/webapp/app/lecture/lecture-update.component.ts
index 592d937228cb..e0ac895d50ce 100644
--- a/src/main/webapp/app/lecture/lecture-update.component.ts
+++ b/src/main/webapp/app/lecture/lecture-update.component.ts
@@ -6,15 +6,14 @@ import { AlertService } from 'app/core/util/alert.service';
 import { LectureService } from './lecture.service';
 import { CourseManagementService } from '../course/manage/course-management.service';
 import { Lecture } from 'app/entities/lecture.model';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
 import { Course } from 'app/entities/course.model';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
 import { onError } from 'app/shared/util/global.utils';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { DocumentationType } from 'app/shared/components/documentation-button/documentation-button.component';
 import { faBan, faHandshakeAngle, faPuzzlePiece, faQuestionCircle, faSave } from '@fortawesome/free-solid-svg-icons';
 import { LectureUpdateWizardComponent } from 'app/lecture/wizard-mode/lecture-update-wizard.component';
 import { FILE_EXTENSIONS } from 'app/shared/constants/file-extensions.constants';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 
 @Component({
     selector: 'jhi-lecture-update',
@@ -26,7 +25,6 @@ export class LectureUpdateComponent implements OnInit {
 
     @ViewChild(LectureUpdateWizardComponent, { static: false }) wizardComponent: LectureUpdateWizardComponent;
 
-    EditorMode = EditorMode;
     lecture: Lecture;
     isSaving: boolean;
     isProcessing: boolean;
@@ -35,7 +33,7 @@ export class LectureUpdateComponent implements OnInit {
 
     courses: Course[];
 
-    domainCommandsDescription = [new KatexCommand()];
+    domainActionsDescription = [new MonacoFormulaAction()];
     file: File;
     fileName: string;
     fileInputTouched = false;
diff --git a/src/main/webapp/app/lecture/lecture.component.html b/src/main/webapp/app/lecture/lecture.component.html
index e507242d7a13..68a82448b85e 100644
--- a/src/main/webapp/app/lecture/lecture.component.html
+++ b/src/main/webapp/app/lecture/lecture.component.html
@@ -16,7 +16,7 @@ <h2 id="page-heading">
                         id="filter-dropdown-button"
                     >
                         <fa-icon [icon]="faFilter" />
-                        <span class="d-s-none d-md-inline">{{ 'artemisApp.courseOverview.exerciseList.filter' | artemisTranslate: { num: activeFilters.size } }}</span>
+                        <span class="d-s-none d-md-inline" jhiTranslate="artemisApp.courseOverview.exerciseList.filter" [translateValues]="{ num: activeFilters.size }"></span>
                     </button>
                     <ul ngbDropdownMenu class="checkbox-menu text-nowrap pe-2" aria-labelledby="filter-dropdown-button">
                         <li>
diff --git a/src/main/webapp/app/lecture/lecture.module.ts b/src/main/webapp/app/lecture/lecture.module.ts
index 06b33f93a9ae..5cdad5fc5fa2 100644
--- a/src/main/webapp/app/lecture/lecture.module.ts
+++ b/src/main/webapp/app/lecture/lecture.module.ts
@@ -19,7 +19,6 @@ import { LectureUpdateWizardTitleComponent } from 'app/lecture/wizard-mode/lectu
 import { LectureUpdateWizardPeriodComponent } from 'app/lecture/wizard-mode/lecture-wizard-period.component';
 import { LectureUpdateWizardAttachmentsComponent } from 'app/lecture/wizard-mode/lecture-wizard-attachments.component';
 import { LectureUpdateWizardUnitsComponent } from 'app/lecture/wizard-mode/lecture-wizard-units.component';
-import { LectureUpdateWizardCompetenciesComponent } from 'app/lecture/wizard-mode/lecture-wizard-competencies.component';
 import { LectureUpdateWizardStepComponent } from 'app/lecture/wizard-mode/lecture-update-wizard-step.component';
 import { TitleChannelNameModule } from 'app/shared/form/title-channel-name/title-channel-name.module';
 import { LectureTitleChannelNameComponent } from 'app/lecture/lecture-title-channel-name.component';
@@ -53,7 +52,6 @@ const ENTITY_STATES = [...lectureRoute];
         LectureUpdateWizardPeriodComponent,
         LectureUpdateWizardAttachmentsComponent,
         LectureUpdateWizardUnitsComponent,
-        LectureUpdateWizardCompetenciesComponent,
         LectureUpdateWizardStepComponent,
         LectureTitleChannelNameComponent,
     ],
diff --git a/src/main/webapp/app/lecture/lecture.route.ts b/src/main/webapp/app/lecture/lecture.route.ts
index 60fedb85f963..11850d96840f 100644
--- a/src/main/webapp/app/lecture/lecture.route.ts
+++ b/src/main/webapp/app/lecture/lecture.route.ts
@@ -14,6 +14,9 @@ import { Authority } from 'app/shared/constants/authority.constants';
 import { lectureUnitRoute } from 'app/lecture/lecture-unit/lecture-unit-management/lecture-unit-management.route';
 import { CourseManagementResolve } from 'app/course/manage/course-management-resolve.service';
 import { CourseManagementTabBarComponent } from 'app/course/manage/course-management-tab-bar/course-management-tab-bar.component';
+import { PdfPreviewComponent } from 'app/lecture/pdf-preview/pdf-preview.component';
+import { Attachment } from 'app/entities/attachment.model';
+import { AttachmentService } from 'app/lecture/attachment.service';
 
 @Injectable({ providedIn: 'root' })
 export class LectureResolve implements Resolve<Lecture> {
@@ -31,6 +34,22 @@ export class LectureResolve implements Resolve<Lecture> {
     }
 }
 
+@Injectable({ providedIn: 'root' })
+export class AttachmentResolve implements Resolve<Attachment> {
+    constructor(private attachmentService: AttachmentService) {}
+
+    resolve(route: ActivatedRouteSnapshot): Observable<Attachment> {
+        const attachmentId = route.params['attachmentId'];
+        if (attachmentId) {
+            return this.attachmentService.find(attachmentId).pipe(
+                filter((response: HttpResponse<Attachment>) => response.ok),
+                map((attachment: HttpResponse<Attachment>) => attachment.body!),
+            );
+        }
+        return of(new Attachment());
+    }
+}
+
 export const lectureRoute: Routes = [
     {
         path: ':courseId/lectures',
@@ -91,6 +110,20 @@ export const lectureRoute: Routes = [
                                 },
                                 canActivate: [UserRouteAccessService],
                             },
+                            {
+                                path: 'attachments',
+                                canActivate: [UserRouteAccessService],
+                                children: [
+                                    {
+                                        path: ':attachmentId',
+                                        component: PdfPreviewComponent,
+                                        resolve: {
+                                            attachment: AttachmentResolve,
+                                            course: CourseManagementResolve,
+                                        },
+                                    },
+                                ],
+                            },
                             {
                                 path: 'edit',
                                 component: LectureUpdateComponent,
diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html
new file mode 100644
index 000000000000..bf47a60b82d2
--- /dev/null
+++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.html
@@ -0,0 +1,31 @@
+<div class="row justify-content-center">
+    <div class="col-12">
+        <div>
+            <h4>
+                <span jhiTranslate="artemisApp.attachment.pdfPreview.title"></span>
+                @if (attachment) {
+                    {{ attachment.id }}: {{ attachment.name }}
+                } @else if (attachmentUnit) {
+                    {{ attachmentUnit.id }}: {{ attachmentUnit.name }}
+                }
+            </h4>
+            <div class="row">
+                <div class="pdf-container" #pdfContainer>
+                    @if (isEnlargedView) {
+                        <div class="enlarged-container" (click)="closeIfOutside($event)">
+                            <canvas #enlargedCanvas></canvas>
+                            <button class="btn btn-close" (click)="closeEnlargedView($event)"></button>
+                            @if (currentPage !== 1) {
+                                <button class="btn btn-secondary nav-button left" (click)="handleNavigation('prev', $event)">←</button>
+                            }
+                            @if (currentPage !== totalPages) {
+                                <button class="btn btn-secondary nav-button right" (click)="handleNavigation('next', $event)">→</button>
+                            }
+                            <div class="page-number-display">{{ currentPage }}</div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss
new file mode 100644
index 000000000000..1ce2019305cb
--- /dev/null
+++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.scss
@@ -0,0 +1,89 @@
+.pdf-container {
+    position: relative;
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+    gap: 30px;
+    max-height: 60vh;
+    height: 60vh;
+    overflow-y: auto;
+    border: 1px solid var(--border-color);
+    padding: 10px;
+    margin: 10px;
+    width: 95%;
+    box-shadow: 0 2px 5px var(--pdf-preview-pdf-container-shadow);
+    align-items: start;
+    z-index: 0;
+
+    @media (max-width: 800px) {
+        grid-template-columns: repeat(2, 1fr);
+    }
+
+    @media (max-width: 500px) {
+        grid-template-columns: 1fr;
+    }
+}
+
+.enlarged-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background-color: var(--pdf-preview-enlarged-container-overlay);
+    z-index: 2;
+
+    .btn-close {
+        position: absolute;
+        top: 10px;
+        right: 10px;
+        cursor: pointer;
+        color: var(--bs-body-color);
+    }
+}
+
+.nav-button {
+    position: absolute;
+    transform: translateY(-50%);
+    cursor: pointer;
+    border-radius: 50%;
+    width: 30px;
+    height: 30px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    z-index: 3;
+}
+
+.nav-button.left {
+    left: calc(5% + 10px);
+
+    @media (max-width: 1200px) {
+        left: 10px;
+    }
+}
+
+.nav-button.right {
+    right: calc(5% + 10px);
+
+    @media (max-width: 1200px) {
+        right: 10px;
+    }
+}
+
+.page-number-display {
+    position: absolute;
+    bottom: 10px;
+    right: calc(5% + 10px);
+    font-size: 18px;
+    color: var(--bs-body-color);
+    z-index: 2;
+    text-shadow: 0 1px 3px rgba(0, 0, 0, 0.3);
+
+    @media (max-width: 1200px) {
+        right: 10px;
+    }
+}
diff --git a/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts
new file mode 100644
index 000000000000..f2075dc57fbb
--- /dev/null
+++ b/src/main/webapp/app/lecture/pdf-preview/pdf-preview.component.ts
@@ -0,0 +1,341 @@
+import { Component, ElementRef, HostListener, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AttachmentService } from 'app/lecture/attachment.service';
+import * as PDFJS from 'pdfjs-dist';
+import 'pdfjs-dist/build/pdf.worker';
+import { Attachment } from 'app/entities/attachment.model';
+import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
+import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service';
+import { onError } from 'app/shared/util/global.utils';
+import { AlertService } from 'app/core/util/alert.service';
+import { Subscription } from 'rxjs';
+import { Course } from 'app/entities/course.model';
+import { HttpErrorResponse } from '@angular/common/http';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+
+type NavigationDirection = 'next' | 'prev';
+
+@Component({
+    selector: 'jhi-pdf-preview-component',
+    templateUrl: './pdf-preview.component.html',
+    styleUrls: ['./pdf-preview.component.scss'],
+    standalone: true,
+    imports: [ArtemisSharedModule],
+})
+export class PdfPreviewComponent implements OnInit, OnDestroy {
+    @ViewChild('pdfContainer', { static: true }) pdfContainer: ElementRef<HTMLDivElement>;
+    @ViewChild('enlargedCanvas') enlargedCanvas: ElementRef<HTMLCanvasElement>;
+
+    readonly DEFAULT_SLIDE_WIDTH = 250;
+    course?: Course;
+    attachment?: Attachment;
+    attachmentUnit?: AttachmentUnit;
+    isEnlargedView = false;
+    currentPage = 1;
+    totalPages = 0;
+    attachmentSub: Subscription;
+    attachmentUnitSub: Subscription;
+
+    constructor(
+        public route: ActivatedRoute,
+        private attachmentService: AttachmentService,
+        private attachmentUnitService: AttachmentUnitService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit() {
+        this.route.data.subscribe((data) => {
+            this.course = data.course;
+            if ('attachment' in data) {
+                this.attachment = data.attachment;
+                this.attachmentSub = this.attachmentService.getAttachmentFile(this.course!.id!, this.attachment!.id!).subscribe({
+                    next: (blob: Blob) => this.loadPdf(URL.createObjectURL(blob)),
+                    error: (error: HttpErrorResponse) => onError(this.alertService, error),
+                });
+            } else if ('attachmentUnit' in data) {
+                this.attachmentUnit = data.attachmentUnit;
+                this.attachmentUnitSub = this.attachmentUnitService.getAttachmentFile(this.course!.id!, this.attachmentUnit!.id!).subscribe({
+                    next: (blob: Blob) => this.loadPdf(URL.createObjectURL(blob)),
+                    error: (error: HttpErrorResponse) => onError(this.alertService, error),
+                });
+            }
+        });
+    }
+
+    ngOnDestroy() {
+        this.attachmentSub?.unsubscribe();
+        this.attachmentUnitSub?.unsubscribe();
+    }
+
+    /**
+     * Handles keyboard events for navigation within the PDF viewer.
+     * @param event The keyboard event captured.
+     */
+    @HostListener('document:keydown', ['$event'])
+    handleKeyboardEvents(event: KeyboardEvent) {
+        if (this.isEnlargedView) {
+            if (event.key === 'ArrowRight' && this.currentPage < this.totalPages) {
+                this.navigatePages('next');
+            } else if (event.key === 'ArrowLeft' && this.currentPage > 1) {
+                this.navigatePages('prev');
+            }
+        }
+    }
+
+    /**
+     * Adjusts the canvas size based on the window resize event to ensure proper display.
+     */
+    @HostListener('window:resize')
+    resizeCanvasBasedOnContainer() {
+        this.adjustCanvasSize();
+    }
+
+    /**
+     * Loads a PDF from a provided URL and initializes viewer setup.
+     * @param fileUrl The URL of the file to load.
+     */
+    async loadPdf(fileUrl: string) {
+        try {
+            const loadingTask = PDFJS.getDocument(fileUrl);
+            const pdf = await loadingTask.promise;
+            this.totalPages = pdf.numPages;
+
+            for (let i = 1; i <= pdf.numPages; i++) {
+                const page = await pdf.getPage(i);
+                const viewport = page.getViewport({ scale: 2 });
+                const canvas = this.createCanvas(viewport);
+                const context = canvas.getContext('2d');
+                if (context) {
+                    await page.render({ canvasContext: context, viewport }).promise;
+                }
+
+                const container = this.createContainer(canvas, i);
+                this.pdfContainer.nativeElement.appendChild(container);
+            }
+
+            URL.revokeObjectURL(fileUrl);
+        } catch (error) {
+            onError(this.alertService, error);
+        }
+    }
+
+    /**
+     * Creates a canvas for each page of the PDF to allow for individual page rendering.
+     * @param viewport The viewport settings used for rendering the page.
+     * @returns A new HTMLCanvasElement configured for the PDF page.
+     */
+    private createCanvas(viewport: PDFJS.PageViewport): HTMLCanvasElement {
+        const canvas = document.createElement('canvas');
+        /* Canvas styling is predefined because Canvas tags do not support CSS classes
+         * as they are not HTML elements but rather a bitmap drawing surface.
+         * See: https://stackoverflow.com/a/29675448
+         * */
+        canvas.height = viewport.height;
+        canvas.width = viewport.width;
+        const fixedWidth = this.DEFAULT_SLIDE_WIDTH;
+        const scaleFactor = fixedWidth / viewport.width;
+        canvas.style.width = `${fixedWidth}px`;
+        canvas.style.height = `${viewport.height * scaleFactor}px`;
+        return canvas;
+    }
+
+    /**
+     * Creates a container div for each canvas, facilitating layering and interaction.
+     * @param canvas The canvas element that displays a PDF page.
+     * @param pageIndex The index of the page within the PDF document.
+     * @returns A configured div element that includes the canvas and interactive overlays.
+     */
+    createContainer(canvas: HTMLCanvasElement, pageIndex: number): HTMLDivElement {
+        const container = document.createElement('div');
+        /* Dynamically created elements are not detected by DOM, that is why we need to set the styles manually.
+         * See: https://stackoverflow.com/a/70911189
+         */
+        container.classList.add('pdf-page-container');
+        container.style.cssText = `position: relative; display: inline-block; width: ${canvas.style.width}; height: ${canvas.style.height}; margin: 20px; box-shadow: 0 2px 6px var(--pdf-preview-canvas-shadow);`;
+
+        const overlay = this.createOverlay(pageIndex);
+        container.appendChild(canvas);
+        container.appendChild(overlay);
+
+        container.addEventListener('mouseenter', () => {
+            overlay.style.opacity = '1';
+        });
+        container.addEventListener('mouseleave', () => {
+            overlay.style.opacity = '0';
+        });
+        overlay.addEventListener('click', () => this.displayEnlargedCanvas(canvas, pageIndex));
+
+        return container;
+    }
+
+    /**
+     * Generates an interactive overlay for each PDF page to allow for user interactions.
+     * @param pageIndex The index of the page.
+     * @returns A div element styled as an overlay.
+     */
+    private createOverlay(pageIndex: number): HTMLDivElement {
+        const overlay = document.createElement('div');
+        overlay.innerHTML = `<span>${pageIndex}</span>`;
+        /* Dynamically created elements are not detected by DOM, that is why we need to set the styles manually.
+         * See: https://stackoverflow.com/a/70911189
+         */
+        overlay.style.cssText = `position: absolute; top: 0; left: 0; width: 100%; height: 100%; display: flex; justify-content: center; align-items: center; font-size: 24px; color: white; z-index: 1; transition: opacity 0.3s ease; opacity: 0; cursor: pointer; background-color: var(--pdf-preview-container-overlay)`;
+        return overlay;
+    }
+
+    /**
+     * Dynamically updates the canvas size within an enlarged view based on the viewport.
+     */
+    adjustCanvasSize = () => {
+        if (this.isEnlargedView) {
+            const canvasElements = this.pdfContainer.nativeElement.querySelectorAll('.pdf-page-container canvas');
+            if (this.currentPage - 1 < canvasElements.length) {
+                const canvas = canvasElements[this.currentPage - 1] as HTMLCanvasElement;
+                this.updateEnlargedCanvas(canvas);
+            }
+        }
+    };
+
+    /**
+     * Displays a canvas in an enlarged view for detailed examination.
+     * @param originalCanvas The original canvas element displaying the page.
+     * @param pageIndex The index of the page being displayed.
+     */
+    displayEnlargedCanvas(originalCanvas: HTMLCanvasElement, pageIndex: number) {
+        this.isEnlargedView = true;
+        this.currentPage = pageIndex;
+        this.updateEnlargedCanvas(originalCanvas);
+        this.toggleBodyScroll(true);
+    }
+    /**
+     * Updates the enlarged canvas dimensions to optimize PDF page display within the current viewport.
+     * This method dynamically adjusts the size, position, and scale of the canvas to maintain the aspect ratio,
+     * ensuring the content is centered and displayed appropriately within the available space.
+     * It is called within an animation frame to synchronize updates with the browser's render cycle for smooth visuals.
+     *
+     * @param {HTMLCanvasElement} originalCanvas - The source canvas element used to extract image data for resizing and redrawing.
+     */
+    updateEnlargedCanvas(originalCanvas: HTMLCanvasElement) {
+        requestAnimationFrame(() => {
+            if (!this.isEnlargedView) return;
+
+            const scaleFactor = this.calculateScaleFactor(originalCanvas);
+            this.resizeCanvas(originalCanvas, scaleFactor);
+            this.redrawCanvas(originalCanvas);
+            this.positionCanvas();
+        });
+    }
+
+    /**
+     * Calculates the scaling factor to adjust the canvas size based on the dimensions of the container.
+     * This method ensures that the canvas is scaled to fit within the container without altering the aspect ratio.
+     *
+     * @param {HTMLCanvasElement} originalCanvas - The original canvas element representing the PDF page.
+     * @returns {number} The scaling factor used to resize the original canvas to fit within the container dimensions.
+     */
+    calculateScaleFactor(originalCanvas: HTMLCanvasElement): number {
+        const containerWidth = this.pdfContainer.nativeElement.clientWidth;
+        const containerHeight = this.pdfContainer.nativeElement.clientHeight;
+        const scaleX = containerWidth / originalCanvas.width;
+        const scaleY = containerHeight / originalCanvas.height;
+        return Math.min(scaleX, scaleY);
+    }
+
+    /**
+     * Resizes the canvas according to the computed scale factor.
+     * This method updates the dimensions of the enlarged canvas element to ensure that the entire PDF page
+     * is visible and properly scaled within the viewer.
+     *
+     * @param {HTMLCanvasElement} originalCanvas - The canvas element from which the image is scaled.
+     * @param {number} scaleFactor - The factor by which the canvas is resized.
+     */
+    resizeCanvas(originalCanvas: HTMLCanvasElement, scaleFactor: number): void {
+        const enlargedCanvas = this.enlargedCanvas.nativeElement;
+        enlargedCanvas.width = originalCanvas.width * scaleFactor;
+        enlargedCanvas.height = originalCanvas.height * scaleFactor;
+    }
+
+    /**
+     * Redraws the original canvas content onto the enlarged canvas at the updated scale.
+     * This method ensures that the image is rendered clearly and correctly positioned on the enlarged canvas.
+     *
+     * @param {HTMLCanvasElement} originalCanvas - The original canvas containing the image to be redrawn.
+     */
+    redrawCanvas(originalCanvas: HTMLCanvasElement): void {
+        const enlargedCanvas = this.enlargedCanvas.nativeElement;
+        const context = enlargedCanvas.getContext('2d');
+        if (context) {
+            context.clearRect(0, 0, enlargedCanvas.width, enlargedCanvas.height);
+            context.drawImage(originalCanvas, 0, 0, enlargedCanvas.width, enlargedCanvas.height);
+        }
+    }
+
+    /**
+     * Adjusts the position of the enlarged canvas to center it within the viewport of the PDF container.
+     * This method ensures that the canvas is both vertically and horizontally centered, providing a consistent
+     * and visually appealing layout.
+     */
+    positionCanvas(): void {
+        const enlargedCanvas = this.enlargedCanvas.nativeElement;
+        const containerWidth = this.pdfContainer.nativeElement.clientWidth;
+        const containerHeight = this.pdfContainer.nativeElement.clientHeight;
+
+        enlargedCanvas.style.position = 'absolute';
+        enlargedCanvas.style.left = `${(containerWidth - enlargedCanvas.width) / 2}px`;
+        enlargedCanvas.style.top = `${(containerHeight - enlargedCanvas.height) / 2}px`;
+        enlargedCanvas.parentElement!.style.top = `${this.pdfContainer.nativeElement.scrollTop}px`;
+    }
+
+    /**
+     * Closes the enlarged view of the PDF and re-enables scrolling in the PDF container.
+     */
+    closeEnlargedView(event: MouseEvent) {
+        this.isEnlargedView = false;
+        this.toggleBodyScroll(false);
+        event.stopPropagation();
+    }
+
+    /**
+     * Toggles the ability to scroll through the PDF container.
+     * @param disable A boolean flag indicating whether scrolling should be disabled (`true`) or enabled (`false`).
+     */
+    toggleBodyScroll(disable: boolean): void {
+        this.pdfContainer.nativeElement.style.overflow = disable ? 'hidden' : 'auto';
+    }
+
+    /**
+     * Closes the enlarged view if a click event occurs outside the actual canvas area but within the enlarged container.
+     * @param event The mouse event captured, used to determine the location of the click.
+     */
+    closeIfOutside(event: MouseEvent): void {
+        const target = event.target as HTMLElement;
+        const enlargedCanvas = this.enlargedCanvas.nativeElement;
+
+        if (target.classList.contains('enlarged-container') && target !== enlargedCanvas) {
+            this.closeEnlargedView(event);
+        }
+    }
+
+    /**
+     * Handles navigation between PDF pages and stops event propagation to prevent unwanted side effects.
+     * @param direction The direction to navigate.
+     * @param event The MouseEvent to be stopped.
+     */
+    handleNavigation(direction: NavigationDirection, event: MouseEvent): void {
+        event.stopPropagation();
+        this.navigatePages(direction);
+    }
+
+    /**
+     * Navigates to a specific page in the PDF based on the direction relative to the current page.
+     * @param direction The navigation direction (next or previous).
+     */
+    navigatePages(direction: NavigationDirection) {
+        const nextPageIndex = direction === 'next' ? this.currentPage + 1 : this.currentPage - 1;
+        if (nextPageIndex > 0 && nextPageIndex <= this.totalPages) {
+            this.currentPage = nextPageIndex;
+            const canvas = this.pdfContainer.nativeElement.querySelectorAll('.pdf-page-container canvas')[this.currentPage - 1] as HTMLCanvasElement;
+            this.updateEnlargedCanvas(canvas);
+        }
+    }
+}
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard-step.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard-step.component.ts
index 3827abac634f..9c8d6973a233 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard-step.component.ts
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard-step.component.ts
@@ -19,6 +19,6 @@ export class LectureUpdateWizardStepComponent {
     @Input()
     descriptionTranslationKey: string;
 
-    faCheck = faCheck;
-    faDotCircle = faDotCircle;
+    protected readonly faCheck = faCheck;
+    protected readonly faDotCircle = faDotCircle;
 }
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.html
index 71a77421d145..cb704901206e 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.html
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.html
@@ -1,19 +1,16 @@
 <div>
-    @if (currentStep >= 1) {
+    @if (currentStep >= LECTURE_UPDATE_WIZARD_TITLE_STEP) {
         <jhi-lecture-update-wizard-title class="form-step" [currentStep]="currentStep" [lecture]="lecture" />
     }
-    @if (currentStep >= 2) {
+    @if (currentStep >= LECTURE_UPDATE_WIZARD_PERIOD_STEP) {
         <jhi-lecture-update-wizard-period class="form-step" [currentStep]="currentStep" [lecture]="lecture" [validateDatesFunction]="validateDatesFunction" />
     }
-    @if (currentStep >= 3) {
+    @if (currentStep >= LECTURE_UPDATE_WIZARD_ATTACHMENT_STEP) {
         <jhi-lecture-update-wizard-attachments class="form-step" [currentStep]="currentStep" [lecture]="lecture" />
     }
-    @if (currentStep >= 4) {
+    @if (currentStep >= LECTURE_UPDATE_WIZARD_UNIT_STEP) {
         <jhi-lecture-update-wizard-units class="form-step" [currentStep]="currentStep" [lecture]="lecture" />
     }
-    @if (currentStep >= 5) {
-        <jhi-lecture-update-wizard-competencies class="form-step" [currentStep]="currentStep" [lecture]="lecture" [isSaving]="isSaving" />
-    }
     <!-- Bottom Navigation Bar -->
     <div class="d-flex align-items-center">
         <div class="me-3">
@@ -24,38 +21,32 @@
         <div class="flex-grow-1 d-flex justify-content-center">
             <div class="flex-grow-1 d-flex justify-content-space-between ms-5 me-5 code-hint-generation-wrapper">
                 <jhi-lecture-update-wizard-step
-                    [currentlySelected]="isCurrent(1)"
-                    [isPerformed]="isCompleted(1)"
+                    [currentlySelected]="currentStep === LECTURE_UPDATE_WIZARD_TITLE_STEP"
+                    [isPerformed]="currentStep > LECTURE_UPDATE_WIZARD_TITLE_STEP"
                     [labelTranslationKey]="'artemisApp.lecture.wizardMode.steps.titleStepTitle'"
                 />
-                <div class="connector" [ngClass]="isCompleted(1) ? 'check' : 'unset'"></div>
+                <div class="connector" [ngClass]="currentStep > LECTURE_UPDATE_WIZARD_TITLE_STEP ? 'check' : 'unset'"></div>
                 <jhi-lecture-update-wizard-step
-                    [currentlySelected]="isCurrent(2)"
-                    [isPerformed]="isCompleted(2)"
+                    [currentlySelected]="currentStep === LECTURE_UPDATE_WIZARD_PERIOD_STEP"
+                    [isPerformed]="currentStep > LECTURE_UPDATE_WIZARD_PERIOD_STEP"
                     [labelTranslationKey]="'artemisApp.lecture.wizardMode.steps.periodStepTitle'"
                 />
-                <div class="connector" [ngClass]="isCompleted(2) ? 'check' : 'unset'"></div>
+                <div class="connector" [ngClass]="currentStep > LECTURE_UPDATE_WIZARD_PERIOD_STEP ? 'check' : 'unset'"></div>
                 <jhi-lecture-update-wizard-step
-                    [currentlySelected]="isCurrent(3)"
-                    [isPerformed]="isCompleted(3)"
+                    [currentlySelected]="currentStep === LECTURE_UPDATE_WIZARD_ATTACHMENT_STEP"
+                    [isPerformed]="currentStep > LECTURE_UPDATE_WIZARD_ATTACHMENT_STEP"
                     [labelTranslationKey]="'artemisApp.lecture.wizardMode.steps.attachmentsStepTitle'"
                 />
-                <div class="connector" [ngClass]="isCompleted(3) ? 'check' : 'unset'"></div>
+                <div class="connector" [ngClass]="currentStep > LECTURE_UPDATE_WIZARD_ATTACHMENT_STEP ? 'check' : 'unset'"></div>
                 <jhi-lecture-update-wizard-step
-                    [currentlySelected]="isCurrent(4)"
-                    [isPerformed]="isCompleted(4)"
+                    [currentlySelected]="currentStep === LECTURE_UPDATE_WIZARD_UNIT_STEP"
+                    [isPerformed]="currentStep > LECTURE_UPDATE_WIZARD_UNIT_STEP"
                     [labelTranslationKey]="'artemisApp.lecture.wizardMode.steps.unitsStepTitle'"
                 />
-                <div class="connector" [ngClass]="isCompleted(4) ? 'check' : 'unset'"></div>
-                <jhi-lecture-update-wizard-step
-                    [currentlySelected]="isCurrent(5)"
-                    [isPerformed]="isCompleted(5)"
-                    [labelTranslationKey]="'artemisApp.lecture.wizardMode.steps.competenciesStepTitle'"
-                />
             </div>
         </div>
         <div class="ms-3">
-            <button type="button" id="next" [disabled]="(currentStep === 2 && !lecture.title) || isSaving" class="btn btn-primary" (click)="next()">
+            <button type="button" id="next" [disabled]="(currentStep === LECTURE_UPDATE_WIZARD_PERIOD_STEP && !lecture.title) || isSaving" class="btn btn-primary" (click)="next()">
                 <fa-icon [icon]="getNextIcon()" />&nbsp;<span [jhiTranslate]="getNextText()">Next</span>
             </button>
         </div>
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.ts
index ea23823ea0dd..d360ffc962ca 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.ts
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-update-wizard.component.ts
@@ -5,7 +5,6 @@ import { Lecture } from 'app/entities/lecture.model';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { faArrowRight, faCheck, faHandshakeAngle } from '@fortawesome/free-solid-svg-icons';
 import { LectureUpdateWizardUnitsComponent } from 'app/lecture/wizard-mode/lecture-wizard-units.component';
-import { LectureUpdateWizardCompetenciesComponent } from 'app/lecture/wizard-mode/lecture-wizard-competencies.component';
 import { take } from 'rxjs/operators';
 
 @Component({
@@ -21,7 +20,11 @@ export class LectureUpdateWizardComponent implements OnInit {
     @Input() isSaving: boolean;
 
     @ViewChild(LectureUpdateWizardUnitsComponent, { static: false }) unitsComponent: LectureUpdateWizardUnitsComponent;
-    @ViewChild(LectureUpdateWizardCompetenciesComponent, { static: false }) competenciesComponent: LectureUpdateWizardCompetenciesComponent;
+
+    readonly LECTURE_UPDATE_WIZARD_TITLE_STEP = 1;
+    readonly LECTURE_UPDATE_WIZARD_PERIOD_STEP = 2;
+    readonly LECTURE_UPDATE_WIZARD_ATTACHMENT_STEP = 3;
+    readonly LECTURE_UPDATE_WIZARD_UNIT_STEP = 4;
 
     currentStep: number;
 
@@ -47,7 +50,13 @@ export class LectureUpdateWizardComponent implements OnInit {
             if (params.step && !isNaN(+params.step)) {
                 this.currentStep = +params.step;
             } else {
-                this.currentStep = this.lecture.id ? 5 : this.lecture.startDate !== undefined || this.lecture.endDate !== undefined ? 2 : 1;
+                if (this.lecture.id) {
+                    this.currentStep = this.LECTURE_UPDATE_WIZARD_UNIT_STEP;
+                } else if (this.lecture.startDate === undefined && this.lecture.endDate === undefined) {
+                    this.currentStep = this.LECTURE_UPDATE_WIZARD_TITLE_STEP;
+                } else if (!this.lecture.id) {
+                    this.currentStep = this.LECTURE_UPDATE_WIZARD_PERIOD_STEP;
+                }
             }
 
             this.router.navigate([], {
@@ -62,7 +71,7 @@ export class LectureUpdateWizardComponent implements OnInit {
      * Progress to the next step of the wizard mode
      */
     next() {
-        if (this.currentStep === 2 || this.currentStep === 5) {
+        if (this.currentStep === this.LECTURE_UPDATE_WIZARD_PERIOD_STEP || this.currentStep === this.LECTURE_UPDATE_WIZARD_UNIT_STEP) {
             this.saveLectureFunction();
             return;
         }
@@ -77,30 +86,16 @@ export class LectureUpdateWizardComponent implements OnInit {
         this.currentStep++;
     }
 
-    /**
-     * Checks if the given step has already been completed
-     */
-    isCompleted(step: number) {
-        return this.currentStep > step;
-    }
-
-    /**
-     * Checks if the given step is the current one
-     */
-    isCurrent(step: number) {
-        return this.currentStep === step;
-    }
-
     getNextIcon() {
-        return this.currentStep < 5 ? faArrowRight : faCheck;
+        return this.currentStep < this.LECTURE_UPDATE_WIZARD_UNIT_STEP ? faArrowRight : faCheck;
     }
 
     getNextText() {
-        return this.currentStep < 5 ? 'artemisApp.lecture.home.nextStepLabel' : 'entity.action.finish';
+        return this.currentStep < this.LECTURE_UPDATE_WIZARD_UNIT_STEP ? 'artemisApp.lecture.home.nextStepLabel' : 'entity.action.finish';
     }
 
     toggleWizardMode() {
-        if (this.currentStep <= 2) {
+        if (this.currentStep <= this.LECTURE_UPDATE_WIZARD_PERIOD_STEP) {
             this.toggleModeFunction();
         } else {
             this.router.navigate(['course-management', this.lecture.course!.id, 'lectures', this.lecture.id]);
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html
deleted file mode 100644
index adfb4aa9ede0..000000000000
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<div class="form-group">
-    <h1><span jhiTranslate="artemisApp.lecture.wizardMode.steps.competenciesStepTitle"></span></h1>
-    <p>
-        <span jhiTranslate="artemisApp.lecture.wizardMode.steps.competenciesStepMessage"></span>
-    </p>
-    <div class="row">
-        <div class="col-12">
-            @if (competencies && competencies.length > 0) {
-                <td class="table-responsive">
-                    <table class="table table-striped">
-                        <thead>
-                            <tr>
-                                <th><span>ID</span></th>
-                                <th>
-                                    <span>{{ 'artemisApp.lecture.wizardMode.competencyTitle' | artemisTranslate }}</span>
-                                </th>
-                                <th>
-                                    <span>{{ 'artemisApp.lecture.wizardMode.competencyConnectedUnits' | artemisTranslate }}</span>
-                                </th>
-                                <th></th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            @for (competency of competencies; track trackCompetencyId($index, competency)) {
-                                <tr class="position-relative">
-                                    <td>
-                                        {{ competency.id }}
-                                        @if (currentlyProcessedCompetency?.id === competency?.id) {
-                                            <div class="edit-overlay">
-                                                {{ 'artemisApp.lecture.attachments.isBeingEdited' | artemisTranslate }}
-                                            </div>
-                                        }
-                                    </td>
-                                    <td>{{ competency.title }}</td>
-                                    <td>{{ getConnectedUnitsForCompetency(competency) }}</td>
-                                    <td class="text-end">
-                                        <div class="flex-btn-group-container">
-                                            <button type="submit" (click)="startEditCompetency(competency)" class="btn btn-primary btn-sm me-1">
-                                                <fa-icon [icon]="faPencilAlt" />
-                                                <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
-                                            </button>
-                                            <button type="submit" (click)="startConnectingCompetency(competency)" class="btn btn-primary btn-sm me-1">
-                                                <fa-icon [icon]="faLink" />
-                                                <span class="d-none d-md-inline" jhiTranslate="entity.action.connect"></span>
-                                            </button>
-                                            @if (lecture.isAtLeastInstructor) {
-                                                <button
-                                                    jhiDeleteButton
-                                                    [entityTitle]="competency?.title || ''"
-                                                    deleteQuestion="artemisApp.attachment.deleteQuestion"
-                                                    [dialogError]="dialogError$"
-                                                    (delete)="deleteCompetency(competency)"
-                                                ></button>
-                                            }
-                                        </div>
-                                    </td>
-                                </tr>
-                            }
-                        </tbody>
-                    </table>
-                </td>
-            }
-        </div>
-    </div>
-    @if (isLoadingCompetencies) {
-        <div class="d-flex justify-content-center">
-            <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
-            </div>
-        </div>
-    }
-    @if (!isEditingCompetency) {
-        <div class="form-group">
-            <button id="addCompetencyButton" class="btn btn-primary" type="button" [disabled]="isAddingCompetency" (click)="showCreateCompetency()">
-                <span jhiTranslate="artemisApp.competency.create.title"></span>
-            </button>
-        </div>
-    }
-    @if (isLoadingCompetencyForm) {
-        <div class="d-flex justify-content-center">
-            <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
-            </div>
-        </div>
-    }
-    @if ((isAddingCompetency || isEditingCompetency || isConnectingCompetency) && !isLoadingCompetencyForm) {
-        <jhi-competency-form
-            [isEditMode]="isEditingCompetency"
-            [isInConnectMode]="isConnectingCompetency"
-            [formData]="competencyFormData"
-            (formSubmitted)="onCompetencyFormSubmitted($event)"
-            [hasCancelButton]="true"
-            (onCancel)="onCompetencyFormCanceled()"
-            [courseId]="lecture.course!.id!"
-            [lecturesOfCourseWithLectureUnits]="[lecture]"
-            [isInSingleLectureMode]="true"
-        />
-    }
-</div>
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.scss b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.scss
deleted file mode 100644
index b23d804a9fd8..000000000000
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-.edit-overlay {
-    position: absolute;
-    left: 0;
-    right: 0;
-    top: -1px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background-color: var(--lecture-attachment-edit-overlay-color);
-    z-index: 9;
-    font-size: 18px;
-    height: calc(100% + 1px);
-    border: none;
-}
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.ts
deleted file mode 100644
index 8b6253399a31..000000000000
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-competencies.component.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable, Subject } from 'rxjs';
-import { Lecture } from 'app/entities/lecture.model';
-import { Competency } from 'app/entities/competency.model';
-import { onError } from 'app/shared/util/global.utils';
-import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
-import { faLink, faPencilAlt } from '@fortawesome/free-solid-svg-icons';
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { AlertService } from 'app/core/util/alert.service';
-import { LectureService } from 'app/lecture/lecture.service';
-import { CompetencyService } from 'app/course/competencies/competency.service';
-import { finalize } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
-import { CourseCompetencyFormData } from 'app/course/competencies/forms/course-competency-form.component';
-
-@Component({
-    selector: 'jhi-lecture-update-wizard-competencies',
-    templateUrl: './lecture-wizard-competencies.component.html',
-    styleUrls: ['./lecture-wizard-competencies.component.scss'],
-})
-export class LectureUpdateWizardCompetenciesComponent implements OnInit {
-    @Input() currentStep: number;
-    @Input() lecture: Lecture;
-    @Input() isSaving: boolean;
-
-    isAddingCompetency: boolean;
-    isLoadingCompetencyForm: boolean;
-    isLoadingCompetencies: boolean;
-    isEditingCompetency: boolean;
-    isConnectingCompetency: boolean;
-
-    currentlyProcessedCompetency: Competency;
-    competencies: Competency[] = [];
-    competencyFormData: CourseCompetencyFormData;
-
-    private dialogErrorSource = new Subject<string>();
-    dialogError$ = this.dialogErrorSource.asObservable();
-
-    faPencilAlt = faPencilAlt;
-    faLink = faLink;
-
-    constructor(
-        protected alertService: AlertService,
-        protected lectureService: LectureService,
-        protected competencyService: CompetencyService,
-        protected courseCompetencyService: CompetencyService,
-        protected translateService: TranslateService,
-    ) {}
-
-    ngOnInit() {
-        this.loadCompetencies();
-    }
-
-    showCreateCompetency() {
-        this.isLoadingCompetencyForm = true;
-        this.isConnectingCompetency = false;
-        this.isAddingCompetency = !this.isAddingCompetency;
-        this.competencyFormData = {
-            id: undefined,
-            title: undefined,
-            description: undefined,
-            taxonomy: undefined,
-            connectedLectureUnits: undefined,
-        };
-
-        this.subscribeToLoadUnitResponse(this.lectureService.findWithDetails(this.lecture.id!));
-    }
-
-    protected subscribeToLoadUnitResponse(result: Observable<HttpResponse<Lecture>>) {
-        result.subscribe({
-            next: (response: HttpResponse<Lecture>) => this.onLoadUnitSuccess(response.body!),
-            error: (error: HttpErrorResponse) => this.onLoadError(error),
-        });
-    }
-
-    protected subscribeToLoadCompetenciesResponse(result: Observable<HttpResponse<Competency[]>>) {
-        result.subscribe({
-            next: (response: HttpResponse<Competency[]>) => this.onLoadCompetenciesSuccess(response.body!),
-            error: (error: HttpErrorResponse) => this.onLoadError(error),
-        });
-    }
-
-    /**
-     * Action on successful lecture unit fetch
-     */
-    protected onLoadUnitSuccess(lecture: Lecture) {
-        this.lecture = lecture;
-
-        this.isLoadingCompetencyForm = false;
-    }
-
-    /**
-     * Action on successful competencies fetch
-     */
-    protected onLoadCompetenciesSuccess(competencies: Competency[]) {
-        this.isLoadingCompetencies = false;
-
-        this.competencies = competencies;
-    }
-
-    /**
-     * Action on unsuccessful fetch
-     * @param error the error handed to the alert service
-     */
-    protected onLoadError(error: HttpErrorResponse) {
-        this.isSaving = false;
-        this.isLoadingCompetencyForm = false;
-        this.isLoadingCompetencies = false;
-
-        onError(this.alertService, error);
-    }
-
-    onCompetencyFormSubmitted(formData: CourseCompetencyFormData) {
-        if (this.isEditingCompetency) {
-            this.editCompetency(formData);
-        } else {
-            this.createCompetency(formData);
-        }
-    }
-
-    createCompetency(formData: CourseCompetencyFormData) {
-        if (!formData?.title) {
-            return;
-        }
-
-        const { title, description, taxonomy, connectedLectureUnits } = formData;
-        this.currentlyProcessedCompetency = {};
-
-        this.currentlyProcessedCompetency.title = title;
-        this.currentlyProcessedCompetency.description = description;
-        this.currentlyProcessedCompetency.taxonomy = taxonomy;
-        this.currentlyProcessedCompetency.lectureUnits = connectedLectureUnits;
-
-        this.isLoadingCompetencyForm = true;
-
-        this.competencyService
-            .create(this.currentlyProcessedCompetency!, this.lecture.course!.id!)
-            .pipe(
-                finalize(() => {
-                    this.isLoadingCompetencyForm = false;
-                }),
-            )
-            .subscribe({
-                next: (response: HttpResponse<Competency>) => {
-                    this.isAddingCompetency = false;
-
-                    // The rest api is returning lecture units and exercises separately after creating/editing but we
-                    // need the unit to show it in the table as connected. Since it's only for showing it, as a
-                    // workaround we take the unit from the lecture which is the same one.
-                    const newCompetency = response.body!;
-                    const exerciseUnits = this.lecture.lectureUnits?.filter((unit: ExerciseUnit) => newCompetency.exercises?.find((exercise) => exercise.id === unit.exercise?.id));
-                    newCompetency.lectureUnits = newCompetency.lectureUnits?.concat(exerciseUnits ?? []);
-
-                    this.competencies = this.competencies.concat(newCompetency);
-
-                    this.alertService.success(`Competency ${this.currentlyProcessedCompetency.title} was successfully created.`);
-                },
-                error: (res: HttpErrorResponse) => onError(this.alertService, res),
-            });
-    }
-
-    editCompetency(formData: CourseCompetencyFormData) {
-        const { title, description, taxonomy, connectedLectureUnits } = formData;
-
-        this.currentlyProcessedCompetency.title = title;
-        this.currentlyProcessedCompetency.description = description;
-        this.currentlyProcessedCompetency.taxonomy = taxonomy;
-        this.currentlyProcessedCompetency.lectureUnits = connectedLectureUnits;
-
-        this.isLoadingCompetencyForm = true;
-
-        this.competencyService
-            .update(this.currentlyProcessedCompetency, this.lecture.course!.id!)
-            .pipe(
-                finalize(() => {
-                    this.isLoadingCompetencyForm = false;
-                }),
-            )
-            .subscribe({
-                next: (response: HttpResponse<Competency>) => {
-                    this.isEditingCompetency = false;
-                    this.isConnectingCompetency = false;
-
-                    // The rest api is returning lecture units and exercises separately after creating/editing but we
-                    // need the unit to show it in the table as connected. Since it's only for showing it, as a
-                    // workaround we take the unit from the lecture which is the same one.
-                    const editedCompetency = response.body!;
-                    const exerciseUnits = this.lecture.lectureUnits?.filter((unit: ExerciseUnit) =>
-                        editedCompetency.exercises?.find((exercise) => exercise.id === unit.exercise?.id),
-                    );
-                    editedCompetency.lectureUnits = editedCompetency.lectureUnits?.concat(exerciseUnits ?? []);
-
-                    const index = this.competencies.findIndex((competency) => competency.id === this.currentlyProcessedCompetency.id);
-                    if (index === -1) {
-                        this.competencies = this.competencies.concat(editedCompetency);
-                    } else {
-                        this.competencies[index] = editedCompetency;
-                    }
-
-                    this.alertService.success(`Competency ${this.currentlyProcessedCompetency.title} was successfully edited.`);
-                    this.currentlyProcessedCompetency = {};
-                },
-                error: (res: HttpErrorResponse) => onError(this.alertService, res),
-            });
-    }
-
-    trackCompetencyId(index: number, item: Competency) {
-        return item.id;
-    }
-
-    loadCompetencies() {
-        this.isLoadingCompetencies = true;
-        this.isLoadingCompetencyForm = true;
-
-        this.subscribeToLoadCompetenciesResponse(this.courseCompetencyService.getAllForCourse(this.lecture.course!.id!));
-        this.subscribeToLoadUnitResponse(this.lectureService.findWithDetails(this.lecture.id!));
-    }
-
-    getConnectedUnitsForCompetency(competency: Competency) {
-        const units = competency.lectureUnits?.filter((unit) => this.lecture.lectureUnits?.find((u) => u.id === unit.id));
-
-        if (units === undefined || units.length === 0) {
-            return this.translateService.instant('artemisApp.lecture.wizardMode.competencyNoConnectedUnits');
-        }
-
-        return units.map((unit) => unit.name).join(', ');
-    }
-
-    startEditCompetency(competency: Competency) {
-        const connectedUnits: LectureUnit[] = [];
-        competency.lectureUnits?.forEach((unit) => connectedUnits.push(Object.assign({}, unit)));
-
-        this.isLoadingCompetencyForm = true;
-        this.isEditingCompetency = true;
-        this.currentlyProcessedCompetency = competency;
-
-        this.competencyFormData = {
-            id: competency.id,
-            title: competency.title,
-            description: competency.description,
-            taxonomy: competency.taxonomy,
-            connectedLectureUnits: connectedUnits,
-        };
-
-        this.subscribeToLoadUnitResponse(this.lectureService.findWithDetails(this.lecture.id!));
-    }
-
-    startConnectingCompetency(competency: Competency) {
-        this.isConnectingCompetency = true;
-
-        this.startEditCompetency(competency);
-    }
-
-    deleteCompetency(competency: Competency) {
-        this.competencyService.delete(competency.id!, this.lecture.course!.id!).subscribe({
-            next: () => {
-                this.competencies = this.competencies.filter((existingCompetency) => existingCompetency.id !== competency.id);
-                this.dialogErrorSource.next('');
-            },
-            error: (error: HttpErrorResponse) => this.dialogErrorSource.next(error.message),
-        });
-    }
-
-    onCompetencyFormCanceled() {
-        this.isAddingCompetency = false;
-        this.isEditingCompetency = false;
-        this.isConnectingCompetency = false;
-        this.isLoadingCompetencyForm = false;
-
-        this.currentlyProcessedCompetency = {};
-    }
-}
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html
index 9656e52daf04..9100d8436184 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.html
@@ -6,6 +6,6 @@ <h1><span jhiTranslate="artemisApp.lecture.wizardMode.steps.titleStepTitle"></sp
     </form>
     <div class="form-group" id="field_description">
         <label class="form-control-label" jhiTranslate="artemisApp.lecture.description" for="field_description"></label>
-        <jhi-markdown-editor class="markdown-editor" [domainCommands]="domainCommandsDescription" [(markdown)]="lecture.description" [editorMode]="EditorMode.LATEX" />
+        <jhi-markdown-editor-monaco class="markdown-editor" [domainActions]="domainActionsDescription" [(markdown)]="lecture.description" />
     </div>
 </div>
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts
index 8748b9232417..c8b89b284ffb 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-title.component.ts
@@ -1,7 +1,6 @@
 import { Component, Input } from '@angular/core';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
-import { EditorMode } from 'app/shared/markdown-editor/markdown-editor.component';
 import { Lecture } from 'app/entities/lecture.model';
+import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 
 @Component({
     selector: 'jhi-lecture-update-wizard-title',
@@ -11,8 +10,7 @@ export class LectureUpdateWizardTitleComponent {
     @Input() currentStep: number;
     @Input() lecture: Lecture;
 
-    domainCommandsDescription = [new KatexCommand()];
-    EditorMode = EditorMode;
+    domainActionsDescription = [new MonacoFormulaAction()];
 
     constructor() {}
 }
diff --git a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.ts b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.ts
index 71d2484fbba4..9d08f4063e84 100644
--- a/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.ts
+++ b/src/main/webapp/app/lecture/wizard-mode/lecture-wizard-units.component.ts
@@ -105,12 +105,13 @@ export class LectureUpdateWizardUnitsComponent implements OnInit {
             return;
         }
 
-        const { name, releaseDate, content } = formData;
+        const { name, releaseDate, content, competencies } = formData;
 
         this.currentlyProcessedTextUnit = this.isEditingLectureUnit ? this.currentlyProcessedTextUnit : new TextUnit();
         this.currentlyProcessedTextUnit.name = name;
         this.currentlyProcessedTextUnit.releaseDate = releaseDate;
         this.currentlyProcessedTextUnit.content = content;
+        this.currentlyProcessedTextUnit.competencies = competencies;
 
         (this.isEditingLectureUnit
             ? this.textUnitService.update(this.currentlyProcessedTextUnit, this.lecture.id!)
@@ -129,13 +130,14 @@ export class LectureUpdateWizardUnitsComponent implements OnInit {
             return;
         }
 
-        const { name, description, releaseDate, source } = formData;
+        const { name, description, releaseDate, source, competencies } = formData;
 
         this.currentlyProcessedVideoUnit = this.isEditingLectureUnit ? this.currentlyProcessedVideoUnit : new VideoUnit();
         this.currentlyProcessedVideoUnit.name = name || undefined;
         this.currentlyProcessedVideoUnit.releaseDate = releaseDate || undefined;
         this.currentlyProcessedVideoUnit.description = description || undefined;
         this.currentlyProcessedVideoUnit.source = source || undefined;
+        this.currentlyProcessedVideoUnit.competencies = competencies;
 
         (this.isEditingLectureUnit
             ? this.videoUnitService.update(this.currentlyProcessedVideoUnit, this.lecture.id!)
@@ -154,13 +156,14 @@ export class LectureUpdateWizardUnitsComponent implements OnInit {
             return;
         }
 
-        const { name, description, releaseDate, source } = formData;
+        const { name, description, releaseDate, source, competencies } = formData;
 
         this.currentlyProcessedOnlineUnit = this.isEditingLectureUnit ? this.currentlyProcessedOnlineUnit : new OnlineUnit();
         this.currentlyProcessedOnlineUnit.name = name || undefined;
         this.currentlyProcessedOnlineUnit.releaseDate = releaseDate || undefined;
         this.currentlyProcessedOnlineUnit.description = description || undefined;
         this.currentlyProcessedOnlineUnit.source = source || undefined;
+        this.currentlyProcessedOnlineUnit.competencies = competencies || undefined;
 
         (this.isEditingLectureUnit
             ? this.onlineUnitService.update(this.currentlyProcessedOnlineUnit, this.lecture.id!)
@@ -179,7 +182,7 @@ export class LectureUpdateWizardUnitsComponent implements OnInit {
             return;
         }
 
-        const { description, name, releaseDate, updateNotificationText } = attachmentUnitFormData.formProperties;
+        const { description, name, releaseDate, updateNotificationText, competencies } = attachmentUnitFormData.formProperties;
         const { file, fileName } = attachmentUnitFormData.fileProperties;
 
         this.currentlyProcessedAttachmentUnit = this.isEditingLectureUnit ? this.currentlyProcessedAttachmentUnit : new AttachmentUnit();
@@ -210,6 +213,9 @@ export class LectureUpdateWizardUnitsComponent implements OnInit {
         if (description) {
             this.currentlyProcessedAttachmentUnit.description = description;
         }
+        if (competencies) {
+            this.currentlyProcessedAttachmentUnit.competencies = competencies;
+        }
 
         const formData = new FormData();
         formData.append('file', file, fileName);
diff --git a/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts b/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts
index 05bb0f2689c8..074c1e704695 100644
--- a/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts
+++ b/src/main/webapp/app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component.ts
@@ -1,10 +1,10 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { BuildAgent } from 'app/entities/build-agent.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
 import { Subscription } from 'rxjs';
 import { faCircleCheck, faExclamationCircle, faExclamationTriangle, faTimes } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
-import { TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { ActivatedRoute } from '@angular/router';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildQueueService } from 'app/localci/build-queue/build-queue.service';
diff --git a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
index cac89931b3be..b7f232bf0fc4 100644
--- a/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
+++ b/src/main/webapp/app/localci/build-agents/build-agent-summary/build-agent-summary.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { BuildAgent } from 'app/entities/build-agent.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
 import { Subscription } from 'rxjs';
diff --git a/src/main/webapp/app/localci/build-agents/build-agents.service.ts b/src/main/webapp/app/localci/build-agents/build-agents.service.ts
index 1acca8c34375..99905ad80c51 100644
--- a/src/main/webapp/app/localci/build-agents/build-agents.service.ts
+++ b/src/main/webapp/app/localci/build-agents/build-agents.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, throwError } from 'rxjs';
-import { BuildAgent } from 'app/entities/build-agent.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
 import { catchError } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
diff --git a/src/main/webapp/app/localci/build-queue/build-queue.component.ts b/src/main/webapp/app/localci/build-queue/build-queue.component.ts
index 2ab4ae9bc7f8..79ca4931786c 100644
--- a/src/main/webapp/app/localci/build-queue/build-queue.component.ts
+++ b/src/main/webapp/app/localci/build-queue/build-queue.component.ts
@@ -1,11 +1,11 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model';
+import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model';
 import { faAngleDown, faAngleRight, faCircleCheck, faExclamationCircle, faExclamationTriangle, faFilter, faSort, faSync, faTimes } from '@fortawesome/free-solid-svg-icons';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildQueueService } from 'app/localci/build-queue/build-queue.service';
 import { debounceTime, distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators';
-import { TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { ITEMS_PER_PAGE } from 'app/shared/constants/pagination.constants';
 import { SortingOrder } from 'app/shared/table/pageable-table';
 import { onError } from 'app/shared/util/global.utils';
diff --git a/src/main/webapp/app/localci/build-queue/build-queue.service.ts b/src/main/webapp/app/localci/build-queue/build-queue.service.ts
index c0a958f84715..fdc9bec66e2f 100644
--- a/src/main/webapp/app/localci/build-queue/build-queue.service.ts
+++ b/src/main/webapp/app/localci/build-queue/build-queue.service.ts
@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { throwError } from 'rxjs';
-import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model';
+import { BuildJob, BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model';
 import { createNestedRequestOption } from 'app/shared/util/request.util';
 import { HttpResponse } from '@angular/common/http';
 import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component';
diff --git a/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts b/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts
index 617797f048c1..98ced261dc32 100644
--- a/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts
+++ b/src/main/webapp/app/localvc/commit-details-view/commit-details-view.component.ts
@@ -4,7 +4,7 @@ import { ProgrammingExerciseService } from 'app/exercises/programming/manage/ser
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { Subscription, throwError } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
-import { CommitInfo } from 'app/entities/programming-submission.model';
+import { CommitInfo } from 'app/entities/programming/programming-submission.model';
 import dayjs from 'dayjs/esm';
 import { catchError, map, tap } from 'rxjs/operators';
 
diff --git a/src/main/webapp/app/localvc/commit-history/commit-history.component.ts b/src/main/webapp/app/localvc/commit-history/commit-history.component.ts
index 056104710066..fe98dd02cb53 100644
--- a/src/main/webapp/app/localvc/commit-history/commit-history.component.ts
+++ b/src/main/webapp/app/localvc/commit-history/commit-history.component.ts
@@ -3,11 +3,11 @@ import { ActivatedRoute } from '@angular/router';
 import { Subscription } from 'rxjs';
 import dayjs from 'dayjs/esm';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { tap } from 'rxjs/operators';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
diff --git a/src/main/webapp/app/localvc/repository-view/repository-view.component.ts b/src/main/webapp/app/localvc/repository-view/repository-view.component.ts
index 8125fbbcb1d6..22ee9747edbb 100644
--- a/src/main/webapp/app/localvc/repository-view/repository-view.component.ts
+++ b/src/main/webapp/app/localvc/repository-view/repository-view.component.ts
@@ -3,7 +3,7 @@ import { Observable, Subscription } from 'rxjs';
 import { ActivatedRoute, Router } from '@angular/router';
 import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service';
 import { ExerciseType, getCourseFromExercise } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/main/webapp/app/orion/assessment/orion-assessment.service.ts b/src/main/webapp/app/orion/assessment/orion-assessment.service.ts
index 27a068b37f2e..9463fc7f3e32 100644
--- a/src/main/webapp/app/orion/assessment/orion-assessment.service.ts
+++ b/src/main/webapp/app/orion/assessment/orion-assessment.service.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ProgrammingAssessmentRepoExportService, RepositoryExportOptions } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
diff --git a/src/main/webapp/app/orion/management/code-editor-instructor-and-editor-orion-container.component.ts b/src/main/webapp/app/orion/management/code-editor-instructor-and-editor-orion-container.component.ts
index dabe5aac4009..fece685811c2 100644
--- a/src/main/webapp/app/orion/management/code-editor-instructor-and-editor-orion-container.component.ts
+++ b/src/main/webapp/app/orion/management/code-editor-instructor-and-editor-orion-container.component.ts
@@ -13,7 +13,8 @@ import { OrionBuildAndTestService } from 'app/shared/orion/orion-build-and-test.
 import { OrionState } from 'app/shared/orion/orion';
 import { faCircleNotch, faTimesCircle } from '@fortawesome/free-solid-svg-icons';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
+
+import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 @Component({
     selector: 'jhi-code-editor-instructor-orion',
diff --git a/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts b/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts
index 5728cd2c99be..2854122be21c 100644
--- a/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts
+++ b/src/main/webapp/app/orion/management/orion-programming-exercise.component.ts
@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { ExerciseView, OrionState } from 'app/shared/orion/orion';
 import { Router } from '@angular/router';
diff --git a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts
index aa415ecd9432..30f6b585e32c 100644
--- a/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/orion/participation/orion-exercise-details-student-actions.component.ts
@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { ExerciseView, OrionState } from 'app/shared/orion/orion';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
diff --git a/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html b/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html
index bcb3067b9621..57a6aba8aafd 100644
--- a/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html
+++ b/src/main/webapp/app/overview/course-competencies/course-competencies-details.component.html
@@ -2,7 +2,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 }
@@ -33,7 +33,7 @@ <h3 class="mb-0">
                 </div>
                 @if (competency.softDueDate) {
                     <div class="col-auto text-right">
-                        <span style="vertical-align: middle"> {{ 'artemisApp.competency.competencyCard.softDueDate' | artemisTranslate }} </span>
+                        <span style="vertical-align: middle" jhiTranslate="artemisApp.competency.competencyCard.softDueDate"></span>
                         <span class="badge" [ngClass]="softDueDatePassed ? 'bg-danger' : 'bg-success'" id="date-badge"> {{ competency.softDueDate | artemisTimeAgo }} </span>
                     </div>
                 }
@@ -41,7 +41,7 @@ <h3 class="mb-0">
                     @if (competency.course?.isAtLeastInstructor) {
                         <a class="btn btn-sm btn-warning float-end" [routerLink]="['/course-management', courseId, 'competency-management', competency.id, 'edit']">
                             <fa-icon [icon]="faPencilAlt" />
-                            <span class="d-none d-md-inline">{{ 'entity.action.edit' | artemisTranslate }}</span>
+                            <span class="d-none d-md-inline" jhiTranslate="entity.action.edit"></span>
                         </a>
                     }
                 </div>
diff --git a/src/main/webapp/app/overview/course-competencies/course-competencies.component.html b/src/main/webapp/app/overview/course-competencies/course-competencies.component.html
index 5525e504c070..2e478331ff8f 100644
--- a/src/main/webapp/app/overview/course-competencies/course-competencies.component.html
+++ b/src/main/webapp/app/overview/course-competencies/course-competencies.component.html
@@ -38,13 +38,13 @@
         }
     </div>
     <div class="col-12 col-lg-3 offset-lg-1">
-        <h3 class="mt-3">{{ 'artemisApp.competency.table.panelHeader' | artemisTranslate }}</h3>
+        <h3 class="mt-3" jhiTranslate="artemisApp.competency.table.panelHeader"></h3>
         <span class="badge bg-dark">{{ countMasteredCompetencies }} / {{ countCompetencies }}</span> {{ 'artemisApp.competency.mastered' | artemisTranslate }}
         <dl class="mt-3">
-            <dt>{{ 'artemisApp.competency.progress' | artemisTranslate }}</dt>
-            <dd>{{ 'artemisApp.competency.progressDescription' | artemisTranslate }}</dd>
-            <dt>{{ 'artemisApp.competency.mastery' | artemisTranslate }}</dt>
-            <dd>{{ 'artemisApp.competency.masteryDescription' | artemisTranslate }}</dd>
+            <dt jhiTranslate="artemisApp.competency.progress"></dt>
+            <dd jhiTranslate="artemisApp.competency.progressDescription"></dd>
+            <dt jhiTranslate="artemisApp.competency.mastery"></dt>
+            <dd jhiTranslate="artemisApp.competency.masteryDescription"></dd>
         </dl>
     </div>
 </div>
diff --git a/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html b/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html
index fa89913e8392..7972f8cd36fe 100644
--- a/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html
+++ b/src/main/webapp/app/overview/course-conversations/code-of-conduct/course-conversations-code-of-conduct.component.html
@@ -1,4 +1,4 @@
-<h3>{{ 'artemisApp.codeOfConduct.title' | artemisTranslate }}</h3>
+<h3 jhiTranslate="artemisApp.codeOfConduct.title"></h3>
 <div [innerHTML]="course.courseInformationSharingMessagingCodeOfConduct || '' | htmlForMarkdown"></div>
 <ul>
     @for (user of responsibleContacts; track user) {
diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
index a042cd0ee25d..9979347728ec 100644
--- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
+++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.html
@@ -17,9 +17,7 @@
     @if (course && isCodeOfConductAccepted === false) {
         <div class="module-bg px-3 py-3 code-of-conduct">
             <jhi-course-conversations-code-of-conduct [course]="course!" />
-            <button id="acceptCodeOfConductButton" class="btn btn-primary" type="button" (click)="acceptCodeOfConduct()">
-                {{ 'artemisApp.codeOfConduct.accept' | artemisTranslate }}
-            </button>
+            <button id="acceptCodeOfConductButton" class="btn btn-primary" type="button" (click)="acceptCodeOfConduct()" jhiTranslate="artemisApp.codeOfConduct.accept"></button>
         </div>
     }
     @if (isCodeOfConductAccepted && isServiceSetUp && course) {
@@ -44,7 +42,7 @@
             }
             <div class="col flex-grow-1 module-bg rounded-3 scrollable-content" [ngClass]="{ 'content-height-dev': !isProduction || isTestServer }" style="min-width: 200px">
                 @if (activeConversation) {
-                    <jhi-conversation-header (collapseSearch)="toggleChannelSearch()" />
+                    <jhi-conversation-header (collapseSearch)="toggleChannelSearch()" (onUpdateSidebar)="prepareSidebarData()" />
                     <jhi-conversation-messages
                         [contentHeightDev]="!isProduction || isTestServer"
                         (openThread)="postInThread = $event"
diff --git a/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts b/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
index acca28f0068e..159818511aa8 100644
--- a/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
+++ b/src/main/webapp/app/overview/course-conversations/course-conversations.component.ts
@@ -260,9 +260,13 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
     }
 
     prepareSidebarData() {
-        this.sidebarConversations = this.courseOverviewService.mapConversationsToSidebarCardElements(this.conversationsOfUser);
-        this.accordionConversationGroups = this.courseOverviewService.groupConversationsByChannelType(this.conversationsOfUser, this.messagingEnabled);
-        this.updateSidebarData();
+        this.metisConversationService.forceRefresh().subscribe({
+            complete: () => {
+                this.sidebarConversations = this.courseOverviewService.mapConversationsToSidebarCardElements(this.conversationsOfUser);
+                this.accordionConversationGroups = this.courseOverviewService.groupConversationsByChannelType(this.conversationsOfUser, this.messagingEnabled);
+                this.updateSidebarData();
+            },
+        });
     }
 
     updateSidebarData() {
@@ -308,9 +312,6 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
             .subscribe((chatPartners: UserPublicInfoDTO[]) => {
                 this.metisConversationService.createGroupChat(chatPartners?.map((partner) => partner.login!)).subscribe({
                     complete: () => {
-                        this.metisConversationService.forceRefresh().subscribe({
-                            complete: () => {},
-                        });
                         this.prepareSidebarData();
                     },
                 });
@@ -330,9 +331,6 @@ export class CourseConversationsComponent implements OnInit, OnDestroy {
                 if (chatPartner?.login) {
                     this.metisConversationService.createOneToOneChat(chatPartner.login).subscribe({
                         complete: () => {
-                            this.metisConversationService.forceRefresh().subscribe({
-                                complete: () => {},
-                            });
                             this.prepareSidebarData();
                         },
                     });
diff --git a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
index ce1e3506941d..f4a255b49422 100644
--- a/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
+++ b/src/main/webapp/app/overview/course-conversations/course-wide-search/course-wide-search.component.html
@@ -29,11 +29,11 @@ <h4 class="d-inline-block rounded p-1 info">
                                 id="filterToUnresolved"
                                 (change)="onSelectContext()"
                             />
-                            <label for="filterToUnresolved" class="p-0">{{ 'artemisApp.metis.overview.filterToUnresolved' | artemisTranslate }}</label>
+                            <label for="filterToUnresolved" class="p-0" jhiTranslate="artemisApp.metis.overview.filterToUnresolved"></label>
                         </div>
                         <div class="col-auto p-0 ps-2">
                             <input class="form-check-input" type="checkbox" formControlName="filterToOwn" name="filterToOwn" id="filterToOwn" (change)="onSelectContext()" />
-                            <label for="filterToOwn" class="p-0">{{ 'artemisApp.metis.overview.filterToOwn' | artemisTranslate }}</label>
+                            <label for="filterToOwn" class="p-0" jhiTranslate="artemisApp.metis.overview.filterToOwn"></label>
                         </div>
                         <div class="col-auto p-0 ps-2">
                             <input
@@ -44,12 +44,12 @@ <h4 class="d-inline-block rounded p-1 info">
                                 id="filterToAnsweredOrReacted"
                                 (change)="onSelectContext()"
                             />
-                            <label for="filterToAnsweredOrReacted" class="p-0">{{ 'artemisApp.metis.overview.filterToAnsweredOrReacted' | artemisTranslate }}</label>
+                            <label for="filterToAnsweredOrReacted" class="p-0" jhiTranslate="artemisApp.metis.overview.filterToAnsweredOrReacted"></label>
                         </div>
                     </div>
                     <!-- sort dropdown -->
                     <div class="d-flex">
-                        <div class="col-auto p-0">{{ 'artemisApp.metis.overview.sortedByDate' | artemisTranslate }}</div>
+                        <div class="col-auto p-0" jhiTranslate="artemisApp.metis.overview.sortedByDate"></div>
                         <div class="col-auto p-0 clickable" role="button" (click)="onChangeSortDir()">
                             <fa-icon
                                 [icon]="sortingOrder === SortDirection.ASCENDING ? faLongArrowAltUp : faLongArrowAltDown"
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component.html
index f34ba20f5391..194d404fc58b 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channel-form/channel-form.component.html
@@ -4,7 +4,7 @@
             <form [formGroup]="form" (ngSubmit)="submitForm()">
                 <!-- CHANNEL NAME -->
                 <div class="form-group">
-                    <label class="required" for="name">{{ 'artemisApp.dialogs.createChannel.channelForm.nameInput.label' | artemisTranslate }}</label>
+                    <label class="required" for="name" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.nameInput.label"></label>
                     <div class="input-group">
                         <span class="input-group-text">
                             <jhi-channel-icon [isPublic]="isPublicControl?.value" [isAnnouncementChannel]="isisAnnouncementChannelControl?.value" />
@@ -20,36 +20,30 @@
                     @if (nameControl?.invalid && (nameControl?.dirty || nameControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (nameControl?.errors?.required) {
-                                <div>
-                                    {{ 'artemisApp.dialogs.createChannel.channelForm.nameInput.requiredValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.dialogs.createChannel.channelForm.nameInput.requiredValidationError"></div>
                             }
                             @if (nameControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.dialogs.createChannel.channelForm.nameInput.maxLengthValidationError' | artemisTranslate: { max: '30' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.dialogs.createChannel.channelForm.nameInput.maxLengthValidationError" [translateValues]="{ max: '30' }"></div>
                             }
                             @if (!nameControl?.errors?.required && !nameControl?.errors?.maxlength && nameControl?.errors?.pattern) {
-                                <div>
-                                    {{ 'artemisApp.dialogs.createChannel.channelForm.nameInput.regexValidationError' | artemisTranslate }}
-                                </div>
+                                <div jhiTranslate="artemisApp.dialogs.createChannel.channelForm.nameInput.regexValidationError"></div>
                             }
                         </div>
                     }
                 </div>
                 <!-- DESCRIPTION -->
                 <div class="form-group">
-                    <label for="description">{{ 'artemisApp.dialogs.createChannel.channelForm.descriptionInput.label' | artemisTranslate }}</label>
+                    <label for="description" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.descriptionInput.label"></label>
                     <input type="text" class="form-control" id="description" formControlName="description" />
-                    <small id="descriptionHelp" class="form-text text-body-secondary">{{
-                        'artemisApp.dialogs.createChannel.channelForm.descriptionInput.descriptionHelp' | artemisTranslate
-                    }}</small>
+                    <small
+                        id="descriptionHelp"
+                        class="form-text text-body-secondary"
+                        jhiTranslate="artemisApp.dialogs.createChannel.channelForm.descriptionInput.descriptionHelp"
+                    ></small>
                     @if (descriptionControl?.invalid && (descriptionControl?.dirty || descriptionControl?.touched)) {
                         <div class="alert alert-danger">
                             @if (descriptionControl?.errors?.maxlength) {
-                                <div>
-                                    {{ 'artemisApp.dialogs.createChannel.channelForm.descriptionInput.maxLengthValidationError' | artemisTranslate: { max: '250' } }}
-                                </div>
+                                <div jhiTranslate="artemisApp.dialogs.createChannel.channelForm.descriptionInput.maxLengthValidationError" [translateValues]="{ max: '250' }"></div>
                             }
                         </div>
                     }
@@ -57,45 +51,49 @@
                 <!--Public Channel / Private Channel -->
                 <div>
                     <div class="form-group">
-                        <label class="d-block">{{ 'artemisApp.dialogs.createChannel.channelForm.isPublicInput.label' | artemisTranslate }}</label>
+                        <label class="d-block" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.label"></label>
                         <div class="btn-group" role="group">
                             <input formControlName="isPublic" type="radio" class="btn-check" id="public" autocomplete="off" checked [value]="true" />
-                            <label class="btn btn-outline-secondary" for="public">{{
-                                'artemisApp.dialogs.createChannel.channelForm.isPublicInput.public' | artemisTranslate
-                            }}</label>
+                            <label class="btn btn-outline-secondary" for="public" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.public"></label>
                             <input formControlName="isPublic" type="radio" class="btn-check" id="private" autocomplete="off" [value]="false" />
-                            <label class="btn btn-outline-secondary" for="private">{{
-                                'artemisApp.dialogs.createChannel.channelForm.isPublicInput.private' | artemisTranslate
-                            }}</label>
+                            <label class="btn btn-outline-secondary" for="private" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.private"></label>
                         </div>
-                        <small id="isPublicHelp" class="form-text text-body-secondary d-block">{{
-                            'artemisApp.dialogs.createChannel.channelForm.isPublicInput.explanation' | artemisTranslate
-                        }}</small>
+                        <small
+                            id="isPublicHelp"
+                            class="form-text text-body-secondary d-block"
+                            jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isPublicInput.explanation"
+                        ></small>
                     </div>
                 </div>
                 <!--Announcement Channel -->
                 <div>
                     <div class="form-group">
-                        <label class="d-block">{{ 'artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.label' | artemisTranslate }}</label>
+                        <label class="d-block" jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.label"></label>
                         <div class="btn-group" role="group">
                             <input formControlName="isAnnouncementChannel" type="radio" class="btn-check" id="isAnnouncementChannel" autocomplete="off" checked [value]="true" />
-                            <label class="btn btn-outline-secondary" for="isAnnouncementChannel">{{
-                                'artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.true' | artemisTranslate
-                            }}</label>
+                            <label
+                                class="btn btn-outline-secondary"
+                                for="isAnnouncementChannel"
+                                jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.true"
+                            ></label>
                             <input formControlName="isAnnouncementChannel" type="radio" class="btn-check" id="isNotAnnouncementChannel" autocomplete="off" [value]="false" />
-                            <label class="btn btn-outline-secondary" for="isNotAnnouncementChannel">{{
-                                'artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.false' | artemisTranslate
-                            }}</label>
+                            <label
+                                class="btn btn-outline-secondary"
+                                for="isNotAnnouncementChannel"
+                                jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.false"
+                            ></label>
                         </div>
-                        <small id="isAnnouncementChannelHelp" class="form-text text-body-secondary d-block">{{
-                            'artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.explanation' | artemisTranslate
-                        }}</small>
+                        <small
+                            id="isAnnouncementChannelHelp"
+                            class="form-text text-body-secondary d-block"
+                            jhiTranslate="artemisApp.dialogs.createChannel.channelForm.isAnnouncementChannelInput.explanation"
+                        ></small>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-12 text-end">
                         <button type="submit" id="submitButton" [disabled]="!isSubmitPossible" class="btn btn-primary">
-                            <span>{{ 'artemisApp.dialogs.createChannel.channelForm.createButton' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.dialogs.createChannel.channelForm.createButton"></span>
                         </button>
                     </div>
                 </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.html
index c661c2315af0..cd5b295812a3 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/channels-create-dialog/channels-create-dialog.component.html
@@ -13,9 +13,7 @@ <h4 class="modal-title">
             <button type="button" class="btn-close" (click)="dismiss()"></button>
         </div>
         <div class="modal-body">
-            <p>
-                {{ 'artemisApp.dialogs.createChannel.description' | artemisTranslate }}
-            </p>
+            <p jhiTranslate="artemisApp.dialogs.createChannel.description"></p>
             <jhi-channel-form
                 (channelTypeChanged)="onChannelTypeChanged($event)"
                 (isAnnouncementChannelChanged)="onIsAnnouncementChannelChanged($event)"
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.html
index b3c8b0699470..29888c66fa72 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channel-item/channel-item.component.html
@@ -18,28 +18,42 @@
             }
             @if (channel.tutorialGroupId && channel.tutorialGroupTitle) {
                 <div>
-                    <span class="badge bg-info rounded-pill">{{
-                        'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: channel.tutorialGroupTitle }
-                    }}</span>
+                    <span
+                        class="badge bg-info rounded-pill"
+                        jhiTranslate="artemisApp.entities.tutorialGroup.channelReverse"
+                        [translateValues]="{ title: channel.tutorialGroupTitle }"
+                    ></span>
                 </div>
             }
         </div>
         <div class="interaction">
             @if (canJoinChannel(channel)) {
-                <button [id]="'register' + channel.id" type="button" class="btn btn-primary" (click)="emitChannelAction($event, 'register')">
-                    {{ 'artemisApp.dialogs.channelOverview.actions.join' | artemisTranslate }}
-                </button>
+                <button
+                    [id]="'register' + channel.id"
+                    type="button"
+                    class="btn btn-primary"
+                    (click)="emitChannelAction($event, 'register')"
+                    jhiTranslate="artemisApp.dialogs.channelOverview.actions.join"
+                ></button>
                 <!--ToDo:  Introduce method to view public channel even if no participant maybe hacky around with visitor status or something? -->
             }
             @if (!!channel.isMember) {
-                <button [id]="'view' + channel.id" type="button" class="btn btn-secondary" (click)="emitChannelAction($event, 'view')">
-                    {{ 'artemisApp.dialogs.channelOverview.actions.view' | artemisTranslate }}
-                </button>
+                <button
+                    [id]="'view' + channel.id"
+                    type="button"
+                    class="btn btn-secondary"
+                    (click)="emitChannelAction($event, 'view')"
+                    jhiTranslate="artemisApp.dialogs.channelOverview.actions.view"
+                ></button>
             }
             @if (canLeaveConversation(channel)) {
-                <button [id]="'deregister' + channel.id" type="button" class="btn btn-danger" (click)="emitChannelAction($event, 'deregister')">
-                    {{ 'artemisApp.dialogs.channelOverview.actions.leave' | artemisTranslate }}
-                </button>
+                <button
+                    [id]="'deregister' + channel.id"
+                    type="button"
+                    class="btn btn-danger"
+                    (click)="emitChannelAction($event, 'deregister')"
+                    jhiTranslate="artemisApp.dialogs.channelOverview.actions.leave"
+                ></button>
             }
         </div>
     </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.html
index c0bb68d5c04b..b19e105f22cd 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/channels-overview-dialog/channels-overview-dialog.component.html
@@ -26,7 +26,7 @@ <h4 class="modal-title">
                     <div class="form-group mt-4">
                         <div (click)="otherChannelsAreCollapsed = !otherChannelsAreCollapsed" class="other-channels">
                             <fa-icon [icon]="faChevronRight" [rotate]="!otherChannelsAreCollapsed ? 90 : undefined" />
-                            <span class="h5">{{ 'artemisApp.dialogs.channelOverview.otherChannels' | artemisTranslate }}</span>
+                            <span class="h5" jhiTranslate="artemisApp.dialogs.channelOverview.otherChannels"></span>
                         </div>
                         <div [(ngbCollapse)]="otherChannelsAreCollapsed">
                             <div class="table-wrapper-scroll-y scrollbar mt-2">
@@ -44,9 +44,13 @@ <h4 class="modal-title">
             </div>
             <div class="modal-footer justify-content-between">
                 @if (createChannelFn && canCreateChannel(course)) {
-                    <button type="button" class="btn btn-secondary" (click)="openCreateChannelDialog($event)" id="createChannel">
-                        {{ 'artemisApp.dialogs.channelOverview.createChannelButton' | artemisTranslate }}
-                    </button>
+                    <button
+                        type="button"
+                        class="btn btn-secondary"
+                        (click)="openCreateChannelDialog($event)"
+                        id="createChannel"
+                        jhiTranslate="artemisApp.dialogs.channelOverview.createChannelButton"
+                    ></button>
                 }
             </div>
         </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html
index dd050ac7ba18..b22435bd18ab 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.html
@@ -2,9 +2,7 @@
     <div class="row">
         <div class="col-12">
             @if (maxSelectable !== undefined) {
-                <div class="alert alert-info">
-                    {{ 'artemisApp.dialogs.addUsers.addUsersForm.maxUsersNote' | artemisTranslate: { max: maxSelectable } }}
-                </div>
+                <div class="alert alert-info" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.maxUsersNote" [translateValues]="{ max: maxSelectable }"></div>
             }
             <div [hidden]="maxSelectable === 0">
                 <div class="mode-switch" [hidden]="!getAsChannel(activeConversation)">
@@ -19,9 +17,9 @@
                                 [value]="'individual'"
                                 [ngModelOptions]="{ standalone: true }"
                             />
-                            <label class="btn btn-secondary" for="individual">{{ 'artemisApp.dialogs.addUsers.addUsersForm.addIndividualUsers' | artemisTranslate }}</label>
+                            <label class="btn btn-secondary" for="individual" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addIndividualUsers"></label>
                             <input [(ngModel)]="mode" type="radio" class="btn-check" id="group" autocomplete="off" [value]="'group'" [ngModelOptions]="{ standalone: true }" />
-                            <label class="btn btn-secondary" for="group">{{ 'artemisApp.dialogs.addUsers.addUsersForm.addWholeGroups' | artemisTranslate }}</label>
+                            <label class="btn btn-secondary" for="group" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addWholeGroups"></label>
                         </div>
                     </div>
                 </div>
@@ -36,14 +34,10 @@
                             @if (selectedUsersControl?.invalid && (selectedUsersControl?.dirty || selectedUsersControl?.touched)) {
                                 <div class="alert alert-danger">
                                     @if (selectedUsersControl?.errors?.required) {
-                                        <div>
-                                            {{ 'artemisApp.dialogs.addUsers.addUsersForm.requiredError' | artemisTranslate }}
-                                        </div>
+                                        <div jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.requiredError"></div>
                                     }
                                     @if (selectedUsersControl?.errors?.maxlength) {
-                                        <div>
-                                            {{ 'artemisApp.dialogs.addUsers.addUsersForm.maxError' | artemisTranslate: { max: maxSelectable } }}
-                                        </div>
+                                        <div jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.maxError" [translateValues]="{ max: maxSelectable }"></div>
                                     }
                                 </div>
                             }
@@ -53,22 +47,22 @@
                         <div class="col-12">
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="allStudents" formControlName="addAllStudents" />
-                                <label class="form-check-label" for="allStudents">{{ 'artemisApp.dialogs.addUsers.addUsersForm.addAllStudents' | artemisTranslate }}</label>
+                                <label class="form-check-label" for="allStudents" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addAllStudents"></label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="allTutors" formControlName="addAllTutors" />
-                                <label class="form-check-label" for="allTutors">{{ 'artemisApp.dialogs.addUsers.addUsersForm.addAllTutors' | artemisTranslate }}</label>
+                                <label class="form-check-label" for="allTutors" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addAllTutors"></label>
                             </div>
                             <div class="form-check form-check-inline">
                                 <input class="form-check-input" type="checkbox" id="allInstructors" formControlName="addAllInstructors" />
-                                <label class="form-check-label" for="allInstructors">{{ 'artemisApp.dialogs.addUsers.addUsersForm.addAllInstructors' | artemisTranslate }}</label>
+                                <label class="form-check-label" for="allInstructors" jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addAllInstructors"></label>
                             </div>
                         </div>
                     </div>
                     <div class="row">
                         <div class="col-12 text-end">
                             <button type="submit" id="submitButton" [disabled]="!isSubmitPossible" class="btn btn-primary">
-                                <span>{{ 'artemisApp.dialogs.addUsers.addUsersForm.addUsersButton' | artemisTranslate }}</span>
+                                <span jhiTranslate="artemisApp.dialogs.addUsers.addUsersForm.addUsersButton"></span>
                             </button>
                         </div>
                     </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html
index 162723705463..32f3096ca9f0 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-add-users-dialog/conversation-add-users-dialog.component.html
@@ -10,9 +10,7 @@ <h4 class="modal-title">
                     </span>
                 }
                 @if (getAsGroupChat(activeConversation)) {
-                    <span>
-                        {{ 'artemisApp.dialogs.addUsers.addUsersToGroupChat' | artemisTranslate }}
-                    </span>
+                    <span jhiTranslate="artemisApp.dialogs.addUsers.addUsersToGroupChat"></span>
                 }
             </h4>
             <button type="button" class="btn-close" (click)="dismiss()"></button>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html
index 7545d6f726a1..bd18770a088c 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component.html
@@ -13,9 +13,14 @@ <h4 class="modal-title">
                 </span>
                 @if (getAsChannel(activeConversation); as channel) {
                     @if (channel.tutorialGroupId && channel.tutorialGroupTitle) {
-                        <a (click)="clear()" class="btn btn-info btn-sm ms-2" [routerLink]="['/courses', course.id, 'tutorial-groups', channel.tutorialGroupId]" role="button">{{
-                            'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: channel.tutorialGroupTitle }
-                        }}</a>
+                        <a
+                            (click)="clear()"
+                            class="btn btn-info btn-sm ms-2"
+                            [routerLink]="['/courses', course.id, 'tutorial-groups', channel.tutorialGroupId]"
+                            role="button"
+                            jhiTranslate="artemisApp.entities.tutorialGroup.channelReverse"
+                            [translateValues]="{ title: channel.tutorialGroupTitle }"
+                        ></a>
                     }
                 }
             </h4>
@@ -24,20 +29,32 @@ <h4 class="modal-title">
         <div>
             <ul class="nav nav-tabs">
                 <li class="nav-item">
-                    <a class="nav-link info-tab" [class.active]="selectedTab === Tabs.INFO" role="button" (click)="selectedTab = Tabs.INFO">
-                        {{ 'artemisApp.dialogs.conversationDetail.tabs.info' | artemisTranslate }}
-                    </a>
+                    <a
+                        class="nav-link info-tab"
+                        [class.active]="selectedTab === Tabs.INFO"
+                        role="button"
+                        (click)="selectedTab = Tabs.INFO"
+                        jhiTranslate="artemisApp.dialogs.conversationDetail.tabs.info"
+                    ></a>
                 </li>
                 <li class="nav-item members-tab">
-                    <a class="nav-link" [class.active]="selectedTab === Tabs.MEMBERS" role="button" (click)="selectedTab = Tabs.MEMBERS">
-                        {{ 'artemisApp.dialogs.conversationDetail.tabs.members' | artemisTranslate }}
-                    </a>
+                    <a
+                        class="nav-link"
+                        [class.active]="selectedTab === Tabs.MEMBERS"
+                        role="button"
+                        (click)="selectedTab = Tabs.MEMBERS"
+                        jhiTranslate="artemisApp.dialogs.conversationDetail.tabs.members"
+                    ></a>
                 </li>
                 @if (!isOneToOneChat(activeConversation)) {
                     <li class="nav-item settings-tab">
-                        <a class="nav-link" [class.active]="selectedTab === Tabs.SETTINGS" role="button" (click)="selectedTab = Tabs.SETTINGS">
-                            {{ 'artemisApp.dialogs.conversationDetail.tabs.settings' | artemisTranslate }}
-                        </a>
+                        <a
+                            class="nav-link"
+                            [class.active]="selectedTab === Tabs.SETTINGS"
+                            role="button"
+                            (click)="selectedTab = Tabs.SETTINGS"
+                            jhiTranslate="artemisApp.dialogs.conversationDetail.tabs.settings"
+                        ></a>
                     </li>
                 }
             </ul>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html
index bc11bb78838f..78984e09adcb 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-info/conversation-info.component.html
@@ -14,14 +14,16 @@
                             value="{{ channelOrGroupChat.name ?? ('artemisApp.dialogs.conversationDetail.infoTab.noName' | artemisTranslate) }}"
                         >
                         </textarea>
-                        <label for="name">{{ 'artemisApp.dialogs.conversationDetail.infoTab.name' | artemisTranslate }}</label>
+                        <label for="name" jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.name"></label>
                         @if (
                             (isChannel(channelOrGroupChat) && canChangeChannelProperties(channelOrGroupChat)) ||
                             (isGroupChat(channelOrGroupChat) && canChangeGroupChatProperties(channelOrGroupChat))
                         ) {
-                            <button class="action-button right btn btn-link btn-sm" (click)="openEditNameModal($event)">
-                                {{ 'artemisApp.dialogs.conversationDetail.infoTab.editName' | artemisTranslate }}
-                            </button>
+                            <button
+                                class="action-button right btn btn-link btn-sm"
+                                (click)="openEditNameModal($event)"
+                                jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.editName"
+                            ></button>
                         }
                     </div>
                 </div>
@@ -39,11 +41,13 @@
                             value="{{ channel.topic ?? ('artemisApp.dialogs.conversationDetail.infoTab.noTopic' | artemisTranslate) }}"
                         >
                         </textarea>
-                        <label for="topic">{{ 'artemisApp.dialogs.conversationDetail.infoTab.topic' | artemisTranslate }}</label>
+                        <label for="topic" jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.topic"></label>
                         @if (canChangeChannelProperties(channel)) {
-                            <button class="action-button right btn btn-link btn-sm" (click)="openEditTopicModal($event)">
-                                {{ 'artemisApp.dialogs.conversationDetail.infoTab.editTopic' | artemisTranslate }}
-                            </button>
+                            <button
+                                class="action-button right btn btn-link btn-sm"
+                                (click)="openEditTopicModal($event)"
+                                jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.editTopic"
+                            ></button>
                         }
                     </div>
                 </div>
@@ -61,11 +65,13 @@
                             value="{{ channel.description ?? ('artemisApp.dialogs.conversationDetail.infoTab.noDescription' | artemisTranslate) }}"
                         >
                         </textarea>
-                        <label for="description">{{ 'artemisApp.dialogs.conversationDetail.infoTab.description' | artemisTranslate }}</label>
+                        <label for="description" jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.description"></label>
                         @if (canChangeChannelProperties(channel)) {
-                            <button class="action-button right btn btn-link btn-sm" (click)="openDescriptionTopicModal($event)">
-                                {{ 'artemisApp.dialogs.conversationDetail.infoTab.editDescription' | artemisTranslate }}
-                            </button>
+                            <button
+                                class="action-button right btn btn-link btn-sm"
+                                (click)="openDescriptionTopicModal($event)"
+                                jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.editDescription"
+                            ></button>
                         }
                     </div>
                 </div>
@@ -73,7 +79,7 @@
             <!-- More Info -->
             <div id="moreinfo-section" class="col-12 info-section">
                 <div>
-                    <h6>{{ 'artemisApp.dialogs.conversationDetail.infoTab.moreInfo' | artemisTranslate }}</h6>
+                    <h6 jhiTranslate="artemisApp.dialogs.conversationDetail.infoTab.moreInfo"></h6>
                 </div>
                 <ul>
                     @if (activeConversation.creator) {
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html
index 53d064bb2901..a481df162d51 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.html
@@ -15,19 +15,28 @@
             }
             <div ngbDropdownMenu>
                 @if (canBeRemovedFromConversation) {
-                    <button ngbDropdownItem class="text-danger remove-member" (click)="openRemoveFromConversationDialog($event)">
-                        {{ 'artemisApp.dialogs.conversationDetail.memberTab.memberRow.removeUser' | artemisTranslate }}
-                    </button>
+                    <button
+                        ngbDropdownItem
+                        class="text-danger remove-member"
+                        (click)="openRemoveFromConversationDialog($event)"
+                        jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.memberRow.removeUser"
+                    ></button>
                 }
                 @if (canBeGrantedChannelModeratorRole) {
-                    <button ngbDropdownItem class="text-danger grant-moderator" (click)="openGrantChannelModeratorRoleDialog($event)">
-                        {{ 'artemisApp.dialogs.conversationDetail.memberTab.memberRow.grantModeratorRole' | artemisTranslate }}
-                    </button>
+                    <button
+                        ngbDropdownItem
+                        class="text-danger grant-moderator"
+                        (click)="openGrantChannelModeratorRoleDialog($event)"
+                        jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.memberRow.grantModeratorRole"
+                    ></button>
                 }
                 @if (canBeRevokedChannelModeratorRole) {
-                    <button ngbDropdownItem class="text-danger revoke-moderator" (click)="openRevokeChannelModeratorRoleDialog($event)">
-                        {{ 'artemisApp.dialogs.conversationDetail.memberTab.memberRow.revokeModeratorRole' | artemisTranslate }}
-                    </button>
+                    <button
+                        ngbDropdownItem
+                        class="text-danger revoke-moderator"
+                        (click)="openRevokeChannelModeratorRoleDialog($event)"
+                        jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.memberRow.revokeModeratorRole"
+                    ></button>
                 }
             </div>
         </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.ts b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.ts
index 28e03c588910..5044543d4878 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.ts
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-member-row/conversation-member-row.component.ts
@@ -246,7 +246,7 @@ export class ConversationMemberRowComponent implements OnInit, OnDestroy {
             this.userTooltip = this.translateService.instant(toolTipTranslationPath + 'instructor');
         } else if (this.conversationMember.isEditor || this.conversationMember.isTeachingAssistant) {
             this.userIcon = faUserCheck;
-            this.userTooltip = this.translateService.instant(toolTipTranslationPath + 'ta');
+            this.userTooltip = this.translateService.instant(toolTipTranslationPath + 'tutor');
         } else {
             this.userIcon = faUser;
             this.userTooltip = this.translateService.instant(toolTipTranslationPath + 'student');
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html
index 91fd0d162bcf..c2184ede4a74 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-members/conversation-members.component.html
@@ -27,25 +27,21 @@
             </div>
             <div class="col-4">
                 <div class="input-group">
-                    <label class="input-group-text" for="searchFilter">{{ 'artemisApp.dialogs.conversationDetail.memberTab.filter' | artemisTranslate }}</label>
+                    <label class="input-group-text" for="searchFilter" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.filter"></label>
                     <select (ngModelChange)="onFilterChange($event)" [ngModel]="selectedFilter" class="form-select form-select" id="searchFilter">
-                        <option id="allFilter" [value]="ALL">{{ 'artemisApp.dialogs.conversationDetail.memberTab.allFilter' | artemisTranslate }}</option>
-                        <option id="instructorFilter" [value]="INSTRUCTOR_FILTER_OPTION">
-                            {{ 'artemisApp.dialogs.conversationDetail.memberTab.instructorFilter' | artemisTranslate }}
-                        </option>
-                        <option id="tutorFilter" [value]="TUTOR_FILTER_OPTION">{{ 'artemisApp.dialogs.conversationDetail.memberTab.tutorFilter' | artemisTranslate }}</option>
-                        <option id="studentFilter" [value]="STUDENT_FILTER_OPTION">{{ 'artemisApp.dialogs.conversationDetail.memberTab.studentFilter' | artemisTranslate }}</option>
+                        <option id="allFilter" [value]="ALL" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.allFilter"></option>
+                        <option id="instructorFilter" [value]="INSTRUCTOR_FILTER_OPTION" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.instructorFilter"></option>
+                        <option id="tutorFilter" [value]="TUTOR_FILTER_OPTION" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.tutorFilter"></option>
+                        <option id="studentFilter" [value]="STUDENT_FILTER_OPTION" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.studentFilter"></option>
                         @if (isChannel(activeConversation)) {
-                            <option [value]="CHANNEL_MODERATOR_FILTER_OPTION">
-                                {{ 'artemisApp.dialogs.conversationDetail.memberTab.channelModeratorFilter' | artemisTranslate }}
-                            </option>
+                            <option [value]="CHANNEL_MODERATOR_FILTER_OPTION" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.channelModeratorFilter"></option>
                         }
                     </select>
                 </div>
             </div>
             @if (isSearching) {
                 <div class="col-12">
-                    <small class="form-text text-body-secondary d-inline-block">{{ 'artemisApp.dialogs.conversationDetail.memberTab.searching' | artemisTranslate }}</small>
+                    <small class="form-text text-body-secondary d-inline-block" jhiTranslate="artemisApp.dialogs.conversationDetail.memberTab.searching"></small>
                 </div>
             }
         </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html
index fb8898763af2..752c1e385261 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/conversation-detail-dialog/tabs/conversation-settings/conversation-settings.component.html
@@ -4,24 +4,33 @@
             <div class="row settings-container">
                 <div class="col-12 settings-section text-center">
                     @if (canLeaveConversation) {
-                        <button type="button" class="btn btn-danger leave-conversation" (click)="leaveConversation($event)">
-                            {{ 'artemisApp.dialogs.conversationSettings.actions.leave' | artemisTranslate }}
-                        </button>
+                        <button
+                            type="button"
+                            class="btn btn-danger leave-conversation"
+                            (click)="leaveConversation($event)"
+                            jhiTranslate="artemisApp.dialogs.conversationSettings.actions.leave"
+                        ></button>
                     }
                 </div>
                 @if (conversationAsChannel; as channel) {
                     @if (!channel.isArchived && canChangeChannelArchivalState) {
                         <div class="col-12 settings-section text-center">
-                            <button type="button" class="btn btn-danger archive" (click)="openArchivalModal($event)">
-                                {{ 'artemisApp.dialogs.conversationSettings.actions.archiveChannel' | artemisTranslate }}
-                            </button>
+                            <button
+                                type="button"
+                                class="btn btn-danger archive"
+                                (click)="openArchivalModal($event)"
+                                jhiTranslate="artemisApp.dialogs.conversationSettings.actions.archiveChannel"
+                            ></button>
                         </div>
                     }
                     @if (channel.isArchived && canChangeChannelArchivalState) {
                         <div class="col-12 settings-section text-center">
-                            <button type="button" class="btn btn-danger unarchive" (click)="openUnArchivalModal($event)">
-                                {{ 'artemisApp.dialogs.conversationSettings.actions.unarchiveChannel' | artemisTranslate }}
-                            </button>
+                            <button
+                                type="button"
+                                class="btn btn-danger unarchive"
+                                (click)="openUnArchivalModal($event)"
+                                jhiTranslate="artemisApp.dialogs.conversationSettings.actions.unarchiveChannel"
+                            ></button>
                         </div>
                     }
                     @if (canDeleteChannel) {
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html
index 6ff8585d7b43..b6e603c38de9 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-confirmation-dialog/generic-confirmation-dialog.component.html
@@ -18,7 +18,7 @@ <h4 class="modal-title">{{ translationKeys.titleKey | artemisTranslate: translat
             }
         </div>
         <div class="modal-footer">
-            <button type="button" class="btn btn-outline-secondary cancel" (click)="clear()">{{ 'entity.action.cancel' | artemisTranslate }}</button>
+            <button type="button" class="btn btn-outline-secondary cancel" (click)="clear()" jhiTranslate="entity.action.cancel"></button>
             <button type="button" class="btn confirm" [class.btn-danger]="isDangerousAction" [class.btn-primary]="!isDangerousAction" (click)="confirm()">
                 {{ translationKeys.confirmButtonKey | artemisTranslate }}
             </button>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html
index d32db2260889..1ad09b261236 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/generic-update-text-property-dialog/generic-update-text-property-dialog.component.html
@@ -38,7 +38,7 @@ <h4 class="modal-title">
                             <div class="row">
                                 <div class="col-12 text-end">
                                     <button type="submit" id="submitButton" [disabled]="!isSubmitPossible" class="btn btn-primary">
-                                        <span>{{ 'entity.action.save' | artemisTranslate }}</span>
+                                        <span jhiTranslate="entity.action.save"></span>
                                     </button>
                                 </div>
                             </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html
index 8625d0cc8d3a..d8e0e8a5aa1a 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/group-chat-create-dialog/group-chat-create-dialog.component.html
@@ -2,7 +2,7 @@
     <div>
         <div class="modal-header">
             <h4 class="modal-title">
-                <span> {{ 'artemisApp.dialogs.createGroupChat.title' | artemisTranslate }} </span>
+                <span jhiTranslate="artemisApp.dialogs.createGroupChat.title"></span>
             </h4>
             <button type="button" class="btn-close dismiss" (click)="clear()"></button>
         </div>
@@ -16,21 +16,17 @@ <h4 class="modal-title">
                 @if (selectedUsersControl?.invalid && (selectedUsersControl?.dirty || selectedUsersControl?.touched)) {
                     <div class="alert alert-danger">
                         @if (selectedUsersControl?.errors?.required) {
-                            <div>
-                                {{ 'artemisApp.dialogs.createGroupChat.requiredError' | artemisTranslate }}
-                            </div>
+                            <div jhiTranslate="artemisApp.dialogs.createGroupChat.requiredError"></div>
                         }
                         @if (selectedUsersControl?.errors?.maxlength) {
-                            <div>
-                                {{ 'artemisApp.dialogs.createGroupChat.maxError' | artemisTranslate: { max: 9 } }}
-                            </div>
+                            <div jhiTranslate="artemisApp.dialogs.createGroupChat.maxError" [translateValues]="{ max: 9 }"></div>
                         }
                     </div>
                 }
                 <div class="row mt-3">
                     <div class="col-12 text-end">
                         <button type="submit" id="submitButton" [disabled]="!isSubmitPossible" class="btn btn-primary">
-                            <span>{{ 'artemisApp.dialogs.createGroupChat.confirmButton' | artemisTranslate }}</span>
+                            <span jhiTranslate="artemisApp.dialogs.createGroupChat.confirmButton"></span>
                         </button>
                     </div>
                 </div>
diff --git a/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html b/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html
index 5f0b53b0a223..cbe9bcfbf6bb 100644
--- a/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html
+++ b/src/main/webapp/app/overview/course-conversations/dialogs/one-to-one-chat-create-dialog/one-to-one-chat-create-dialog.component.html
@@ -2,7 +2,7 @@
     <div>
         <div class="modal-header">
             <h4 class="modal-title">
-                <span>{{ 'artemisApp.dialogs.createOneToOneChat.title' | artemisTranslate }}</span>
+                <span jhiTranslate="artemisApp.dialogs.createOneToOneChat.title"></span>
             </h4>
             <button type="button" class="btn-close dismiss" (click)="clear()"></button>
         </div>
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html
index ad47e0362fb6..77c54a91e20f 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.html
@@ -19,9 +19,13 @@ <h4 class="pointer d-inline-block rounded px-3 py-2 info" (click)="openConversat
             @if (activeConversationAsChannel) {
                 @if (activeConversationAsChannel.tutorialGroupId && activeConversationAsChannel.tutorialGroupTitle) {
                     <div class="p-2">
-                        <a class="btn btn-info" [routerLink]="['/courses', course.id, 'tutorial-groups', activeConversationAsChannel.tutorialGroupId]" role="button">{{
-                            'artemisApp.entities.tutorialGroup.channelReverse' | artemisTranslate: { title: activeConversationAsChannel.tutorialGroupTitle }
-                        }}</a>
+                        <a
+                            class="btn btn-info"
+                            [routerLink]="['/courses', course.id, 'tutorial-groups', activeConversationAsChannel.tutorialGroupId]"
+                            role="button"
+                            jhiTranslate="artemisApp.entities.tutorialGroup.channelReverse"
+                            [translateValues]="{ title: activeConversationAsChannel.tutorialGroupTitle }"
+                        ></a>
                     </div>
                 }
             }
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts
index 15b5744fc734..2bf7adf1ebae 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-header/conversation-header.component.ts
@@ -27,6 +27,7 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy {
     private ngUnsubscribe = new Subject<void>();
 
     @Output() collapseSearch = new EventEmitter<void>();
+    @Output() onUpdateSidebar = new EventEmitter<void>();
 
     INFO = ConversationDetailTabs.INFO;
     MEMBERS = ConversationDetailTabs.MEMBERS;
@@ -107,6 +108,7 @@ export class ConversationHeaderComponent implements OnInit, OnDestroy {
                 this.metisConversationService.forceRefresh().subscribe({
                     complete: () => {},
                 });
+                this.onUpdateSidebar.emit();
             });
     }
 
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
index 37468268ca6e..373d7b8d9694 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.html
@@ -7,7 +7,7 @@
                     <div class="input-group ps-0" [class.search-active]="!!searchText">
                         <span class="input-group-text">
                             <fa-icon [icon]="faSearch" size="sm" />
-                            <span [hidden]="true" id="inputLabel">{{ 'artemisApp.conversationsLayout.conversationMessages.searchLabel' | artemisTranslate }}</span>
+                            <span [hidden]="true" id="inputLabel" jhiTranslate="artemisApp.conversationsLayout.conversationMessages.searchLabel"></span>
                         </span>
                         <input
                             id="searchInput"
@@ -27,20 +27,23 @@
                                 aria-labelledby="clearSearchLabel"
                                 id="clearSearchButton"
                             >
-                                <span id="clearSearchLabel" [hidden]="true">{{ 'artemisApp.conversationsLayout.conversationMessages.clearSearch' | artemisTranslate }}</span>
+                                <span id="clearSearchLabel" [hidden]="true" jhiTranslate="artemisApp.conversationsLayout.conversationMessages.clearSearch"></span>
                                 <fa-icon [icon]="faTimes" size="xs" />
                             </button>
                         }
                         <span class="input-group-text" [hidden]="!searchText" id="searchResult">
                             @switch (totalNumberOfPosts) {
                                 @case (0) {
-                                    <span>{{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsNone' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.conversationsLayout.conversationMessages.searchResultsNone"></span>
                                 }
                                 @case (1) {
-                                    <span>{{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsSingle' | artemisTranslate }}</span>
+                                    <span jhiTranslate="artemisApp.conversationsLayout.conversationMessages.searchResultsSingle"></span>
                                 }
                                 @default {
-                                    <span>{{ 'artemisApp.conversationsLayout.conversationMessages.searchResultsMultiple' | artemisTranslate: { count: totalNumberOfPosts } }}</span>
+                                    <span
+                                        jhiTranslate="artemisApp.conversationsLayout.conversationMessages.searchResultsMultiple"
+                                        [translateValues]="{ count: totalNumberOfPosts }"
+                                    ></span>
                                 }
                             }
                         </span>
@@ -91,9 +94,7 @@
                     <div>
                         @if (getAsChannel(_activeConversation)?.isAnnouncementChannel) {
                             <div class="pt-2">
-                                <button class="btn btn-md btn-primary" (click)="createEditModal.open()">
-                                    {{ 'artemisApp.metis.newAnnouncement' | artemisTranslate }}
-                                </button>
+                                <button class="btn btn-md btn-primary" (click)="createEditModal.open()" jhiTranslate="artemisApp.metis.newAnnouncement"></button>
                                 <jhi-post-create-edit-modal
                                     #createEditModal
                                     [posting]="newPost!"
diff --git a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss
index 58d9f6d9f3f0..01f09f46008e 100644
--- a/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss
+++ b/src/main/webapp/app/overview/course-conversations/layout/conversation-messages/conversation-messages.component.scss
@@ -1,4 +1,9 @@
 .conversation-messages {
+    --message-input-height-prod: 171px;
+    --message-input-height-dev: 187px;
+    --search-height: 52px;
+    --channel-header-height: 52px;
+
     .search-active {
         input {
             border: 1px solid var(--primary);
@@ -34,11 +39,6 @@
         padding-top: 0.375rem !important;
     }
 
-    --message-input-height-prod: 171px;
-    --message-input-height-dev: 187px;
-    --search-height: 52px;
-    --channel-header-height: 52px;
-
     .posting-infinite-scroll-container {
         max-height: calc(75vh - var(--message-input-height-prod) - var(--search-height) - var(--channel-header-height));
         overflow-y: auto;
diff --git a/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.html b/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.html
index d876c82dd1ad..944ca25d2134 100644
--- a/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.html
+++ b/src/main/webapp/app/overview/course-dashboard/course-dashboard.component.html
@@ -7,7 +7,7 @@
     @if (isLoading) {
         <div class="d-flex justify-content-center">
             <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+                <span class="sr-only" jhiTranslate="loading"></span>
             </div>
         </div>
     } @else {
diff --git a/src/main/webapp/app/overview/course-exams/course-exams.component.ts b/src/main/webapp/app/overview/course-exams/course-exams.component.ts
index 916f669790e3..1b78c89b712e 100644
--- a/src/main/webapp/app/overview/course-exams/course-exams.component.ts
+++ b/src/main/webapp/app/overview/course-exams/course-exams.component.ts
@@ -2,7 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Course } from 'app/entities/course.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { StudentExam } from 'app/entities/student-exam.model';
diff --git a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html
index edfb84460b84..1ae605ca2ad2 100644
--- a/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html
+++ b/src/main/webapp/app/overview/course-exercises/course-exercise-row.component.html
@@ -50,7 +50,7 @@ <h5 class="exercise-title">{{ exercise.title }}</h5>
                     {{ dueDate | artemisTimeAgo }}
                 </div>
             } @else {
-                <div class="col-auto mb-2">{{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}</div>
+                <div class="col-auto mb-2" jhiTranslate="artemisApp.courseOverview.exerciseList.noDueDate"></div>
             }
         </div>
     </div>
diff --git a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html
index 2de6ec14a991..6be118bf7475 100644
--- a/src/main/webapp/app/overview/course-exercises/course-exercises.component.html
+++ b/src/main/webapp/app/overview/course-exercises/course-exercises.component.html
@@ -1,7 +1,7 @@
 <div class="d-flex justify-content-between gap-3 horizontal-scroll">
     @if (course) {
         <div [ngClass]="{ 'sidebar-collapsed': isCollapsed }">
-            <jhi-sidebar [itemSelected]="exerciseSelected" [courseId]="courseId" [sidebarData]="sidebarData" [collapseState]="DEFAULT_COLLAPSE_STATE" />
+            <jhi-sidebar [itemSelected]="exerciseSelected" [courseId]="courseId" [sidebarData]="sidebarData" [collapseState]="DEFAULT_COLLAPSE_STATE" [showFilter]="true" />
         </div>
 
         @if (exerciseSelected) {
diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
index dc7e8b2eefcf..2bec1658d7e9 100644
--- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
+++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 }
@@ -26,9 +26,12 @@ <h4>
                     </div>
                     @if (lecture?.course?.isAtLeastEditor) {
                         <div class="col-auto d-flex align-items-center">
-                            <button id="manageLectureButton" class="btn btn-secondary" (click)="redirectToLectureManagement()">
-                                {{ 'artemisApp.courseOverview.manage' | artemisTranslate }}
-                            </button>
+                            <button
+                                id="manageLectureButton"
+                                class="btn btn-secondary"
+                                (click)="redirectToLectureManagement()"
+                                jhiTranslate="artemisApp.courseOverview.manage"
+                            ></button>
                         </div>
                     }
                 </div>
@@ -36,11 +39,11 @@ <h4>
             <!-- HEADER INFORMATION END -->
             <!-- LECTURE START -->
             <div class="row mt-2">
-                <div class="col pe-0 flex-grow-1">
+                <div class="col pe-0 pb-3 flex-grow-1">
                     @if (lecture.description) {
                         <div class="row mb-2 mt-2 align-items-baseline">
                             <div class="col-auto">
-                                <h3>{{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate }}</h3>
+                                <h3 jhiTranslate="artemisApp.courseOverview.lectureDetails.description"></h3>
                             </div>
                         </div>
                         <div class="row mb-2 markdown-preview">
@@ -51,18 +54,21 @@ <h3>{{ 'artemisApp.courseOverview.lectureDetails.description' | artemisTranslate
                     @if (lecture.lectureUnits) {
                         <div class="row mb-2 mt-2 align-items-baseline">
                             <div class="col-auto">
-                                <h3>{{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslate }}</h3>
+                                <h3 jhiTranslate="artemisApp.courseOverview.lectureDetails.lectureUnits"></h3>
                             </div>
                             @if (hasPdfLectureUnit) {
-                                <button id="downloadButton" class="col-auto btn btn-primary btn-sm rounded-pill" (click)="downloadMergedFiles()">
-                                    {{ 'artemisApp.courseOverview.lectureDetails.downloadMergedPdf' | artemisTranslate }}
-                                </button>
+                                <button
+                                    id="downloadButton"
+                                    class="col-auto btn btn-primary btn-sm rounded-pill"
+                                    (click)="downloadMergedFiles()"
+                                    jhiTranslate="artemisApp.courseOverview.lectureDetails.downloadMergedPdf"
+                                ></button>
                             }
                         </div>
                     }
                     @for (lectureUnit of lectureUnits; track lectureUnit) {
-                        <div class="row mt-3 d-flex flex-nowrap">
-                            <div class="col-lg-11 col-10">
+                        <div class="row m-0 mt-3 d-flex flex-nowrap">
+                            <div class="col-lg-11 p-0 col-10">
                                 @switch (lectureUnit.type) {
                                     @case (LectureUnitType.EXERCISE) {
                                         <jhi-exercise-unit [exerciseUnit]="lectureUnit" [course]="lecture!.course!" />
@@ -95,7 +101,7 @@ <h3>{{ 'artemisApp.courseOverview.lectureDetails.lectureUnits' | artemisTranslat
                     @if (lecture.attachments) {
                         <div class="row mb-2 mt-2 align-items-baseline">
                             <div class="col-auto">
-                                <h3>{{ 'artemisApp.courseOverview.lectureDetails.attachments' | artemisTranslate }}</h3>
+                                <h3 jhiTranslate="artemisApp.courseOverview.lectureDetails.attachments"></h3>
                             </div>
                         </div>
                     }
@@ -120,9 +126,7 @@ <h5 class="mb-1">
                                                 {{ attachmentExtension(attachment) | uppercase }}
                                             </span>
                                             @if (attachmentNotReleased(attachment)) {
-                                                <span class="ms-1 badge bg-warning">
-                                                    {{ 'artemisApp.courseOverview.lectureDetails.notReleased' | artemisTranslate }}
-                                                </span>
+                                                <span class="ms-1 badge bg-warning" jhiTranslate="artemisApp.courseOverview.lectureDetails.notReleased"></span>
                                             }
                                         </h5>
                                         <h6 class="text-secondary mb-0 lecture-attachment-details">
@@ -138,7 +142,7 @@ <h6 class="text-secondary mb-0 lecture-attachment-details">
                 <!-- LECTURE END -->
                 <div class="col d-flex flex-grow-1 justify-end" style="max-width: min-content">
                     @if (lecture && (isCommunicationEnabled(lecture.course) || isMessagingEnabled(lecture.course))) {
-                        <router-outlet class="ms-3" (activate)="onChildActivate($event)" />
+                        <jhi-discussion-section [lecture]="lecture" />
                     }
                 </div>
             </div>
diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.ts b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.ts
index e1ab434077ff..a87074793132 100644
--- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.ts
+++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.component.ts
@@ -9,7 +9,6 @@ import { Attachment } from 'app/entities/attachment.model';
 import { LectureService } from 'app/lecture/lecture.service';
 import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
-import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 import { onError } from 'app/shared/util/global.utils';
 import { finalize, tap } from 'rxjs/operators';
 import { AlertService } from 'app/core/util/alert.service';
@@ -39,7 +38,6 @@ export class CourseLectureDetailsComponent extends AbstractScienceComponent impl
     lecture?: Lecture;
     isDownloadingLink?: string;
     lectureUnits: LectureUnit[] = [];
-    discussionComponent?: DiscussionSectionComponent;
     hasPdfLectureUnit: boolean;
 
     paramsSubscription: Subscription;
@@ -107,10 +105,6 @@ export class CourseLectureDetailsComponent extends AbstractScienceComponent impl
                                     (unit) => unit.attachment?.link?.split('.').pop()!.toLocaleLowerCase() === 'pdf',
                                 ).length > 0;
                         }
-                        if (this.discussionComponent) {
-                            // We need to manually update the lecture property of the student questions component
-                            this.discussionComponent.lecture = this.lecture;
-                        }
                         this.endsSameDay = !!this.lecture?.startDate && !!this.lecture.endDate && dayjs(this.lecture.startDate).isSame(this.lecture.endDate, 'day');
                     },
                     error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
@@ -160,18 +154,6 @@ export class CourseLectureDetailsComponent extends AbstractScienceComponent impl
         this.lectureUnitService.completeLectureUnit(this.lecture!, event);
     }
 
-    /**
-     * This function gets called if the router outlet gets activated. This is
-     * used only for the DiscussionComponent
-     * @param instance The component instance
-     */
-    onChildActivate(instance: DiscussionSectionComponent) {
-        this.discussionComponent = instance; // save the reference to the component instance
-        if (this.lecture) {
-            instance.lecture = this.lecture;
-        }
-    }
-
     ngOnDestroy() {
         this.paramsSubscription?.unsubscribe();
         this.profileSubscription?.unsubscribe();
diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-details.module.ts b/src/main/webapp/app/overview/course-lectures/course-lecture-details.module.ts
index 8885f4eba764..315de44054b0 100644
--- a/src/main/webapp/app/overview/course-lectures/course-lecture-details.module.ts
+++ b/src/main/webapp/app/overview/course-lectures/course-lecture-details.module.ts
@@ -13,6 +13,7 @@ import { VideoUnitComponent } from 'app/overview/course-lectures/video-unit/vide
 import { TextUnitComponent } from 'app/overview/course-lectures/text-unit/text-unit.component';
 import { OnlineUnitComponent } from 'app/overview/course-lectures/online-unit/online-unit.component';
 import { AttachmentUnitComponent } from 'app/overview/course-lectures/attachment-unit/attachment-unit.component';
+import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 
 const routes: Routes = [
     {
@@ -23,13 +24,6 @@ const routes: Routes = [
             pageTitle: 'overview.lectures',
         },
         canActivate: [UserRouteAccessService],
-        children: [
-            {
-                path: '',
-                pathMatch: 'full',
-                loadChildren: () => import('../discussion-section/discussion-section.module').then((m) => m.DiscussionSectionModule),
-            },
-        ],
     },
 ];
 @NgModule({
@@ -45,6 +39,7 @@ const routes: Routes = [
         TextUnitComponent,
         OnlineUnitComponent,
         AttachmentUnitComponent,
+        DiscussionSectionComponent,
     ],
     declarations: [CourseLectureDetailsComponent],
     exports: [CourseLectureDetailsComponent],
diff --git a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html
index e3f6841c9e09..d26daae4d1c5 100644
--- a/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html
+++ b/src/main/webapp/app/overview/course-lectures/course-lecture-row.component.html
@@ -23,7 +23,7 @@ <h4>{{ lecture?.title }}</h4>
                     ({{ lecture.startDate | artemisTimeAgo }})
                 </div>
             } @else {
-                <div class="col-auto mb-2">{{ 'artemisApp.courseOverview.exerciseList.noDueDate' | artemisTranslate }}</div>
+                <div class="col-auto mb-2" jhiTranslate="artemisApp.courseOverview.exerciseList.noDueDate"></div>
             }
         </div>
     </div>
diff --git a/src/main/webapp/app/overview/course-overview.component.html b/src/main/webapp/app/overview/course-overview.component.html
index 1cd9605ef9ef..ee6f77d51b5a 100644
--- a/src/main/webapp/app/overview/course-overview.component.html
+++ b/src/main/webapp/app/overview/course-overview.component.html
@@ -158,9 +158,7 @@
                         <div class="d-flex">
                             @if (isNotManagementView && course.isAtLeastTutor) {
                                 <div id="manage-button">
-                                    <a class="btn btn-secondary" [routerLink]="['/course-management', course.id]">
-                                        {{ 'artemisApp.courseOverview.manage' | artemisTranslate }}
-                                    </a>
+                                    <a class="btn btn-secondary" [routerLink]="['/course-management', course.id]" jhiTranslate="artemisApp.courseOverview.manage"></a>
                                 </div>
                             }
                             @if (showRefreshButton) {
diff --git a/src/main/webapp/app/overview/course-overview.scss b/src/main/webapp/app/overview/course-overview.scss
index 1d8c2df40685..366470e3c500 100644
--- a/src/main/webapp/app/overview/course-overview.scss
+++ b/src/main/webapp/app/overview/course-overview.scss
@@ -141,6 +141,8 @@ canvas#complete-chart {
     text-align: left;
     color: white;
     background-color: #3e8acc;
+    border: none;
+    border-radius: 1px;
     &:hover {
         background-color: #0f6ab4;
     }
@@ -150,8 +152,6 @@ canvas#complete-chart {
     &:disabled {
         background-color: gray;
     }
-    border: none;
-    border-radius: 1px;
 }
 
 /* Default the color to white even on bootstrap 5 */
diff --git a/src/main/webapp/app/overview/course-overview.service.ts b/src/main/webapp/app/overview/course-overview.service.ts
index ab2f9f32744d..0432dc2e361b 100644
--- a/src/main/webapp/app/overview/course-overview.service.ts
+++ b/src/main/webapp/app/overview/course-overview.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Exercise, getIcon } from 'app/entities/exercise.model';
 import { Lecture } from 'app/entities/lecture.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 import { getExerciseDueDate } from 'app/exercises/shared/exercise/exercise.utils';
diff --git a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html
index f60094d04581..530576179db6 100644
--- a/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-prerequisites-button/course-prerequisites-button.component.html
@@ -1,5 +1,3 @@
 @if (course.prerequisites?.length) {
-    <button class="btn btn-secondary" (click)="showPrerequisites(course.id!)">
-        {{ 'artemisApp.studentDashboard.enroll.coursePrerequisites' | artemisTranslate }}
-    </button>
+    <button class="btn btn-secondary" (click)="showPrerequisites(course.id!)" jhiTranslate="artemisApp.studentDashboard.enroll.coursePrerequisites"></button>
 }
diff --git a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html
index 6b40d0b02e0d..960a67b4c207 100644
--- a/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-registration-button/course-registration-button.component.html
@@ -11,7 +11,5 @@
     />
 }
 @if (!course.enrollmentConfirmationMessage!) {
-    <button class="btn btn-primary" (click)="registerForCourse(course.id!)" [disabled]="loading">
-        {{ 'artemisApp.studentDashboard.enroll.enrollInCourse' | artemisTranslate }}
-    </button>
+    <button class="btn btn-primary" (click)="registerForCourse(course.id!)" [disabled]="loading" jhiTranslate="artemisApp.studentDashboard.enroll.enrollInCourse"></button>
 }
diff --git a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html
index df46fef541bf..d03a7b1b8572 100644
--- a/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-registration-detail/course-registration-detail.component.html
@@ -1,13 +1,11 @@
-<h3>{{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}</h3>
+<h3 jhiTranslate="artemisApp.studentDashboard.enroll.title"></h3>
 @if (loading) {
     <div>
-        <span>{{ 'artemisApp.studentDashboard.enroll.courseLoading' | artemisTranslate }}</span>
+        <span jhiTranslate="artemisApp.studentDashboard.enroll.courseLoading"></span>
     </div>
 } @else {
     <h4>{{ course?.title }}</h4>
-    <p>
-        {{ 'artemisApp.studentDashboard.enroll.notInCourseButCanEnroll' | artemisTranslate }}
-    </p>
+    <p jhiTranslate="artemisApp.studentDashboard.enroll.notInCourseButCanEnroll"></p>
     <jhi-course-prerequisites-button [course]="course!" />
     <jhi-course-registration-button [course]="course!" (onRegistration)="redirectToCoursePage()" />
 }
diff --git a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
index 076549012a21..3e4ef9383be6 100644
--- a/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-registration-prerequisites-modal/course-prerequisites-modal.component.html
@@ -7,7 +7,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.prerequisite.title"></h4>
         @if (isLoading) {
             <div class="d-flex justify-content-center">
                 <div class="spinner-border" role="status">
-                    <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+                    <span class="sr-only" jhiTranslate="loading"></span>
                 </div>
             </div>
         } @else {
diff --git a/src/main/webapp/app/overview/course-registration/course-registration.component.html b/src/main/webapp/app/overview/course-registration/course-registration.component.html
index 487181793162..36da4167694c 100644
--- a/src/main/webapp/app/overview/course-registration/course-registration.component.html
+++ b/src/main/webapp/app/overview/course-registration/course-registration.component.html
@@ -1,5 +1,5 @@
 <div>
-    <h3>{{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}</h3>
+    <h3 jhiTranslate="artemisApp.studentDashboard.enroll.title"></h3>
     <div class="col-12 mb-3">
         <input type="text" class="form-control" [(ngModel)]="searchTermString" (input)="applySearch()" [placeholder]="'artemisApp.course.searchForCourse' | artemisTranslate" />
     </div>
@@ -46,14 +46,12 @@ <h3>{{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}</h3>
         </div>
     }
     @if (!loading && !coursesToSelect) {
-        <div class="col-12 col-sm-auto">
-            {{ 'artemisApp.studentDashboard.enroll.noCourse' | artemisTranslate }}
-        </div>
+        <div class="col-12 col-sm-auto" jhiTranslate="artemisApp.studentDashboard.enroll.noCourse"></div>
     }
     @if (loading && !coursesToSelect) {
         <div class="col-12 col-sm-auto d-flex justify-content-center">
             <div class="spinner-border" role="status">
-                <span class="sr-only">{{ 'artemisApp.studentDashboard.enroll.coursesLoading' | artemisTranslate }}</span>
+                <span class="sr-only" jhiTranslate="artemisApp.studentDashboard.enroll.coursesLoading"></span>
             </div>
         </div>
     }
diff --git a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html
index 2bf923aec355..73dd416ef9d2 100644
--- a/src/main/webapp/app/overview/course-statistics/course-statistics.component.html
+++ b/src/main/webapp/app/overview/course-statistics/course-statistics.component.html
@@ -3,23 +3,23 @@
         <div class="col" aria-label="Filter Dropdown" ngbDropdown>
             <button class="btn" [class.btn-secondary]="!numberOfAppliedFilters" [class.btn-success]="!!numberOfAppliedFilters" ngbDropdownToggle id="filter-dropdown-button">
                 <fa-icon [icon]="faFilter" />
-                <span>{{ 'artemisApp.courseOverview.exerciseList.filter' | artemisTranslate: { num: numberOfAppliedFilters } }}</span>
+                <span jhiTranslate="artemisApp.courseOverview.exerciseList.filter" [translateValues]="{ num: numberOfAppliedFilters }"></span>
             </button>
             <ul ngbDropdownMenu class="checkbox-menu text-nowrap pe-2" aria-labelledby="filter-dropdown-button">
                 <li class="mb-1">
-                    <b class="ms-2">{{ 'artemisApp.courseOverview.statistics.includeStandardCategories' | artemisTranslate }}</b>
+                    <b class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.includeStandardCategories"></b>
                 </li>
                 <li>
                     <input class="ms-2 form-check-input" (change)="toggleNotIncludedInScoreExercises()" [checked]="currentlyHidingNotIncludedInScoreExercises" type="checkbox" />
                     <span class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.hideNotIncludedInScoreExercises"></span>
                 </li>
                 <li class="mt-1 mb-1">
-                    <b class="ms-2">{{ 'artemisApp.courseOverview.statistics.includeIndividualCategories' | artemisTranslate }}</b>
+                    <b class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.includeIndividualCategories"></b>
                 </li>
                 <li>
                     <label class="mb-1">
                         <input class="ms-2 form-check-input" (change)="toggleAllCategories()" [checked]="categoryFilter.allCategoriesSelected" type="checkbox" />
-                        <b class="ms-2">{{ 'artemisApp.courseOverview.statistics.includeAllCategories' | artemisTranslate }}</b>
+                        <b class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.includeAllCategories"></b>
                     </label>
                 </li>
                 @if (categoryFilter.exercisesWithoutCategoriesPresent) {
@@ -31,7 +31,7 @@
                                 [checked]="categoryFilter.includeExercisesWithNoCategory"
                                 type="checkbox"
                             />
-                            <span class="ms-2">{{ 'artemisApp.courseOverview.statistics.exercisesWithNoCategories' | artemisTranslate }}</span>
+                            <span class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.exercisesWithNoCategories"></span>
                         </label>
                     </li>
                 }
@@ -53,7 +53,7 @@
             <div class="row">
                 <div class="statistic-summary">
                     <div class="d-flex align-items-center">
-                        <h2>{{ 'artemisApp.courseOverview.statistics.totalScore' | artemisTranslate }}</h2>
+                        <h2 jhiTranslate="artemisApp.courseOverview.statistics.totalScore"></h2>
                         <jhi-documentation-button [type]="documentationType" />
                     </div>
                     <div class="row d-flex justify-content-center align-items-start">
@@ -80,13 +80,17 @@ <h5 class="fw-bolder">{{ exerciseType.name | artemisTranslate }}</h5>
                             }
                         </div>
                         <div class="col-md-3">
-                            <h5 class="fw-bolder" id="absolute-course-score">
-                                {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: overallPoints } }}
-                            </h5>
+                            <h5
+                                class="fw-bolder"
+                                id="absolute-course-score"
+                                jhiTranslate="artemisApp.courseOverview.statistics.yourPoints"
+                                [translateValues]="{ number: overallPoints }"
+                            ></h5>
                             <h5 class="fw-bolder" id="reachable-course-score">
-                                <span>
-                                    {{ 'artemisApp.courseOverview.statistics.reachablePoints' | artemisTranslate: { number: reachablePoints, relative: currentRelativeScore } }}
-                                </span>
+                                <span
+                                    jhiTranslate="artemisApp.courseOverview.statistics.reachablePoints"
+                                    [translateValues]="{ number: reachablePoints, relative: currentRelativeScore }"
+                                ></span>
                                 <fa-icon
                                     id="reachable-help"
                                     class="me-1"
@@ -95,9 +99,10 @@ <h5 class="fw-bolder" id="reachable-course-score">
                                 />
                             </h5>
                             <h5 class="mb-4 statistics-legend" id="max-course-score">
-                                <span>
-                                    {{ 'artemisApp.courseOverview.statistics.totalPoints' | artemisTranslate: { number: overallMaxPoints, relative: totalRelativeScore } }}
-                                </span>
+                                <span
+                                    jhiTranslate="artemisApp.courseOverview.statistics.totalPoints"
+                                    [translateValues]="{ number: overallMaxPoints, relative: totalRelativeScore }"
+                                ></span>
                                 <fa-icon
                                     id="total-help"
                                     class="me-1"
@@ -128,35 +133,39 @@ <h6>
                                     <div class="mt-3">
                                         <a class="btn btn-primary" [routerLink]="['grading-key']" [queryParams]="{ grade: gradeDTO?.gradeName }">
                                             <fa-icon [icon]="faClipboard" />
-                                            <span>
-                                                {{
-                                                    isBonus
-                                                        ? ('artemisApp.exam.examSummary.gradeKeyButtonBonus' | artemisTranslate)
-                                                        : ('artemisApp.exam.examSummary.gradeKeyButton' | artemisTranslate)
-                                                }}
-                                            </span>
+                                            <span
+                                                jhiTranslate="{{ isBonus ? 'artemisApp.exam.examSummary.gradeKeyButtonBonus' : 'artemisApp.exam.examSummary.gradeKeyButton' }}"
+                                            ></span>
                                         </a>
                                     </div>
                                 </div>
                             }
                             @if (course?.presentationScore) {
                                 <div>
-                                    <h5 class="fw-bolder">
-                                        {{ 'artemisApp.courseOverview.statistics.totalPresentationScore' | artemisTranslate: { number: overallPresentationScore } }}
-                                    </h5>
-                                    <h5 class="fw-bolder">
-                                        {{ 'artemisApp.courseOverview.statistics.presentationScoreBonus' | artemisTranslate: { number: course?.presentationScore } }}
-                                    </h5>
+                                    <h5
+                                        class="fw-bolder"
+                                        jhiTranslate="artemisApp.courseOverview.statistics.totalPresentationScore"
+                                        [translateValues]="{ number: overallPresentationScore }"
+                                    ></h5>
+                                    <h5
+                                        class="fw-bolder"
+                                        jhiTranslate="artemisApp.courseOverview.statistics.presentationScoreBonus"
+                                        [translateValues]="{ number: course?.presentationScore }"
+                                    ></h5>
                                 </div>
                             }
                             @if (reachablePresentationPoints) {
                                 <div>
-                                    <h5 class="fw-bolder">
-                                        {{ 'artemisApp.courseOverview.statistics.totalPresentationPoints' | artemisTranslate: { number: overallPresentationScore } }}
-                                    </h5>
-                                    <h5 class="fw-bolder">
-                                        {{ 'artemisApp.courseOverview.statistics.achievablePresentationPoints' | artemisTranslate: { number: reachablePresentationPoints } }}
-                                    </h5>
+                                    <h5
+                                        class="fw-bolder"
+                                        jhiTranslate="artemisApp.courseOverview.statistics.totalPresentationPoints"
+                                        [translateValues]="{ number: overallPresentationScore }"
+                                    ></h5>
+                                    <h5
+                                        class="fw-bolder"
+                                        jhiTranslate="artemisApp.courseOverview.statistics.achievablePresentationPoints"
+                                        [translateValues]="{ number: reachablePresentationPoints }"
+                                    ></h5>
                                     <h6>
                                         {{ 'artemisApp.courseOverview.statistics.gradeInfo' | artemisTranslate }}
                                         <fa-icon
@@ -175,16 +184,15 @@ <h6>
                 <jhi-exercise-scores-chart class="col-12" [filteredExerciseIDs]="filteredExerciseIDs" />
                 <hr />
                 <div class="col-12 mb-3">
-                    <h2>{{ 'artemisApp.courseOverview.statistics.pointsPerExercise' | artemisTranslate }}</h2>
+                    <h2 jhiTranslate="artemisApp.courseOverview.statistics.pointsPerExercise"></h2>
                     @for (exerciseGroup of ngxExerciseGroups | keyvalue; let index = $index; track index) {
                         @if (exerciseGroup.value[0]) {
                             <div class="row mt-3 d-flex justify-content-end" id="{{ exerciseGroup.value[0]?.type }}-wrapper">
                                 <div class="col-12 mb-1 d-flex align-items-center">
-                                    <h4>
-                                        {{
-                                            'artemisApp.courseOverview.statistics.exerciseCount' | artemisTranslate: { number: exerciseGroup.value.length, type: exerciseGroup.key }
-                                        }}
-                                    </h4>
+                                    <h4
+                                        jhiTranslate="artemisApp.courseOverview.statistics.exerciseCount"
+                                        [translateValues]="{ number: exerciseGroup.value.length, type: exerciseGroup.key }"
+                                    ></h4>
                                 </div>
                                 <div #containerRef class="col-12 col-md-8">
                                     <ngx-charts-bar-horizontal-stacked
@@ -203,22 +211,19 @@ <h4>
                                             @if ([barChartTitle.INCLUDED, barChartTitle.BONUS, barChartTitle.NOT_INCLUDED, barChartTitle.NO_DUE_DATE].includes(model.name)) {
                                                 <div>
                                                     @if (!model.isProgrammingExercise) {
-                                                        <span>
-                                                            {{
-                                                                'artemisApp.courseOverview.statistics.exerciseAchievedScore'
-                                                                    | artemisTranslate
-                                                                        : { points: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) }
-                                                            }}
-                                                        </span>
+                                                        <span
+                                                            jhiTranslate="artemisApp.courseOverview.statistics.exerciseAchievedScore"
+                                                            [translateValues]="{
+                                                                points: model.absoluteValue,
+                                                                percentage: roundScoreSpecifiedByCourseSettings(model.value, course),
+                                                            }"
+                                                        ></span>
                                                     }
                                                     @if (model.isProgrammingExercise) {
-                                                        <span>
-                                                            {{
-                                                                'artemisApp.courseOverview.statistics.programmingExercisePassedTests'
-                                                                    | artemisTranslate
-                                                                        : { tests: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) }
-                                                            }}
-                                                        </span>
+                                                        <span
+                                                            jhiTranslate="artemisApp.courseOverview.statistics.programmingExercisePassedTests"
+                                                            [translateValues]="{ tests: model.absoluteValue, percentage: roundScoreSpecifiedByCourseSettings(model.value, course) }"
+                                                        ></span>
                                                     }
                                                     @if (model.name === barChartTitle.BONUS) {
                                                         <span>
@@ -237,54 +242,43 @@ <h4>
                                                     @case (barChartTitle.MISSED) {
                                                         <div>
                                                             @if (!model.afterDueDate && !model.notParticipated && !model.isProgrammingExercise) {
-                                                                <span>
-                                                                    {{
-                                                                        'artemisApp.courseOverview.statistics.exerciseMissedScore'
-                                                                            | artemisTranslate
-                                                                                : {
-                                                                                      points: model.absoluteValue,
-                                                                                      percentage: roundScoreSpecifiedByCourseSettings(model.value, course),
-                                                                                  }
-                                                                    }}
-                                                                </span>
+                                                                <span
+                                                                    jhiTranslate="artemisApp.courseOverview.statistics.exerciseMissedScore"
+                                                                    [translateValues]="{
+                                                                        points: model.absoluteValue,
+                                                                        percentage: roundScoreSpecifiedByCourseSettings(model.value, course),
+                                                                    }"
+                                                                ></span>
                                                             }
                                                             @if (model.notParticipated) {
-                                                                <span>
-                                                                    {{
-                                                                        'artemisApp.courseOverview.statistics.exerciseNotParticipated'
-                                                                            | artemisTranslate: { exercise: model.exerciseTitle }
-                                                                    }}
-                                                                </span>
+                                                                <span
+                                                                    jhiTranslate="artemisApp.courseOverview.statistics.exerciseNotParticipated"
+                                                                    [translateValues]="{ exercise: model.exerciseTitle }"
+                                                                ></span>
                                                             }
                                                             @if (model.afterDueDate) {
-                                                                <span>
-                                                                    {{
-                                                                        'artemisApp.courseOverview.statistics.exerciseParticipatedAfterDueDate'
-                                                                            | artemisTranslate: { exercise: model.exerciseTitle }
-                                                                    }}
-                                                                </span>
+                                                                <span
+                                                                    jhiTranslate="artemisApp.courseOverview.statistics.exerciseParticipatedAfterDueDate"
+                                                                    [translateValues]="{ exercise: model.exerciseTitle }"
+                                                                ></span>
                                                             }
                                                             @if (model.isProgrammingExercise && !model.notParticipated) {
-                                                                <span>
-                                                                    {{
-                                                                        'artemisApp.courseOverview.statistics.programmingExerciseFailedTests'
-                                                                            | artemisTranslate
-                                                                                : {
-                                                                                      tests: model.absoluteValue,
-                                                                                      percentage: roundScoreSpecifiedByCourseSettings(model.value, course),
-                                                                                  }
-                                                                    }}
-                                                                </span>
+                                                                <span
+                                                                    jhiTranslate="artemisApp.courseOverview.statistics.programmingExerciseFailedTests"
+                                                                    [translateValues]="{
+                                                                        tests: model.absoluteValue,
+                                                                        percentage: roundScoreSpecifiedByCourseSettings(model.value, course),
+                                                                    }"
+                                                                ></span>
                                                             }
                                                         </div>
                                                     }
                                                     @case (barChartTitle.NOT_GRADED) {
                                                         <div>
-                                                            <span>
-                                                                {{
-                                                                    'artemisApp.courseOverview.statistics.exerciseNotGraded' | artemisTranslate: { exercise: model.exerciseTitle }
-                                                                }}</span
-                                                            >
+                                                            <span
+                                                                jhiTranslate="artemisApp.courseOverview.statistics.exerciseNotGraded"
+                                                                [translateValues]="{ exercise: model.exerciseTitle }"
+                                                            ></span>
                                                         </div>
                                                     }
                                                 }
@@ -294,17 +288,17 @@ <h4>
                                 </div>
                                 @if (exerciseGroup.value && exerciseGroup.value.length) {
                                     <div class="col-12 col-md-3 align-self-top mt-2">
-                                        <h5 class="fw-bolder" id="absolute-score">
-                                            {{ 'artemisApp.courseOverview.statistics.yourPoints' | artemisTranslate: { number: exerciseGroup.value[0].absoluteScore } }}
-                                        </h5>
+                                        <h5
+                                            class="fw-bolder"
+                                            id="absolute-score"
+                                            jhiTranslate="artemisApp.courseOverview.statistics.yourPoints"
+                                            [translateValues]="{ number: exerciseGroup.value[0].absoluteScore }"
+                                        ></h5>
                                         <h5 class="fw-bolder" id="reachable-score">
-                                            <span>
-                                                {{
-                                                    'artemisApp.courseOverview.statistics.reachablePoints'
-                                                        | artemisTranslate
-                                                            : { number: exerciseGroup.value[0].reachablePoints, relative: exerciseGroup.value[0].currentRelativeScore }
-                                                }}
-                                            </span>
+                                            <span
+                                                jhiTranslate="artemisApp.courseOverview.statistics.reachablePoints"
+                                                [translateValues]="{ number: exerciseGroup.value[0].reachablePoints, relative: exerciseGroup.value[0].currentRelativeScore }"
+                                            ></span>
                                             <fa-icon
                                                 id="reachable-help"
                                                 class="me-1"
@@ -313,12 +307,10 @@ <h5 class="fw-bolder" id="reachable-score">
                                             />
                                         </h5>
                                         <h5 class="fw-bolder" id="max-score">
-                                            <span>
-                                                {{
-                                                    'artemisApp.courseOverview.statistics.totalPoints'
-                                                        | artemisTranslate: { number: exerciseGroup.value[0].overallMaxPoints, relative: exerciseGroup.value[0].relativeScore }
-                                                }}
-                                            </span>
+                                            <span
+                                                jhiTranslate="artemisApp.courseOverview.statistics.totalPoints"
+                                                [translateValues]="{ number: exerciseGroup.value[0].overallMaxPoints, relative: exerciseGroup.value[0].relativeScore }"
+                                            ></span>
                                             <fa-icon
                                                 id="total-help"
                                                 class="me-1"
@@ -327,12 +319,12 @@ <h5 class="fw-bolder" id="max-score">
                                             />
                                         </h5>
                                         @if (exerciseGroup.value[0].presentationScoreEnabled && course?.presentationScore) {
-                                            <h5 class="fw-bolder" id="presentation-score">
-                                                {{
-                                                    'artemisApp.courseOverview.statistics.presentationScore'
-                                                        | artemisTranslate: { number: exerciseGroup.value[0].presentationScore }
-                                                }}
-                                            </h5>
+                                            <h5
+                                                class="fw-bolder"
+                                                id="presentation-score"
+                                                jhiTranslate="artemisApp.courseOverview.statistics.presentationScore"
+                                                [translateValues]="{ number: exerciseGroup.value[0].presentationScore }"
+                                            ></h5>
                                         }
                                     </div>
                                 }
@@ -343,9 +335,7 @@ <h5 class="fw-bolder" id="presentation-score">
             </div>
         } @else {
             <div class="row">
-                <div class="col mt-3">
-                    {{ 'artemisApp.courseOverview.statistics.noStatistics' | artemisTranslate }}
-                </div>
+                <div class="col mt-3" jhiTranslate="artemisApp.courseOverview.statistics.noStatistics"></div>
             </div>
         }
     </div>
diff --git a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html
index fcdc854c1e4a..4add37514666 100644
--- a/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html
+++ b/src/main/webapp/app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component.html
@@ -17,9 +17,7 @@ <h5 class="text-center text-white">{{ tutorialGroup?.title ?? '' }}</h5>
         </div>
         <div class="card-footer">
             @if (tutorialGroup.teachingAssistantName) {
-                <div>
-                    {{ 'artemisApp.tutorialGroupCard.teachingAssistant' | artemisTranslate: { name: tutorialGroup.teachingAssistantName } }}
-                </div>
+                <div jhiTranslate="artemisApp.tutorialGroupCard.teachingAssistant" [translateValues]="{ name: tutorialGroup.teachingAssistantName }"></div>
             }
             @if (showChannelLink && tutorialGroup.channel && isMessagingEnabled(course)) {
                 <div class="mt-2">
@@ -29,10 +27,11 @@ <h5 class="text-center text-white">{{ tutorialGroup?.title ?? '' }}</h5>
                             [routerLink]="['/courses', course.id!, 'communication']"
                             [queryParams]="{ conversationId: tutorialGroup.channel.id }"
                             class="btn btn-primary"
-                            >{{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }}</a
-                        >
+                            jhiTranslate="artemisApp.entities.tutorialGroup.channelWithName"
+                            [translateValues]="{ channel: tutorialGroup.channel.name }"
+                        ></a>
                     } @else {
-                        <span>{{ 'artemisApp.entities.tutorialGroup.channelWithName' | artemisTranslate: { channel: tutorialGroup.channel.name } }}</span>
+                        <span jhiTranslate="artemisApp.entities.tutorialGroup.channelWithName" [translateValues]="{ channel: tutorialGroup.channel.name }"></span>
                     }
                 </div>
             }
diff --git a/src/main/webapp/app/overview/course-unenrollment-modal.component.html b/src/main/webapp/app/overview/course-unenrollment-modal.component.html
index 213dd615c852..31d17bde6bbc 100644
--- a/src/main/webapp/app/overview/course-unenrollment-modal.component.html
+++ b/src/main/webapp/app/overview/course-unenrollment-modal.component.html
@@ -1,7 +1,5 @@
 <div class="modal-header">
-    <h4 class="modal-title">
-        {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.title' | artemisTranslate }}
-    </h4>
+    <h4 class="modal-title" jhiTranslate="artemisApp.courseOverview.exerciseList.details.unenrollmentModal.title"></h4>
 </div>
 <div class="modal-body">
     <div class="unenrollment-info">
@@ -10,9 +8,7 @@ <h4 class="modal-title">
             <b>{{ course?.title }}</b> ?
         </div>
         @if (!canEnrollAgain) {
-            <div>
-                {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.reenrollmentNotPossible' | artemisTranslate }}
-            </div>
+            <div jhiTranslate="artemisApp.courseOverview.exerciseList.details.unenrollmentModal.reenrollmentNotPossible"></div>
         }
         @if (canEnrollAgain) {
             <div>
@@ -22,22 +18,16 @@ <h4 class="modal-title">
         }
     </div>
     <form class="unenrollment-confirmation" [formGroup]="confirmationForm" style="margin-top: 1rem">
-        <label class="form-control-label" for="field_confirmation_input">
-            {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.confirmationInput' | artemisTranslate }}
-        </label>
+        <label class="form-control-label" for="field_confirmation_input" jhiTranslate="artemisApp.courseOverview.exerciseList.details.unenrollmentModal.confirmationInput"></label>
         <input type="text" class="form-control" name="confirmationInput" id="field_confirmation_input" formControlName="confirmationInput" required />
     </form>
 </div>
 <div class="modal-footer">
     <button class="btn btn-outline-secondary" id="course-unenrollment-cancel-button" (click)="onCancel()">
         <fa-icon [icon]="faXmark" />
-        <span class="d-sm-inline">
-            {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.cancelButton' | artemisTranslate }}
-        </span>
+        <span class="d-sm-inline" jhiTranslate="artemisApp.courseOverview.exerciseList.details.unenrollmentModal.cancelButton"></span>
     </button>
     <button class="btn btn-danger" id="course-unenrollment-accept-button" [disabled]="!isValidInput" (click)="onUnenroll()">
-        <span class="d-sm-inline">
-            {{ 'artemisApp.courseOverview.exerciseList.details.unenrollmentModal.acceptButton' | artemisTranslate }}
-        </span>
+        <span class="d-sm-inline" jhiTranslate="artemisApp.courseOverview.exerciseList.details.unenrollmentModal.acceptButton"></span>
     </button>
 </div>
diff --git a/src/main/webapp/app/overview/courses.component.html b/src/main/webapp/app/overview/courses.component.html
index ebfd4deb06f6..92381c38c62b 100644
--- a/src/main/webapp/app/overview/courses.component.html
+++ b/src/main/webapp/app/overview/courses.component.html
@@ -1,8 +1,6 @@
 @if (nextRelevantExam && nextRelevantCourseForExam) {
     <div class="row">
-        <h3 class="col mb-3 fw-medium">
-            {{ 'artemisApp.studentDashboard.examTitle' | artemisTranslate: { course: nextRelevantCourseForExam.title } }}
-        </h3>
+        <h3 class="col mb-3 fw-medium" jhiTranslate="artemisApp.studentDashboard.examTitle" [translateValues]="{ course: nextRelevantCourseForExam.title }"></h3>
         <div class="col-12 mb-5">
             <div class="row justify-content-between align-items-center exam-container ps-3 pe-3" (click)="openExam()">
                 <div class="mb-4 mt-4 d-flex" style="width: unset">
@@ -11,10 +9,10 @@ <h4 class="ms-2 fw-medium">{{ nextRelevantExam.title }}</h4>
                 </div>
                 <div class="text-end mb-4 mt-4" style="width: unset">
                     @if (nextRelevantExam.startDate) {
-                        <div>{{ 'artemisApp.exam.overview.start' | artemisTranslate: { start: nextRelevantExam.startDate | artemisDate } }}</div>
+                        <div jhiTranslate="artemisApp.exam.overview.start" [translateValues]="{ start: nextRelevantExam.startDate | artemisDate }"></div>
                     }
                     @if (nextRelevantExam.examMaxPoints) {
-                        <div>{{ 'artemisApp.exam.overview.maxPoints' | artemisTranslate: { points: nextRelevantExam.examMaxPoints } }}</div>
+                        <div jhiTranslate="artemisApp.exam.overview.maxPoints" [translateValues]="{ points: nextRelevantExam.examMaxPoints }"></div>
                     }
                 </div>
             </div>
@@ -28,7 +26,7 @@ <h3 class="fw-medium" jhiTranslate="artemisApp.studentDashboard.title"></h3>
 
     @if (regularCourses.length) {
         <div class="col-sm-auto d-flex">
-            <a class="btn btn-primary" [routerLink]="['/courses/enroll']">{{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}</a>
+            <a class="btn btn-primary" [routerLink]="['/courses/enroll']" jhiTranslate="artemisApp.studentDashboard.enroll.title"></a>
         </div>
     }
 </div>
@@ -51,7 +49,7 @@ <h4 class="col mb-3 fw-medium" jhiTranslate="artemisApp.studentDashboard.otherCo
     <div class="mt-5 mb-5 d-flex flex-column gap-3">
         <h4 class="text-secondary text-center" jhiTranslate="artemisApp.studentDashboard.noCourses"></h4>
         <div class="col-sm-auto d-flex justify-content-center">
-            <a class="btn btn-primary" [routerLink]="['/courses/enroll']">{{ 'artemisApp.studentDashboard.enroll.title' | artemisTranslate }}</a>
+            <a class="btn btn-primary" [routerLink]="['/courses/enroll']" jhiTranslate="artemisApp.studentDashboard.enroll.title"></a>
         </div>
     </div>
 } @else {
diff --git a/src/main/webapp/app/overview/courses.component.ts b/src/main/webapp/app/overview/courses.component.ts
index 73ce68512b8c..0d5218bb21b0 100644
--- a/src/main/webapp/app/overview/courses.component.ts
+++ b/src/main/webapp/app/overview/courses.component.ts
@@ -8,7 +8,7 @@ import { courseOverviewTour } from 'app/guided-tour/tours/course-overview-tour';
 import { TeamService } from 'app/exercises/shared/team/team.service';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import dayjs from 'dayjs/esm';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Router } from '@angular/router';
 import { faPenAlt } from '@fortawesome/free-solid-svg-icons';
 import { CourseAccessStorageService } from 'app/course/course-access-storage.service';
diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html
index c423a6c9ca5f..a1a4fc4d2944 100644
--- a/src/main/webapp/app/overview/discussion-section/discussion-section.component.html
+++ b/src/main/webapp/app/overview/discussion-section/discussion-section.component.html
@@ -20,15 +20,13 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                     </div>
                     <!-- body -->
                     @if (noChannelAvailable) {
-                        <div class="card-body">
-                            {{ 'artemisApp.metis.channel.noChannel' | artemisTranslate }}
-                        </div>
+                        <div class="card-body" jhiTranslate="artemisApp.metis.channel.noChannel"></div>
                     } @else {
                         <div class="card-body pt-0">
                             @if (currentPost !== undefined) {
                                 <div class="my-2">
                                     <fa-icon [icon]="faArrowLeft" (click)="resetCurrentPost()" class="back-button me-2 clickable" />
-                                    <span class="back-instruction">{{ 'artemisApp.metis.post.showAllPosts' | artemisTranslate }}</span>
+                                    <span class="back-instruction" jhiTranslate="artemisApp.metis.post.showAllPosts"></span>
                                     <jhi-posting-thread [post]="currentPost" [showAnswers]="true" [id]="'item-' + currentPost?.id" [showChannelReference]="false" />
                                 </div>
                             } @else {
@@ -65,7 +63,7 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                                                             id="filterToUnresolved"
                                                             (change)="onSelectContext()"
                                                         />
-                                                        <label for="filterToUnresolved" class="p-0">{{ 'artemisApp.metis.overview.filterToUnresolved' | artemisTranslate }}</label>
+                                                        <label for="filterToUnresolved" class="p-0" jhiTranslate="artemisApp.metis.overview.filterToUnresolved"></label>
                                                     </div>
                                                     <div class="form-group pe-2">
                                                         <input
@@ -76,7 +74,7 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                                                             id="filterToOwn"
                                                             (change)="onSelectContext()"
                                                         />
-                                                        <label for="filterToOwn" class="p-0">{{ 'artemisApp.metis.overview.filterToOwn' | artemisTranslate }}</label>
+                                                        <label for="filterToOwn" class="p-0" jhiTranslate="artemisApp.metis.overview.filterToOwn"></label>
                                                     </div>
                                                     <div class="form-group pe-2">
                                                         <input
@@ -87,9 +85,11 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                                                             id="filterToAnsweredOrReacted"
                                                             (change)="onSelectContext()"
                                                         />
-                                                        <label for="filterToAnsweredOrReacted" class="p-0">{{
-                                                            'artemisApp.metis.overview.filterToAnsweredOrReacted' | artemisTranslate
-                                                        }}</label>
+                                                        <label
+                                                            for="filterToAnsweredOrReacted"
+                                                            class="p-0"
+                                                            jhiTranslate="artemisApp.metis.overview.filterToAnsweredOrReacted"
+                                                        ></label>
                                                     </div>
                                                 </div>
                                             </div>
@@ -98,7 +98,7 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                                         <div class="col-auto ps-0">
                                             <div class="row align-items-baseline">
                                                 <div class="col-auto pe-1">
-                                                    <span>{{ 'artemisApp.metis.discussionSection.sortByDate' | artemisTranslate }}</span>
+                                                    <span jhiTranslate="artemisApp.metis.discussionSection.sortByDate"></span>
                                                 </div>
                                                 @if (!currentSortDirection) {
                                                     <div class="col-auto p-0 clickable" (click)="onChangeSortDir()">
@@ -142,13 +142,13 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                             <!-- loading posts -->
                             @if (isLoading) {
                                 <div class="post-result-information row mt-2">
-                                    <div class="col-12">{{ 'artemisApp.metis.discussionSection.loadingMessages' | artemisTranslate }}</div>
+                                    <div class="col-12" jhiTranslate="artemisApp.metis.discussionSection.loadingMessages"></div>
                                 </div>
                             }
                             <!-- no posts -->
                             @if (!isLoading && posts.length === 0) {
                                 <div class="post-result-information row mt-2">
-                                    <div class="col-12">{{ 'artemisApp.metis.discussionSection.noMessages' | artemisTranslate }}</div>
+                                    <div class="col-12" jhiTranslate="artemisApp.metis.discussionSection.noMessages"></div>
                                 </div>
                             }
                             <!-- new post button -->
@@ -163,10 +163,10 @@ <h5 class="mb-0 fw-medium" jhiTranslate="artemisApp.metis.communication.label"><
                                                 <fa-icon [icon]="faTimes" />
                                             }
                                             @if (!shouldSendMessage) {
-                                                <span class="d-none d-md-inline">{{ 'artemisApp.metis.newMessage' | artemisTranslate }}</span>
+                                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.metis.newMessage"></span>
                                             }
                                             @if (shouldSendMessage) {
-                                                <span class="d-none d-md-inline">{{ 'artemisApp.metis.collapseNewMessage' | artemisTranslate }}</span>
+                                                <span class="d-none d-md-inline" jhiTranslate="artemisApp.metis.collapseNewMessage"></span>
                                             }
                                         </button>
                                         @if (shouldSendMessage) {
diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.component.ts b/src/main/webapp/app/overview/discussion-section/discussion-section.component.ts
index fae15df461dd..63d5873cc3b1 100644
--- a/src/main/webapp/app/overview/discussion-section/discussion-section.component.ts
+++ b/src/main/webapp/app/overview/discussion-section/discussion-section.component.ts
@@ -1,4 +1,4 @@
-import { AfterViewInit, Component, ElementRef, Input, OnDestroy, OnInit, QueryList, ViewChild, ViewChildren } from '@angular/core';
+import { AfterViewInit, Component, ElementRef, OnDestroy, QueryList, ViewChild, ViewChildren, effect, input } from '@angular/core';
 import interact from 'interactjs';
 import { Exercise } from 'app/entities/exercise.model';
 import { Lecture } from 'app/entities/lecture.model';
@@ -14,17 +14,22 @@ import { CourseDiscussionDirective } from 'app/shared/metis/course-discussion.di
 import { FormBuilder } from '@angular/forms';
 import { Channel, ChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { ChannelService } from 'app/shared/metis/conversations/channel.service';
-import { MetisConversationService } from 'app/shared/metis/metis-conversation.service';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { ArtemisPlagiarismCasesSharedModule } from 'app/course/plagiarism-cases/shared/plagiarism-cases-shared.module';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
 @Component({
     selector: 'jhi-discussion-section',
     templateUrl: './discussion-section.component.html',
     styleUrls: ['./discussion-section.component.scss'],
+    imports: [FontAwesomeModule, ArtemisSharedModule, ArtemisPlagiarismCasesSharedModule, InfiniteScrollModule],
+    standalone: true,
     providers: [MetisService],
 })
-export class DiscussionSectionComponent extends CourseDiscussionDirective implements OnInit, AfterViewInit, OnDestroy {
-    @Input() exercise?: Exercise;
-    @Input() lecture?: Lecture;
+export class DiscussionSectionComponent extends CourseDiscussionDirective implements AfterViewInit, OnDestroy {
+    exercise = input<Exercise>();
+    lecture = input<Lecture>();
 
     @ViewChild(PostCreateEditModalComponent) postCreateEditModal?: PostCreateEditModalComponent;
     @ViewChildren('postingThread') messages: QueryList<any>;
@@ -60,22 +65,18 @@ export class DiscussionSectionComponent extends CourseDiscussionDirective implem
         private activatedRoute: ActivatedRoute,
         private router: Router,
         private formBuilder: FormBuilder,
-        private metisConversationService: MetisConversationService,
     ) {
         super(metisService);
+        effect(() => this.loadData(this.exercise(), this.lecture()));
     }
 
-    /**
-     * on initialization: initializes the metis service, fetches the posts for the exercise or lecture the discussion section is placed at,
-     * creates the subscription to posts to stay updated on any changes of posts in this course
-     */
-    ngOnInit(): void {
+    loadData(exercise?: Exercise, lecture?: Lecture): void {
         this.paramSubscription = combineLatest({
             params: this.activatedRoute.params,
             queryParams: this.activatedRoute.queryParams,
         }).subscribe((routeParams: { params: Params; queryParams: Params }) => {
             this.currentPostId = +routeParams.queryParams.postId;
-            this.course = this.exercise?.course ?? this.lecture?.course;
+            this.course = exercise?.course ?? lecture?.course;
             this.metisService.setCourse(this.course);
             this.metisService.setPageType(this.PAGE_TYPE);
             if (routeParams.params.courseId) {
@@ -146,14 +147,14 @@ export class DiscussionSectionComponent extends CourseDiscussionDirective implem
 
         // Currently, an additional REST call is made to retrieve the channel associated with the lecture/exercise
         // TODO: Add the channel to the response for loading the lecture/exercise
-        if (this.lecture?.id) {
+        if (this.lecture()) {
             this.channelService
-                .getChannelOfLecture(courseId, this.lecture.id)
+                .getChannelOfLecture(courseId, this.lecture()!.id!)
                 .pipe(map((res: HttpResponse<ChannelDTO>) => res.body))
                 .subscribe(getChannel());
-        } else if (this.exercise?.id) {
+        } else if (this.exercise()) {
             this.channelService
-                .getChannelOfExercise(courseId, this.exercise.id)
+                .getChannelOfExercise(courseId, this.exercise()!.id!)
                 .pipe(map((res: HttpResponse<ChannelDTO>) => res.body))
                 .subscribe(getChannel());
         }
@@ -271,8 +272,8 @@ export class DiscussionSectionComponent extends CourseDiscussionDirective implem
     resetFormGroup(): void {
         this.formGroup = this.formBuilder.group({
             conversationId: this.channel?.id,
-            exerciseId: this.exercise?.id,
-            lectureId: this.lecture?.id,
+            exerciseId: this.exercise()?.id,
+            lectureId: this.lecture()?.id,
             filterToUnresolved: false,
             filterToOwn: false,
             filterToAnsweredOrReacted: false,
diff --git a/src/main/webapp/app/overview/discussion-section/discussion-section.module.ts b/src/main/webapp/app/overview/discussion-section/discussion-section.module.ts
deleted file mode 100644
index 125a60831748..000000000000
--- a/src/main/webapp/app/overview/discussion-section/discussion-section.module.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { NgModule } from '@angular/core';
-import { ArtemisSharedModule } from 'app/shared/shared.module';
-import { ArtemisSidePanelModule } from 'app/shared/side-panel/side-panel.module';
-import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
-import { RouterModule, Routes } from '@angular/router';
-import { MetisModule } from 'app/shared/metis/metis.module';
-import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
-import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-
-const routes: Routes = [
-    {
-        path: '',
-        pathMatch: 'full',
-        component: DiscussionSectionComponent,
-    },
-];
-
-@NgModule({
-    imports: [RouterModule.forChild(routes), MetisModule, ArtemisSharedModule, ArtemisSidePanelModule, ArtemisSharedComponentModule, InfiniteScrollModule],
-    declarations: [DiscussionSectionComponent],
-    exports: [DiscussionSectionComponent],
-})
-export class DiscussionSectionModule {}
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
index 07fbccb20ec1..238401e7d4e3 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.html
@@ -113,7 +113,7 @@
                     <div class="row">
                         <div class="row mb-2 mt-2 align-items-baseline d-none d-md-flex">
                             <div class="col-auto">
-                                <h3>{{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTranslate }}</h3>
+                                <h3 jhiTranslate="artemisApp.courseOverview.exerciseDetails.recentResults"></h3>
                             </div>
                         </div>
                         <div class="row">
@@ -130,7 +130,7 @@ <h3>{{ 'artemisApp.courseOverview.exerciseDetails.recentResults' | artemisTransl
                         @if (showMoreResults) {
                             <div class="row mb-2 mt-2 align-items-baseline">
                                 <div class="col-auto">
-                                    <h3>{{ 'artemisApp.courseOverview.exerciseDetails.allResults' | artemisTranslate }}</h3>
+                                    <h3 jhiTranslate="artemisApp.courseOverview.exerciseDetails.allResults"></h3>
                                 </div>
                             </div>
                             <div class="row">
@@ -153,9 +153,7 @@ <h4 class="mt-2">
                                         </div>
                                     }
                                     @if (!sortedHistoryResults) {
-                                        <div class="no-results">
-                                            {{ 'artemisApp.courseOverview.exerciseDetails.noResults' | artemisTranslate }}
-                                        </div>
+                                        <div class="no-results" jhiTranslate="artemisApp.courseOverview.exerciseDetails.noResults"></div>
                                     }
                                 </div>
                             </div>
@@ -170,7 +168,7 @@ <h4 class="mt-2">
                 @if (exampleSolutionInfo?.exampleSolutionPublished) {
                     <div class="row mb-2 mt-2 align-items-baseline">
                         <div class="control-label" (click)="changeExampleSolution()">
-                            <span class="h3 pe-2">{{ 'artemisApp.exercise.exampleSolution' | artemisTranslate }}</span>
+                            <span class="h3 pe-2" jhiTranslate="artemisApp.exercise.exampleSolution"></span>
                             <fa-icon class="pe-3" [icon]="exampleSolutionCollapsed ? faAngleDown : faAngleUp" />
                         </div>
                     </div>
@@ -257,7 +255,7 @@ <h4 class="mt-2">
             </div>
             <div class="col d-flex flex-grow-1 justify-end" style="max-width: min-content">
                 @if (exercise.course && (isCommunicationEnabled(exercise.course) || isMessagingEnabled(exercise.course))) {
-                    <router-outlet (activate)="onChildActivate($event)" />
+                    <jhi-discussion-section [exercise]="exercise" />
                 }
             </div>
         </div>
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
index 260428c680e3..fc623b457d5d 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.component.ts
@@ -16,14 +16,13 @@ import { StudentParticipation } from 'app/entities/participation/student-partici
 import { ExampleSolutionInfo, ExerciseDetailsType, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { hasExerciseDueDatePassed } from 'app/exercises/shared/exercise/exercise.utils';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { TeamAssignmentPayload } from 'app/entities/team.model';
 import { TeamService } from 'app/exercises/shared/team/team.service';
 import { QuizExercise, QuizStatus } from 'app/entities/quiz/quiz-exercise.model';
 import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service';
-import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { getFirstResultWithComplaintFromResults } from 'app/entities/submission.model';
 import { ComplaintService } from 'app/complaints/complaint.service';
@@ -86,7 +85,6 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
     isAfterAssessmentDueDate: boolean;
     allowComplaintsForAutomaticAssessments: boolean;
     public gradingCriteria: GradingCriterion[];
-    private discussionComponent?: DiscussionSectionComponent;
     baseResource: string;
     isExamExercise: boolean;
     submissionPolicy?: SubmissionPolicy;
@@ -224,10 +222,6 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
         this.subscribeForNewResults();
         this.subscribeToTeamAssignmentUpdates();
 
-        if (this.discussionComponent && this.exercise) {
-            // We need to manually update the exercise property of the posts component
-            this.discussionComponent.exercise = this.exercise;
-        }
         this.baseResource = `/course-management/${this.courseId}/${this.exercise.type}-exercises/${this.exercise.id}/`;
     }
 
@@ -416,18 +410,6 @@ export class CourseExerciseDetailsComponent extends AbstractScienceComponent imp
         return undefined;
     }
 
-    /**
-     * This function gets called if the router outlet gets activated. This is
-     * used only for the DiscussionComponent
-     * @param instance The component instance
-     */
-    onChildActivate(instance: DiscussionSectionComponent) {
-        this.discussionComponent = instance; // save the reference to the component instance
-        if (this.exercise) {
-            instance.exercise = this.exercise;
-        }
-    }
-
     private onError(error: string) {
         this.alertService.error(error);
     }
diff --git a/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts b/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts
index 0b264b8006a0..63f0858ea8b8 100644
--- a/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts
+++ b/src/main/webapp/app/overview/exercise-details/course-exercise-details.module.ts
@@ -30,6 +30,7 @@ import { ProblemStatementComponent } from 'app/overview/exercise-details/problem
 import { ArtemisFeedbackModule } from 'app/exercises/shared/feedback/feedback.module';
 import { ArtemisExerciseInfoModule } from 'app/exercises/shared/exercise-info/exercise-info.module';
 import { IrisModule } from 'app/iris/iris.module';
+import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 
 const routes: Routes = [
     {
@@ -41,13 +42,6 @@ const routes: Routes = [
         },
         pathMatch: 'full',
         canActivate: [UserRouteAccessService],
-        children: [
-            {
-                path: '',
-                pathMatch: 'full',
-                loadChildren: () => import('../discussion-section/discussion-section.module').then((m) => m.DiscussionSectionModule),
-            },
-        ],
     },
 ];
 
@@ -76,6 +70,7 @@ const routes: Routes = [
         ArtemisFeedbackModule,
         ArtemisExerciseInfoModule,
         IrisModule,
+        DiscussionSectionComponent,
     ],
     declarations: [CourseExerciseDetailsComponent, OrionCourseExerciseDetailsComponent, LtiInitializerComponent, LtiInitializerModalComponent, ProblemStatementComponent],
     exports: [CourseExerciseDetailsComponent, OrionCourseExerciseDetailsComponent, ProblemStatementComponent],
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
index ea54cf40b8c2..b2d119d0cd2a 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.html
@@ -126,6 +126,7 @@
                                 [participations]="exercise.studentParticipations!"
                                 [exercise]="exercise"
                                 [routerLinkForRepositoryView]="repositoryLink + '/repository/' + exercise.studentParticipations![0].id"
+                                [useParticipationVcsAccessToken]="true"
                             />
                         }
                         @if (theiaEnabled) {
diff --git a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
index f2e251a81804..26e3bec0a7b0 100644
--- a/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
+++ b/src/main/webapp/app/overview/exercise-details/exercise-details-student-actions.component.ts
@@ -7,7 +7,7 @@ import { InitializationState } from 'app/entities/participation/participation.mo
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { hasExerciseDueDatePassed, isResumeExerciseAvailable, isStartExerciseAvailable, isStartPracticeAvailable } from 'app/exercises/shared/exercise/exercise.utils';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ArtemisQuizService } from 'app/shared/quiz/quiz.service';
 import { finalize } from 'rxjs/operators';
@@ -61,14 +61,14 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
     theiaPortalURL: string;
 
     // Icons
-    faFolderOpen = faFolderOpen;
-    faUsers = faUsers;
-    faEye = faEye;
-    faPlayCircle = faPlayCircle;
-    faRedo = faRedo;
-    faCodeBranch = faCodeBranch;
-    faDesktop = faDesktop;
-    faPenSquare = faPenSquare;
+    readonly faFolderOpen = faFolderOpen;
+    readonly faUsers = faUsers;
+    readonly faEye = faEye;
+    readonly faPlayCircle = faPlayCircle;
+    readonly faRedo = faRedo;
+    readonly faCodeBranch = faCodeBranch;
+    readonly faDesktop = faDesktop;
+    readonly faPenSquare = faPenSquare;
 
     private feedbackSent = false;
 
@@ -109,7 +109,7 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
                 this.athenaEnabled = profileInfo.activeProfiles?.includes(PROFILE_ATHENA);
 
                 // The online IDE is only available with correct SpringProfile and if it's enabled for this exercise
-                if (profileInfo.activeProfiles?.includes(PROFILE_THEIA)) {
+                if (profileInfo.activeProfiles?.includes(PROFILE_THEIA) && this.programmingExercise) {
                     this.theiaEnabled = true;
 
                     // Set variables now, sanitize later on
@@ -119,6 +119,16 @@ export class ExerciseDetailsStudentActionsComponent implements OnInit, OnChanges
                     if (this.theiaPortalURL === '') {
                         this.theiaEnabled = false;
                     }
+
+                    // Verify that the exercise allows the online IDE
+                    if (!this.programmingExercise.allowOnlineIde) {
+                        this.theiaEnabled = false;
+                    }
+
+                    // Verify that the exercise has a theia blueprint configured
+                    if (!this.programmingExercise.buildConfig?.theiaImage) {
+                        this.theiaEnabled = false;
+                    }
                 }
             });
         } else if (this.exercise.type === ExerciseType.MODELING) {
diff --git a/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html b/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html
index ebed5c03ce91..771aaf0cc970 100644
--- a/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html
+++ b/src/main/webapp/app/overview/exercise-details/problem-statement/problem-statement.component.html
@@ -6,7 +6,7 @@
     @if (exercise?.problemStatement) {
         <div class="row mb-2 align-items-baseline" id="problem-statement">
             <div class="col-12 col-md-12 markdown-preview problem-statement">
-                <h3>{{ 'artemisApp.courseOverview.exerciseDetails.problemStatement' | artemisTranslate }}</h3>
+                <h3 jhiTranslate="artemisApp.courseOverview.exerciseDetails.problemStatement"></h3>
                 <p [innerHTML]="exercise!.problemStatement! | htmlForMarkdown"></p>
             </div>
         </div>
diff --git a/src/main/webapp/app/overview/header-course.component.html b/src/main/webapp/app/overview/header-course.component.html
index df28e8ec031e..43a30615e2c8 100644
--- a/src/main/webapp/app/overview/header-course.component.html
+++ b/src/main/webapp/app/overview/header-course.component.html
@@ -17,9 +17,7 @@ <h6 id="course-header-description" class="fw-normal">{{ courseDescription }}</h6
                     }
                 </div>
                 <div class="d-flex align-items-center justify-content-center manage-button-container" id="student-view-button">
-                    <a class="btn btn-secondary manage-button" [routerLink]="['/courses', course.id]">
-                        {{ 'artemisApp.courseOverview.studentView' | artemisTranslate }}
-                    </a>
+                    <a class="btn btn-secondary manage-button" [routerLink]="['/courses', course.id]" jhiTranslate="artemisApp.courseOverview.studentView"></a>
                 </div>
             </div>
         </div>
diff --git a/src/main/webapp/app/overview/participation-websocket.service.ts b/src/main/webapp/app/overview/participation-websocket.service.ts
index 97e802f2350c..3836e7a81209 100644
--- a/src/main/webapp/app/overview/participation-websocket.service.ts
+++ b/src/main/webapp/app/overview/participation-websocket.service.ts
@@ -9,7 +9,7 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import dayjs from 'dayjs/esm';
 import { cloneDeep } from 'lodash-es';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 const PERSONAL_PARTICIPATION_TOPIC = `/user/topic/newResults`;
 const EXERCISE_PARTICIPATION_TOPIC = (exerciseId: number) => `/topic/exercise/${exerciseId}/newResults`;
diff --git a/src/main/webapp/app/overview/submission-result-status.component.html b/src/main/webapp/app/overview/submission-result-status.component.html
index 47a0b3e0b172..2cc0eaac36b4 100644
--- a/src/main/webapp/app/overview/submission-result-status.component.html
+++ b/src/main/webapp/app/overview/submission-result-status.component.html
@@ -18,25 +18,25 @@
     } @else {
         <div>
             @if (exercise.teamMode && exercise.studentAssignedTeamIdComputed && !exercise.studentAssignedTeamId) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.userNotAssignedToTeamShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.userNotAssignedToTeamShort"></span>
             }
             @if (uninitialized) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.userNotStartedExerciseShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.userNotStartedExerciseShort"></span>
             }
             @if (exerciseMissedDueDate) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.exerciseMissedDueDateShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseMissedDueDateShort"></span>
             }
             @if (notSubmitted) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.exerciseNotSubmittedShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.exerciseNotSubmittedShort"></span>
             }
             @if (!notSubmitted && studentParticipation?.initializationState === InitializationState.FINISHED) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.userSubmittedShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.userSubmittedShort"></span>
             }
             @if (studentParticipation?.initializationState === InitializationState.INITIALIZED && exercise.type === ExerciseType.QUIZ) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.userParticipatingShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.userParticipatingShort"></span>
             }
             @if (quizNotStarted) {
-                <span class="text-body-secondary">{{ 'artemisApp.courseOverview.exerciseList.quizNotStartedShort' | artemisTranslate }}</span>
+                <span class="text-body-secondary" jhiTranslate="artemisApp.courseOverview.exerciseList.quizNotStartedShort"></span>
             }
         </div>
     }
diff --git a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html
index fa692113e2d2..c4918ffe1525 100644
--- a/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html
+++ b/src/main/webapp/app/overview/visualizations/exercise-scores-chart/exercise-scores-chart.component.html
@@ -1,5 +1,5 @@
 <div class="d-flex">
-    <h2 class="col-9">{{ 'artemisApp.exercise-scores-chart.title' | artemisTranslate }}</h2>
+    <h2 class="col-9" jhiTranslate="artemisApp.exercise-scores-chart.title"></h2>
     @if (exerciseTypeFilter.typeSet.size > 0) {
         <div class="filter mb-2" aria-label="Filter Dropdown" ngbDropdown>
             <button
@@ -10,11 +10,11 @@ <h2 class="col-9">{{ 'artemisApp.exercise-scores-chart.title' | artemisTranslate
                 id="filter-dropdown-button"
             >
                 <fa-icon [icon]="faFilter" />
-                <span>{{ 'artemisApp.courseOverview.exerciseList.filter' | artemisTranslate: { num: exerciseTypeFilter.numberOfActiveFilters } }}</span>
+                <span jhiTranslate="artemisApp.courseOverview.exerciseList.filter" [translateValues]="{ num: exerciseTypeFilter.numberOfActiveFilters }"></span>
             </button>
             <ul ngbDropdownMenu class="checkbox-menu text-nowrap pe-2" aria-labelledby="filter-dropdown-button">
                 <li>
-                    <b class="ms-2">{{ 'artemisApp.exercise-scores-chart.includeType' | artemisTranslate }}</b>
+                    <b class="ms-2" jhiTranslate="artemisApp.exercise-scores-chart.includeType"></b>
                 </li>
                 @for (type of exerciseTypeFilter.typeSet; track type) {
                     <li>
diff --git a/src/main/webapp/app/shared/category-selector/category-selector.component.ts b/src/main/webapp/app/shared/category-selector/category-selector.component.ts
index 03b24cac6ca1..d899a7b034b3 100644
--- a/src/main/webapp/app/shared/category-selector/category-selector.component.ts
+++ b/src/main/webapp/app/shared/category-selector/category-selector.component.ts
@@ -1,13 +1,12 @@
 import { Component, ElementRef, EventEmitter, Input, OnChanges, Output, ViewChild, ViewEncapsulation } from '@angular/core';
 import { ColorSelectorComponent } from 'app/shared/color-selector/color-selector.component';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
-import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete';
+import { MatAutocompleteSelectedEvent, MatAutocompleteTrigger } from '@angular/material/autocomplete';
 import { COMMA, ENTER, TAB } from '@angular/cdk/keycodes';
 import { FormControl } from '@angular/forms';
 import { MatChipInputEvent } from '@angular/material/chips';
 import { Observable, map, startWith } from 'rxjs';
 import { faTimes } from '@fortawesome/free-solid-svg-icons';
-import { MatAutocompleteTrigger } from '@angular/material/autocomplete';
 
 const DEFAULT_COLORS = ['#6ae8ac', '#9dca53', '#94a11c', '#691b0b', '#ad5658', '#1b97ca', '#0d3cc2', '#0ab84f'];
 
@@ -44,8 +43,7 @@ export class CategorySelectorComponent implements OnChanges {
     separatorKeysCodes = [ENTER, COMMA, TAB];
     categoryCtrl = new FormControl<string | undefined>(undefined);
 
-    // Icons
-    faTimes = faTimes;
+    readonly faTimes = faTimes;
 
     ngOnChanges() {
         this.uniqueCategoriesForAutocomplete = this.categoryCtrl.valueChanges.pipe(
@@ -134,10 +132,7 @@ export class CategorySelectorComponent implements OnChanges {
     }
 
     private createCategory(categoryString: string): ExerciseCategory {
-        const category = new ExerciseCategory();
-        category.category = categoryString;
-        category.color = this.chooseRandomColor();
-        return category;
+        return new ExerciseCategory(categoryString, this.chooseRandomColor());
     }
 
     private chooseRandomColor(): string {
diff --git a/src/main/webapp/app/shared/components/checklist-check.component.html b/src/main/webapp/app/shared/components/checklist-check.component.html
deleted file mode 100644
index 3dacf1868569..000000000000
--- a/src/main/webapp/app/shared/components/checklist-check.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-@if (checkAttribute) {
-    <fa-icon [icon]="faCheckCircle" [size]="size" class="checked" [style]="{ color: iconColor }" />
-}
-@if (!checkAttribute) {
-    <fa-icon [icon]="faTimes" [size]="size" class="unchecked" [style]="{ fontSize: '1.5em', color: iconColor }" />
-}
-&nbsp;
diff --git a/src/main/webapp/app/shared/components/checklist-check.component.scss b/src/main/webapp/app/shared/components/checklist-check.component.scss
deleted file mode 100644
index c9e2a2e6dbd7..000000000000
--- a/src/main/webapp/app/shared/components/checklist-check.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-.checked {
-    color: var(--green);
-}
-
-.unchecked {
-    color: var(--markdown-preview-red);
-}
diff --git a/src/main/webapp/app/shared/components/checklist-check/checklist-check.component.html b/src/main/webapp/app/shared/components/checklist-check/checklist-check.component.html
new file mode 100644
index 000000000000..cae4278c4ea8
--- /dev/null
+++ b/src/main/webapp/app/shared/components/checklist-check/checklist-check.component.html
@@ -0,0 +1,6 @@
+@if (checkAttribute) {
+    <fa-icon [icon]="faCheckCircle" [size]="size" [style]="{ color: iconColor ?? 'var(--green)' }" />
+} @else {
+    <fa-icon [icon]="faTimes" [size]="size" class="fs-5" [style]="{ color: iconColor ?? 'var(--markdown-preview-red)' }" />
+}
+&nbsp;
diff --git a/src/main/webapp/app/shared/components/checklist-check.component.ts b/src/main/webapp/app/shared/components/checklist-check/checklist-check.component.ts
similarity index 78%
rename from src/main/webapp/app/shared/components/checklist-check.component.ts
rename to src/main/webapp/app/shared/components/checklist-check/checklist-check.component.ts
index ce4e07ac614b..3718e0f73adf 100644
--- a/src/main/webapp/app/shared/components/checklist-check.component.ts
+++ b/src/main/webapp/app/shared/components/checklist-check/checklist-check.component.ts
@@ -5,14 +5,12 @@ import { faCheckCircle, faTimes } from '@fortawesome/free-solid-svg-icons';
 @Component({
     selector: 'jhi-checklist-check',
     templateUrl: './checklist-check.component.html',
-    styleUrls: ['./checklist-check.component.scss'],
 })
 export class ChecklistCheckComponent {
+    protected readonly faTimes = faTimes;
+    protected readonly faCheckCircle = faCheckCircle;
+
     @Input() checkAttribute: boolean | undefined = false;
     @Input() iconColor?: string;
     @Input() size?: SizeProp;
-
-    // Icons
-    faTimes = faTimes;
-    faCheckCircle = faCheckCircle;
 }
diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.html b/src/main/webapp/app/shared/components/code-button/code-button.component.html
index 6cbcb0d59b52..c9d791edac00 100644
--- a/src/main/webapp/app/shared/components/code-button/code-button.component.html
+++ b/src/main/webapp/app/shared/components/code-button/code-button.component.html
@@ -14,15 +14,19 @@
         container="body"
     ></button>
     <ng-template #popContent>
-        @if (useSsh && (!user.sshPublicKey || gitlabVCEnabled)) {
-            <div class="alert alert-warning" [innerHTML]="getSshKeyTip()"></div>
+        @if (useSsh && !copyEnabled) {
+            <div class="alert alert-warning" [innerHTML]="sshKeyMissingTip"></div>
+        }
+        @if (useToken && !copyEnabled && tokenMissing) {
+            <div class="alert alert-warning" [innerHTML]="tokenMissingTip"></div>
+        }
+        @if (useToken && !copyEnabled && tokenExpired) {
+            <div class="alert alert-warning" [innerHTML]="tokenExpiredTip"></div>
         }
         @if (participations && participations.length > 1) {
             <div class="form-check form-switch">
                 <input mdbCheckbox id="switch-practice" class="form-check-input" type="checkbox" [checked]="isPracticeMode" (click)="switchPracticeMode()" />
-                <label class="form-check-label" for="switch-practice">
-                    {{ 'artemisApp.exerciseActions.practiceMode.title' | artemisTranslate }}
-                </label>
+                <label class="form-check-label" for="switch-practice" jhiTranslate="artemisApp.exerciseActions.practiceMode.title"></label>
             </div>
         }
         <h5>{{ cloneHeadline | artemisTranslate }}</h5>
@@ -36,7 +40,7 @@ <h5>{{ cloneHeadline | artemisTranslate }}</h5>
                         @if (showCloneUrlWithoutToken) {
                             <a (click)="useHttpsUrlWithoutToken()" class="dropdown-item {{ !useToken && !useSsh ? 'active' : '' }}" id="useHTTPSButton">HTTPS</a>
                         }
-                        @if (useVersionControlAccessToken && participations) {
+                        @if (accessTokensEnabled && (!useParticipationVcsAccessToken || participations)) {
                             <a (click)="useHttpsUrlWithToken()" class="dropdown-item {{ useToken && !useSsh ? 'active' : '' }}" id="useHTTPSWithTokenButton">Token</a>
                         }
                         <a (click)="useSshUrl()" class="dropdown-item {{ useSsh ? 'active' : '' }}" id="useSSHButton">SSH</a>
@@ -52,7 +56,7 @@ <h5>{{ cloneHeadline | artemisTranslate }}</h5>
                     'url-box-remove-line-right': !localVCEnabled || !!routerLinkForRepositoryView,
                 }"
                 [cdkCopyToClipboard]="getHttpOrSshRepositoryUri(false)"
-                (cdkCopyToClipboardCopied)="onCopyFinished($event)"
+                (cdkCopyToClipboardCopied)="copyEnabled ? onCopyFinished($event) : null"
                 >{{ getHttpOrSshRepositoryUri() }} </pre
             >
             <div class="d-flex align-items-center">
@@ -88,13 +92,13 @@ <h5>{{ cloneHeadline | artemisTranslate }}</h5>
         <button
             [cdkCopyToClipboard]="getHttpOrSshRepositoryUri(false)"
             (cdkCopyToClipboardCopied)="onCopyFinished($event)"
+            [disabled]="!copyEnabled"
             [class.btn-success]="wasCopied"
             class="btn btn-primary btn-sm me-2"
             type="button"
             style="min-width: 100px"
-        >
-            {{ wasCopied ? ('artemisApp.exerciseActions.copiedUrl' | artemisTranslate) : ('artemisApp.exerciseActions.copyUrl' | artemisTranslate) }}
-        </button>
+            jhiTranslate="{{ wasCopied ? 'artemisApp.exerciseActions.copiedUrl' : 'artemisApp.exerciseActions.copyUrl' }}"
+        ></button>
         <a class="btn btn-primary btn-sm" [href]="buildVSCodeUrl() | safeUrl" jhiTranslate="artemisApp.exerciseActions.cloneVSCode.button"> </a>
         <jhi-help-icon placement="right auto" text="artemisApp.exerciseActions.cloneVSCode.helpIcon" />
         <a class="btn btn-primary btn-sm" target="hidden-iframe" [href]="buildJetbrainsUrl() | safeUrl" jhiTranslate="artemisApp.exerciseActions.cloneIntelliJ.button"> </a>
diff --git a/src/main/webapp/app/shared/components/code-button/code-button.component.ts b/src/main/webapp/app/shared/components/code-button/code-button.component.ts
index 5cf1448bd580..0b356bf859e6 100644
--- a/src/main/webapp/app/shared/components/code-button/code-button.component.ts
+++ b/src/main/webapp/app/shared/components/code-button/code-button.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input, OnChanges, OnInit } from '@angular/core';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { ExternalCloningService } from 'app/exercises/programming/shared/service/external-cloning.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -11,6 +11,7 @@ import { LocalStorageService } from 'ngx-webstorage';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
 import { PROFILE_GITLAB, PROFILE_LOCALVC } from 'app/app.constants';
+import dayjs from 'dayjs/esm';
 import { isPracticeMode } from 'app/entities/participation/student-participation.model';
 import { faCode, faExternalLink } from '@fortawesome/free-solid-svg-icons';
 
@@ -26,6 +27,8 @@ export class CodeButtonComponent implements OnInit, OnChanges {
     @Input()
     loading = false;
     @Input()
+    useParticipationVcsAccessToken = false;
+    @Input()
     smallButtons: boolean;
     @Input()
     repositoryUri?: string;
@@ -38,15 +41,23 @@ export class CodeButtonComponent implements OnInit, OnChanges {
 
     useSsh = false;
     useToken = false;
-    setupSshKeysUrl?: string;
+    tokenExpired = false;
+    tokenMissing = false;
     sshEnabled = false;
     sshTemplateUrl?: string;
+    sshSettingsUrl?: string;
+    vcsTokenSettingsUrl?: string;
     repositoryPassword?: string;
     versionControlUrl: string;
-    useVersionControlAccessToken?: boolean;
+    accessTokensEnabled?: boolean;
     localVCEnabled = false;
     gitlabVCEnabled = false;
     showCloneUrlWithoutToken = true;
+    copyEnabled? = true;
+
+    sshKeyMissingTip: string;
+    tokenMissingTip: string;
+    tokenExpiredTip: string;
 
     user: User;
     cloneHeadline: string;
@@ -73,32 +84,47 @@ export class CodeButtonComponent implements OnInit, OnChanges {
             .identity()
             .then((user) => {
                 this.user = user!;
+                this.refreshTokenState();
+
+                this.copyEnabled = true;
+                this.useSsh = this.localStorage.retrieve('useSsh') || false;
+                this.useToken = this.localStorage.retrieve('useToken') || false;
+                this.localStorage.observe('useSsh').subscribe((useSsh) => (this.useSsh = useSsh || false));
+                this.localStorage.observe('useToken').subscribe((useToken) => (this.useToken = useToken || false));
+
+                if (this.useSsh) {
+                    this.useSshUrl();
+                }
+                if (this.useToken) {
+                    this.useHttpsUrlWithToken();
+                }
             })
-            .then(() => this.loadVcsAccessTokens());
+            .then(() => this.loadParticipationVcsAccessTokens());
 
         // Get ssh information from the user
         this.profileService.getProfileInfo().subscribe((profileInfo) => {
-            this.setupSshKeysUrl = profileInfo.sshKeysURL;
+            this.sshSettingsUrl = profileInfo.sshKeysURL;
             this.sshTemplateUrl = profileInfo.sshCloneURLTemplate;
 
             this.sshEnabled = !!this.sshTemplateUrl;
             if (profileInfo.versionControlUrl) {
                 this.versionControlUrl = profileInfo.versionControlUrl;
             }
-            this.useVersionControlAccessToken = profileInfo.useVersionControlAccessToken ?? false;
+            this.accessTokensEnabled = profileInfo.useVersionControlAccessToken ?? false;
             this.showCloneUrlWithoutToken = profileInfo.showCloneUrlWithoutToken ?? true;
             this.useToken = !this.showCloneUrlWithoutToken;
             this.localVCEnabled = profileInfo.activeProfiles.includes(PROFILE_LOCALVC);
             this.gitlabVCEnabled = profileInfo.activeProfiles.includes(PROFILE_GITLAB);
             if (this.localVCEnabled) {
-                this.setupSshKeysUrl = `${window.location.origin}/user-settings/sshSettings`;
+                this.sshSettingsUrl = `${window.location.origin}/user-settings/ssh`;
+                this.vcsTokenSettingsUrl = `${window.location.origin}/user-settings/vcs-token`;
+                this.tokenMissingTip = this.formatTip('artemisApp.exerciseActions.vcsTokenTip', this.vcsTokenSettingsUrl);
+                this.tokenExpiredTip = this.formatTip('artemisApp.exerciseActions.vcsTokenExpiredTip', this.vcsTokenSettingsUrl);
             } else {
-                this.setupSshKeysUrl = profileInfo.sshKeysURL;
+                this.sshSettingsUrl = profileInfo.sshKeysURL;
             }
+            this.sshKeyMissingTip = this.formatTip('artemisApp.exerciseActions.sshKeyTip', this.sshSettingsUrl);
         });
-
-        this.useSsh = this.localStorage.retrieve('useSsh') || false;
-        this.localStorage.observe('useSsh').subscribe((useSsh) => (this.useSsh = useSsh || false));
     }
 
     ngOnChanges() {
@@ -112,25 +138,47 @@ export class CodeButtonComponent implements OnInit, OnChanges {
         } else if (this.repositoryUri) {
             this.cloneHeadline = 'artemisApp.exerciseActions.cloneExerciseRepository';
         }
-        this.loadVcsAccessTokens();
+        this.loadParticipationVcsAccessTokens();
     }
 
     public useSshUrl() {
         this.useSsh = true;
         this.useToken = false;
-        this.localStorage.store('useSsh', this.useSsh);
+        this.copyEnabled = this.useSsh && (!!this.user.sshPublicKey || this.gitlabVCEnabled);
+        this.storeToLocalStorage();
     }
 
     public useHttpsUrlWithToken() {
         this.useSsh = false;
         this.useToken = true;
-        this.localStorage.store('useSsh', this.useSsh);
+        this.copyEnabled = !!(this.accessTokensEnabled && this.useToken && ((!!this.user.vcsAccessToken && !this.isTokenExpired()) || this.useParticipationVcsAccessToken));
+        this.refreshTokenState();
+        this.storeToLocalStorage();
     }
 
     public useHttpsUrlWithoutToken() {
         this.useSsh = false;
         this.useToken = false;
+        this.copyEnabled = true;
+        this.storeToLocalStorage();
+    }
+
+    public storeToLocalStorage() {
         this.localStorage.store('useSsh', this.useSsh);
+        this.localStorage.store('useToken', this.useToken);
+    }
+
+    public refreshTokenState() {
+        this.tokenMissing = !this.user.vcsAccessToken;
+        this.tokenExpired = this.isTokenExpired();
+    }
+
+    public formatTip(translationKey: string, url: string): string {
+        return this.translateService.instant(translationKey).replace(/{link:(.*)}/, `<a href="${url}" target="_blank">$1</a>`);
+    }
+
+    public isTokenExpired(): boolean {
+        return dayjs().isAfter(dayjs(this.user.vcsAccessTokenExpiryDate));
     }
 
     private getRepositoryUri() {
@@ -147,8 +195,8 @@ export class CodeButtonComponent implements OnInit, OnChanges {
         return this.addCredentialsToHttpUrl(this.getRepositoryUri(), insertPlaceholder);
     }
 
-    loadVcsAccessTokens() {
-        if (this.useVersionControlAccessToken && this.localVCEnabled) {
+    loadParticipationVcsAccessTokens() {
+        if (this.accessTokensEnabled && this.localVCEnabled && this.useParticipationVcsAccessToken) {
             this.participations?.forEach((participation) => {
                 if (participation?.id && !participation.vcsAccessToken) {
                     this.loadVcsAccessToken(participation);
@@ -208,7 +256,7 @@ export class CodeButtonComponent implements OnInit, OnChanges {
      * @param insertPlaceholder if true, instead of the actual token, '**********' is used (e.g. to prevent leaking the token during a screen-share)
      */
     private addCredentialsToHttpUrl(url: string, insertPlaceholder = false): string {
-        const includeToken = this.useVersionControlAccessToken && this.user.vcsAccessToken && this.useToken;
+        const includeToken = this.accessTokensEnabled && this.user.vcsAccessToken && this.useToken;
         const token = insertPlaceholder ? '**********' : this.user.vcsAccessToken;
         const credentials = `://${this.user.login}${includeToken ? `:${token}` : ''}@`;
         if (!url.includes('@')) {
@@ -244,13 +292,6 @@ export class CodeButtonComponent implements OnInit, OnChanges {
         return url?.replace(/^\w*:\/\/[^/]*?\/(scm\/)?(.*)$/, this.sshTemplateUrl + '$2');
     }
 
-    /**
-     * Inserts the correct link to the translated ssh tip.
-     */
-    getSshKeyTip() {
-        return this.translateService.instant('artemisApp.exerciseActions.sshKeyTip').replace(/{link:(.*)}/, '<a href="' + this.setupSshKeysUrl + '" target="_blank">$1</a>');
-    }
-
     /**
      * set wasCopied for 3 seconds on success
      */
diff --git a/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts b/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts
index f15e7b2971d7..a26b939ed089 100644
--- a/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts
+++ b/src/main/webapp/app/shared/components/course-exam-archive-button/course-exam-archive-button.component.ts
@@ -7,7 +7,7 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { tap } from 'rxjs/operators';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { ButtonSize } from '../button.component';
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
diff --git a/src/main/webapp/app/shared/components/not-released-tag.component.html b/src/main/webapp/app/shared/components/not-released-tag.component.html
index c9aca3c9a85e..3a2f4c880ba1 100644
--- a/src/main/webapp/app/shared/components/not-released-tag.component.html
+++ b/src/main/webapp/app/shared/components/not-released-tag.component.html
@@ -4,7 +4,6 @@
         [class.ms-1]="!noMargin"
         container="body"
         ngbTooltip="{{ 'artemisApp.courseOverview.exerciseList.notReleasedTooltip' | artemisTranslate }}{{ exercise.releaseDate | artemisDate }}"
-    >
-        {{ 'artemisApp.courseOverview.exerciseList.notReleased' | artemisTranslate }}
-    </span>
+        jhiTranslate="artemisApp.courseOverview.exerciseList.notReleased"
+    ></span>
 }
diff --git a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html
index f588a174193f..ce94f86bca0c 100644
--- a/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html
+++ b/src/main/webapp/app/shared/components/open-code-editor-button/open-code-editor-button.component.html
@@ -32,9 +32,7 @@
         @if (participations && participations.length > 1) {
             <div class="form-check form-switch">
                 <input id="switchPracticeMode" mdbCheckbox class="form-check-input" type="checkbox" [checked]="isPracticeMode" (click)="switchPracticeMode()" />
-                <label for="switchPracticeMode" class="form-check-label">
-                    {{ 'artemisApp.exerciseActions.practiceMode.title' | artemisTranslate }}
-                </label>
+                <label for="switchPracticeMode" class="form-check-label" jhiTranslate="artemisApp.exerciseActions.practiceMode.title"></label>
             </div>
         }
         <button
diff --git a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html
index f70e5158a5b2..2b3c74b73d7e 100644
--- a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html
+++ b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.html
@@ -21,12 +21,12 @@
     <ng-template #popContent>
         <form style="max-width: 660px" #resetForm="ngForm">
             <h5>{{ 'artemisApp.exerciseActions.resetRepository.title' + (practiceParticipation ? 'Practice' : 'Graded') | artemisTranslate }}</h5>
-            <p>{{ 'artemisApp.exerciseActions.resetRepository.explanation' | artemisTranslate }}</p>
+            <p jhiTranslate="artemisApp.exerciseActions.resetRepository.explanation"></p>
             @if (exercise.allowOfflineIde) {
-                <p>{{ 'artemisApp.exerciseActions.resetRepository.offlineIDEExplanation' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.exerciseActions.resetRepository.offlineIDEExplanation"></p>
             }
             @if (gradedParticipation && practiceParticipation) {
-                <p>{{ 'artemisApp.exerciseActions.resetRepository.repositoryChoice' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.exerciseActions.resetRepository.repositoryChoice"></p>
             }
             <p
                 [jhiTranslate]="'artemisApp.exerciseActions.resetRepository.question' + (practiceParticipation ? 'Practice' : 'Graded')"
diff --git a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts
index c939dad8cb00..07f7b5f7ca94 100644
--- a/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts
+++ b/src/main/webapp/app/shared/components/reset-repo-button/reset-repo-button.component.ts
@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { faBackward } from '@fortawesome/free-solid-svg-icons';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { InitializationState } from 'app/entities/participation/participation.model';
@@ -29,8 +29,7 @@ export class ResetRepoButtonComponent implements OnInit {
 
     beforeIndividualDueDate: boolean;
 
-    // Icons
-    faBackward = faBackward;
+    readonly faBackward = faBackward;
 
     constructor(
         private participationService: ParticipationService,
diff --git a/src/main/webapp/app/shared/components/shared-component.module.ts b/src/main/webapp/app/shared/components/shared-component.module.ts
index a12237b224e7..090ebcf99f3d 100644
--- a/src/main/webapp/app/shared/components/shared-component.module.ts
+++ b/src/main/webapp/app/shared/components/shared-component.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component';
+import { ChecklistCheckComponent } from 'app/shared/components/checklist-check/checklist-check.component';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { FeatureToggleModule } from 'app/shared/feature-toggle/feature-toggle.module';
 import { ConfirmAutofocusModalComponent } from 'app/shared/components/confirm-autofocus-modal.component';
diff --git a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.html b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.html
index 0530c1d14972..928499601975 100644
--- a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.html
+++ b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.html
@@ -14,10 +14,10 @@
     ></button>
     <ng-template #popContent>
         <div class="start-practice-popover">
-            <h5>{{ 'artemisApp.exerciseActions.practiceMode.title' | artemisTranslate }}</h5>
-            <p>{{ 'artemisApp.exerciseActions.practiceMode.explanation' | artemisTranslate }}</p>
+            <h5 jhiTranslate="artemisApp.exerciseActions.practiceMode.title"></h5>
+            <p jhiTranslate="artemisApp.exerciseActions.practiceMode.explanation"></p>
             @if (gradedStudentParticipation) {
-                <p>{{ 'artemisApp.exerciseActions.practiceMode.repositoryChoice' | artemisTranslate }}</p>
+                <p jhiTranslate="artemisApp.exerciseActions.practiceMode.repositoryChoice"></p>
             }
             <div class="button-footer">
                 <button
diff --git a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts
index 3541ca8f141a..2601765baf68 100644
--- a/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts
+++ b/src/main/webapp/app/shared/components/start-practice-mode-button/start-practice-mode-button.component.ts
@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
 import { finalize } from 'rxjs/operators';
 import { faRedo } from '@fortawesome/free-solid-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
diff --git a/src/main/webapp/app/shared/connection-warning/connection-warning.component.html b/src/main/webapp/app/shared/connection-warning/connection-warning.component.html
index ed662079efc4..bdb109ffdfc7 100644
--- a/src/main/webapp/app/shared/connection-warning/connection-warning.component.html
+++ b/src/main/webapp/app/shared/connection-warning/connection-warning.component.html
@@ -1,8 +1,6 @@
 <ng-template #popContent class="connection-warning-popover">
     <fa-icon [icon]="faExclamationCircle" size="2x" />
-    <div>
-        {{ 'artemisApp.disconnectedAlert' | artemisTranslate }}
-    </div>
+    <div jhiTranslate="artemisApp.disconnectedAlert"></div>
     <jhi-close-circle (click)="popover.close()" />
 </ng-template>
 <div
diff --git a/src/main/webapp/app/shared/consistency-check/consistency-check.component.html b/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
index cda7d564e238..4db68ba0986e 100644
--- a/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
+++ b/src/main/webapp/app/shared/consistency-check/consistency-check.component.html
@@ -11,7 +11,7 @@ <h4 class="modal-title" jhiTranslate="artemisApp.consistencyCheck.title"></h4>
             @if (isLoading) {
                 <div class="d-flex justify-content-center m-5">
                     <div class="spinner-border" role="status">
-                        <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+                        <span class="sr-only" jhiTranslate="loading"></span>
                     </div>
                 </div>
             } @else {
diff --git a/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts b/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts
index 0383adf0244e..cfa9cf0ee405 100644
--- a/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts
+++ b/src/main/webapp/app/shared/consistency-check/consistency-check.component.ts
@@ -3,7 +3,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { ConsistencyCheckService } from 'app/shared/consistency-check/consistency-check.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { ConsistencyCheckError } from 'app/entities/consistency-check-result.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { getCourseId } from 'app/entities/exercise.model';
 import { faCheck, faTimes } from '@fortawesome/free-solid-svg-icons';
 
diff --git a/src/main/webapp/app/shared/course-group/course-group.component.scss b/src/main/webapp/app/shared/course-group/course-group.component.scss
index adae3ffdf4b9..28fbff8cc69c 100644
--- a/src/main/webapp/app/shared/course-group/course-group.component.scss
+++ b/src/main/webapp/app/shared/course-group/course-group.component.scss
@@ -47,16 +47,16 @@ jhi-course-group {
         &.newly-added-member {
             $vars: map-get($datatable-row, newly-added-member);
 
+            animation-name: flash-animation;
+            animation-delay: map-get($vars, animation-delay);
+            animation-duration: map-get($vars, animation-duration);
+            animation-timing-function: ease-out;
+
             @keyframes flash-animation {
                 30% {
                     background-color: map-get($vars, background-color);
                 }
             }
-
-            animation-name: flash-animation;
-            animation-delay: map-get($vars, animation-delay);
-            animation-duration: map-get($vars, animation-duration);
-            animation-timing-function: ease-out;
         }
     }
 }
diff --git a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
index ed2531800f65..78e11295962c 100644
--- a/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
+++ b/src/main/webapp/app/shared/course-users-selector/course-users-selector.component.html
@@ -20,28 +20,28 @@
             #instance="ngbTypeahead"
         />
         @if (isSearching) {
-            <small class="form-text text-body-secondary">{{ 'artemisApp.userSelector.searchingText' | artemisTranslate }}</small>
+            <small class="form-text text-body-secondary" jhiTranslate="artemisApp.userSelector.searchingText"></small>
             <br />
         }
         @if (searchFailed) {
-            <small>{{ 'artemisApp.userSelector.searchFailedText' | artemisTranslate }}</small>
+            <small jhiTranslate="artemisApp.userSelector.searchFailedText"></small>
             <br />
         }
         @if (searchStudents) {
-            <small class="form-text text-body-secondary">{{ 'artemisApp.userSelector.helpText' | artemisTranslate }}</small>
+            <small class="form-text text-body-secondary" jhiTranslate="artemisApp.userSelector.helpText"></small>
         }
     </div>
     <div class="text-end">
         @if (rolesToAllowSearchingIn.includes('students')) {
             <div class="form-check form-check-inline">
                 <input type="checkbox" class="form-check-input" id="students" [checked]="searchStudents" (change)="searchStudents = !searchStudents; onFilterChange()" />
-                <label class="form-check-label" for="students">{{ 'artemisApp.course.students' | artemisTranslate }}</label>
+                <label class="form-check-label" for="students" jhiTranslate="artemisApp.course.students"></label>
             </div>
         }
         @if (rolesToAllowSearchingIn.includes('tutors')) {
             <div class="form-check form-check-inline">
                 <input type="checkbox" class="form-check-input" id="tutors" [checked]="searchTutors" (change)="searchTutors = !searchTutors; onFilterChange()" />
-                <label class="form-check-label" for="tutors">{{ 'artemisApp.course.tutors' | artemisTranslate }}</label>
+                <label class="form-check-label" for="tutors" jhiTranslate="artemisApp.course.tutors"></label>
             </div>
         }
         @if (rolesToAllowSearchingIn.includes('instructors')) {
@@ -53,7 +53,7 @@
                     [checked]="searchInstructors"
                     (change)="searchInstructors = !searchInstructors; onFilterChange()"
                 />
-                <label class="form-check-label" for="instructors">{{ 'artemisApp.course.instructors' | artemisTranslate }}</label>
+                <label class="form-check-label" for="instructors" jhiTranslate="artemisApp.course.instructors"></label>
             </div>
         }
     </div>
diff --git a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html
index c914924f30b2..28b4b692e1e5 100644
--- a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html
+++ b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.html
@@ -4,43 +4,43 @@
             <tr jhiSort [(predicate)]="sortPredicate" [(ascending)]="reverseOrder" (sortChange)="sortRows()">
                 <th>#</th>
                 <th jhiSortBy="name">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.name' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.name"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="points">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.points' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.points"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="numberOfAssessments">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAssessments' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAssessments"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="numberOfAcceptedComplaints">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAcceptedComplaints' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAcceptedComplaints"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 @if (!isExamMode) {
                     <th jhiSortBy="numberOfNotAnsweredMoreFeedbackRequests">
-                        <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfNotAnsweredMoreFeedbackRequests' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.numberOfNotAnsweredMoreFeedbackRequests"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 <th jhiSortBy="numberOfComplaintResponses">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfComplaintResponses' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.numberOfComplaintResponses"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 @if (!isExamMode) {
                     <th jhiSortBy="numberOfAnsweredMoreFeedbackRequests">
-                        <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAnsweredMoreFeedbackRequests' | artemisTranslate }}</a>
+                        <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.numberOfAnsweredMoreFeedbackRequests"></a>
                         <fa-icon [icon]="faSort" />
                     </th>
                 }
                 <th jhiSortBy="averageScore">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageScore' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.averageScore"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
                 <th jhiSortBy="averageRating">
-                    <a class="th-link">{{ 'artemisApp.assessmentDashboard.tutorLeaderboard.averageRating' | artemisTranslate }}</a>
+                    <a class="th-link" jhiTranslate="artemisApp.assessmentDashboard.tutorLeaderboard.averageRating"></a>
                     <fa-icon [icon]="faSort" />
                 </th>
             </tr>
diff --git a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts
index 48c99e458d89..da1cc727af85 100644
--- a/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts
+++ b/src/main/webapp/app/shared/dashboards/tutor-leaderboard/tutor-leaderboard.component.ts
@@ -4,7 +4,7 @@ import { Course } from 'app/entities/course.model';
 import { Exercise, getCourseFromExercise } from 'app/entities/exercise.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { SortService } from 'app/shared/service/sort.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { faExclamationTriangle, faSort } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
diff --git a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss
index d43b31093543..7e472d33e2e3 100644
--- a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss
+++ b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.scss
@@ -91,6 +91,9 @@ jhi-tutor-participation-graph {
         margin-bottom: 1rem;
 
         .stacked-item {
+            margin-top: 0.5em;
+            position: relative;
+
             &:first-child {
                 margin-top: 0;
 
@@ -104,9 +107,6 @@ jhi-tutor-participation-graph {
                 }
             }
 
-            margin-top: 0.5em;
-            position: relative;
-
             &::before,
             &::after {
                 content: '';
diff --git a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts
index d3b2fb105efa..e1da8a6b0498 100644
--- a/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts
+++ b/src/main/webapp/app/shared/dashboards/tutor-participation-graph/tutor-participation-graph.component.ts
@@ -4,7 +4,7 @@ import { get } from 'lodash-es';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { TutorParticipation, TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { faBook, faChalkboardTeacher } from '@fortawesome/free-solid-svg-icons';
 
 @Component({
diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html
index 075a103d96c8..b1983a2ef7d2 100644
--- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html
+++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.html
@@ -41,7 +41,7 @@
     <owl-date-time [startAt]="startDate" #dt />
 </div>
 @if (dateInput.invalid || (requiredField && !dateInput.value)) {
-    <div class="invalid-feedback">{{ 'entity.dateMissingOrNotValid' | artemisTranslate: { labelName: labelName } }}</div>
+    <div class="invalid-feedback" jhiTranslate="entity.dateMissingOrNotValid" [translateValues]="{ labelName: labelName }"></div>
 }
 @if (warning) {
     <div class="invalid-feedback">
diff --git a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts
index 320817cfedc0..58196f94f02d 100644
--- a/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts
+++ b/src/main/webapp/app/shared/date-time-picker/date-time-picker.component.ts
@@ -24,18 +24,17 @@ export class FormDateTimePickerComponent implements ControlValueAccessor {
     @Input() error: boolean;
     @Input() warning: boolean;
     @Input() requiredField: boolean = false;
-    @Input() startAt?: dayjs.Dayjs; // Default selected date. By default this sets it to the current time without seconds or milliseconds;
+    @Input() startAt?: dayjs.Dayjs; // Default selected date. By default, this sets it to the current time without seconds or milliseconds;
     @Input() min?: dayjs.Dayjs; // Dates before this date are not selectable.
     @Input() max?: dayjs.Dayjs; // Dates after this date are not selectable.
     @Input() shouldDisplayTimeZoneWarning = true; // Displays a warning that the current time zone might differ from the participants'.
     @Output() valueChange = new EventEmitter();
 
-    // Icons
-    faCalendarAlt = faCalendarAlt;
-    faGlobe = faGlobe;
-    faClock = faClock;
-    faQuestionCircle = faQuestionCircle;
-    faCircleXmark = faCircleXmark;
+    readonly faCalendarAlt = faCalendarAlt;
+    readonly faGlobe = faGlobe;
+    readonly faClock = faClock;
+    readonly faQuestionCircle = faQuestionCircle;
+    readonly faCircleXmark = faCircleXmark;
     readonly faTriangleExclamation = faTriangleExclamation;
 
     private onChange?: (val?: dayjs.Dayjs) => void;
diff --git a/src/main/webapp/app/shared/detail-overview-navigation-bar/detail-overview-navigation-bar.component.ts b/src/main/webapp/app/shared/detail-overview-navigation-bar/detail-overview-navigation-bar.component.ts
index 78d79942cada..e9eb25918015 100644
--- a/src/main/webapp/app/shared/detail-overview-navigation-bar/detail-overview-navigation-bar.component.ts
+++ b/src/main/webapp/app/shared/detail-overview-navigation-bar/detail-overview-navigation-bar.component.ts
@@ -1,4 +1,5 @@
 import { AfterViewInit, Component, HostListener, Input } from '@angular/core';
+import { updateHeaderHeight } from 'app/shared/util/navbar.util';
 
 @Component({
     selector: 'jhi-detail-overview-navigation-bar',
@@ -10,15 +11,12 @@ export class DetailOverviewNavigationBarComponent implements AfterViewInit {
     sectionHeadlines: { id: string; translationKey: string }[];
 
     @HostListener('window:resize')
-    onResize() {
-        setTimeout(() => {
-            const headerHeight = (document.querySelector('jhi-navbar') as HTMLElement).offsetHeight;
-            document.documentElement.style.setProperty('--header-height', `${headerHeight - 2}px`);
-        });
+    onResizeAddDistanceFromStatusBarToNavbar() {
+        updateHeaderHeight();
     }
 
     ngAfterViewInit() {
-        this.onResize();
+        this.onResizeAddDistanceFromStatusBarToNavbar();
     }
 
     scrollToView(id: string) {
diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html
new file mode 100644
index 000000000000..eec73d5844e4
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.html
@@ -0,0 +1,10 @@
+<h4 class="fw-medium">
+    <div class="badge me-1" [ngStyle]="{ backgroundColor: category.color }" [ngClass]="'category-' + fontSize">
+        {{ category.category }}
+        @if (displayRemoveButton) {
+            <button class="remove-button" (click)="onClick()">
+                <fa-icon [icon]="faTimes" class="category-chip-remove" />
+            </button>
+        }
+    </div>
+</h4>
diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss
new file mode 100644
index 000000000000..43a2d70cca34
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.scss
@@ -0,0 +1,18 @@
+.remove-button {
+    color: var(--white);
+    background: transparent !important;
+    border: none !important;
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+
+/** category options should be consistent with the type CategoryFontSize */
+.category-small {
+    font-size: 0.85rem;
+}
+
+.category-default {
+    font-size: 1rem;
+}
diff --git a/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts
new file mode 100644
index 000000000000..8ba41f96ba8b
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component.ts
@@ -0,0 +1,23 @@
+import { Component, Input } from '@angular/core';
+import type { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { CommonModule } from '@angular/common';
+import { faTimes } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+
+type CategoryFontSize = 'default' | 'small';
+
+@Component({
+    selector: 'jhi-custom-exercise-category-badge',
+    templateUrl: './custom-exercise-category-badge.component.html',
+    styleUrls: ['custom-exercise-category-badge.component.scss'],
+    standalone: true,
+    imports: [CommonModule, FontAwesomeModule],
+})
+export class CustomExerciseCategoryBadgeComponent {
+    protected readonly faTimes = faTimes;
+
+    @Input({ required: true }) category: ExerciseCategory;
+    @Input() displayRemoveButton: boolean = false;
+    @Input() onClick: () => void = () => {};
+    @Input() fontSize: CategoryFontSize = 'default';
+}
diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html
index b78d7f984ae9..f811a3f4c4e7 100644
--- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html
+++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.component.html
@@ -7,13 +7,11 @@ <h4 class="fw-medium">
 }
 @if (asQuizExercise(exercise).isActiveQuiz && showTags.quizLive) {
     <h4 class="fw-medium">
-        <span class="badge bg-success">{{ 'artemisApp.courseOverview.exerciseList.live' | artemisTranslate }}</span>
+        <span class="badge bg-success" jhiTranslate="artemisApp.courseOverview.exerciseList.live"></span>
     </h4>
 }
 @for (category of exercise.categories; track category) {
-    <h4 class="fw-medium">
-        <span class="badge" [ngStyle]="{ backgroundColor: category.color }">{{ category.category }}</span>
-    </h4>
+    <jhi-custom-exercise-category-badge [category]="category" />
 }
 @if (exercise.difficulty && showTags.difficulty) {
     <h4 class="fw-medium">
diff --git a/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts b/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts
index f56611d32021..f0f8877ffdec 100644
--- a/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts
+++ b/src/main/webapp/app/shared/exercise-categories/exercise-categories.module.ts
@@ -3,9 +3,10 @@ import { RouterModule } from '@angular/router';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { ExerciseCategoriesComponent } from 'app/shared/exercise-categories/exercise-categories.component';
+import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component';
 
 @NgModule({
-    imports: [ArtemisSharedModule, RouterModule, ArtemisSharedComponentModule],
+    imports: [ArtemisSharedModule, RouterModule, ArtemisSharedComponentModule, CustomExerciseCategoryBadgeComponent],
     declarations: [ExerciseCategoriesComponent],
     exports: [ExerciseCategoriesComponent],
 })
diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html
new file mode 100644
index 000000000000..1a87237a4d46
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.html
@@ -0,0 +1,145 @@
+<form name="exerciseFilterForm" (ngSubmit)="applyFilter()">
+    <div class="modal-header">
+        <h4 class="modal-title">
+            <fa-icon [icon]="faFilter" />
+            <span jhiTranslate="artemisApp.courseOverview.exerciseFilter.modalTitle"></span>
+        </h4>
+        <button type="button" class="btn-close" (click)="closeModal()"></button>
+    </div>
+    <div class="modal-body">
+        <div class="form-group">
+            @if (noFiltersAvailable) {
+                <div>
+                    <span jhiTranslate="artemisApp.courseOverview.exerciseFilter.noFilterAvailable"></span>
+                </div>
+            }
+
+            @if (selectableCategoryOptions.length || selectedCategoryOptions.length) {
+                <label for="exercise-categories-filter-selection" class="form-control-label h6" jhiTranslate="artemisApp.exercise.categories"></label>
+
+                <input
+                    id="exercise-categories-filter-selection"
+                    type="text"
+                    class="form-control mb-2"
+                    name="category-filter-selection"
+                    [(ngModel)]="model"
+                    [ngbTypeahead]="search"
+                    [placeholder]="
+                        (!selectableCategoryOptions.length ? 'artemisApp.courseOverview.exerciseFilter.noMoreOptions' : 'artemisApp.exercise.selectCategories') | artemisTranslate
+                    "
+                    (focus)="focus$.next($any($event).target.value)"
+                    (click)="click$.next($any($event).target.value)"
+                    #categoriesFilterSelection="ngbTypeahead"
+                    (selectItem)="onSelectItem($event)"
+                    [resultFormatter]="resultFormatter"
+                    (keydown.enter)="onSelectItem($event)"
+                    [disabled]="!selectableCategoryOptions.length"
+                />
+
+                <div class="row">
+                    <div class="d-flex flex-row flex-wrap">
+                        @for (categoryFilterOption of selectedCategoryOptions; track categoryFilterOption) {
+                            <div class="p-1">
+                                <jhi-custom-exercise-category-badge
+                                    [category]="categoryFilterOption.category"
+                                    [displayRemoveButton]="true"
+                                    [onClick]="removeItem(categoryFilterOption)"
+                                    [fontSize]="'small'"
+                                />
+                            </div>
+                        }
+                    </div>
+                </div>
+            }
+        </div>
+
+        @if (typeFilter?.isDisplayed) {
+            <div class="form-group">
+                <label for="exercise-type-filter-selection" class="form-control-label h6" jhiTranslate="artemisApp.ratingList.exerciseType"></label>
+                <div id="exercise-type-filter-selection">
+                    @for (typeFilter of typeFilter!.options; track typeFilter) {
+                        <div class="form-check form-check-inline no-left-margin-padding">
+                            <label class="pointer">
+                                <input type="checkbox" [(ngModel)]="typeFilter.checked" [name]="typeFilter.value" class="pointer" />
+                                <fa-icon [icon]="typeFilter.icon" class="ms-2" />
+                                <span [jhiTranslate]="typeFilter.name" class="ms-1"></span>
+                            </label>
+                        </div>
+                    }
+                </div>
+            </div>
+        }
+
+        <!--        <div class="form-group">-->
+        <!--            <label class="form-control-label h6" jhiTranslate="artemisApp.courseOverview.exerciseFilter.dueDateRange"> </label>-->
+        <!--            TODO: Implement Date Range Picker (follow up PR @FlorianGlombik)-->
+        <!--        </div>-->
+
+        <!--    On typescript version 5.5.4 the explicit check for difficultyFilter is needed,
+        as otherwise typescript thinks it could be undefined in the loop (the client would not start in this case) -->
+        @if (difficultyFilter?.isDisplayed && difficultyFilter) {
+            <div class="form-group">
+                <label for="difficulty-filter-selection" class="form-control-label h6" jhiTranslate="artemisApp.exercise.difficulty"></label>
+                <div id="difficulty-filter-selection">
+                    @for (difficultyFilterOption of difficultyFilter.options; track difficultyFilterOption) {
+                        <div class="form-check form-check-inline no-left-margin-padding">
+                            <label class="pointer">
+                                <input type="checkbox" [(ngModel)]="difficultyFilterOption.checked" [name]="difficultyFilterOption.value" class="pointer" />
+                                <span [jhiTranslate]="difficultyFilterOption.name" class="ms-1"></span>
+                            </label>
+                        </div>
+                    }
+                </div>
+            </div>
+        }
+
+        <!--    On typescript version 5.5.4 the explicit check for achievedScore is needed,
+        as otherwise typescript thinks achievedScore could be undefined (the client would not start in this case) -->
+        @if (achievedScore && achievedScore?.isDisplayed) {
+            <div class="form-group">
+                <label class="form-control-label h6" for="achieved-score-range-slider" jhiTranslate="artemisApp.courseOverview.exerciseFilter.achievedScore"></label>
+                <jhi-range-slider
+                    id="achieved-score-range-slider"
+                    [generalMinValue]="achievedScore.filter.generalMin"
+                    [generalMaxValue]="achievedScore.filter.generalMax"
+                    [(selectedMinValue)]="achievedScore.filter.selectedMin"
+                    [(selectedMaxValue)]="achievedScore.filter.selectedMax"
+                    [step]="achievedScore.filter.step"
+                    [labelSymbol]="'%'"
+                />
+            </div>
+        }
+
+        <!--    On typescript version 5.5.4 the explicit check for achievablePoints is needed,
+        as otherwise typescript thinks achievablePoints could be undefined (the client would not start in this case) -->
+        @if (achievablePoints && achievablePoints.isDisplayed) {
+            <div class="form-group">
+                <label class="form-control-label h6" for="achieved-points-range-slider" jhiTranslate="artemisApp.courseOverview.exerciseFilter.achievablePoints"></label>
+                <jhi-range-slider
+                    id="achieved-points-range-slider"
+                    [generalMinValue]="achievablePoints.filter.generalMin"
+                    [generalMaxValue]="achievablePoints.filter.generalMax"
+                    [(selectedMinValue)]="achievablePoints.filter.selectedMin"
+                    [(selectedMaxValue)]="achievablePoints.filter.selectedMax"
+                    [step]="achievablePoints.filter.step"
+                />
+            </div>
+        }
+    </div>
+    <div class="modal-footer">
+        <button type="button" class="btn btn-outline-secondary" (click)="clearFilter()">
+            <span jhiTranslate="artemisApp.courseOverview.exerciseFilter.clearFilter"></span>
+        </button>
+
+        <div class="ms-auto">
+            <button type="button" class="btn btn-secondary" (click)="closeModal()" jhiTranslate="entity.action.cancel" aria-label="Close"></button>
+            <button
+                type="button"
+                class="btn btn-primary"
+                (click)="applyFilter()"
+                jhiTranslate="artemisApp.courseOverview.exerciseFilter.applyFilter"
+                [disabled]="noFiltersAvailable"
+            ></button>
+        </div>
+    </div>
+</form>
diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss
new file mode 100644
index 000000000000..c2db4383039b
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.scss
@@ -0,0 +1,20 @@
+/*
+ensures that the category dropdown selection does not overflow the screen to the bottom
+(instead a scrollbar will be displayed)
+ */
+:host ::ng-deep ngb-typeahead-window.dropdown-menu {
+    max-height: 25rem;
+    overflow-y: auto;
+}
+
+/* align the first checkbox to the left */
+.no-left-margin-padding:first-child {
+    margin-left: 0;
+    padding-left: 0;
+}
+
+/* otherwise the dropdown changes the color on hover if no further options can be selected */
+.form-control:disabled,
+.form-control[disabled] {
+    pointer-events: none;
+}
diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts
new file mode 100644
index 000000000000..8b1bf7c58488
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.component.ts
@@ -0,0 +1,231 @@
+import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core';
+import { NgbActiveModal, NgbTypeahead } from '@ng-bootstrap/ng-bootstrap';
+import { faBackward, faFilter } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { SidebarCardElement, SidebarData } from 'app/types/sidebar';
+import { Observable, OperatorFunction, Subject, merge } from 'rxjs';
+import { debounceTime, distinctUntilChanged, filter, map } from 'rxjs/operators';
+import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component';
+import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component';
+import {
+    DifficultyFilterOption,
+    ExerciseCategoryFilterOption,
+    ExerciseFilterOptions,
+    ExerciseFilterResults,
+    ExerciseTypeFilterOption,
+    FilterDetails,
+    FilterOption,
+    RangeFilter,
+} from 'app/types/exercise-filter';
+import { satisfiesFilters } from 'app/shared/exercise-filter/exercise-filter-modal.helper';
+import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { isRangeFilterApplied } from 'app/shared/sidebar/sidebar.helper';
+
+@Component({
+    selector: 'jhi-exercise-filter-modal',
+    templateUrl: './exercise-filter-modal.component.html',
+    styleUrls: ['./exercise-filter-modal.component.scss'],
+    standalone: true,
+    imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        FontAwesomeModule,
+        ArtemisSharedCommonModule,
+        ArtemisSharedComponentModule,
+        CustomExerciseCategoryBadgeComponent,
+        RangeSliderComponent,
+    ],
+})
+export class ExerciseFilterModalComponent implements OnInit {
+    readonly faFilter = faFilter;
+    readonly faBackward = faBackward;
+
+    @Output() filterApplied = new EventEmitter<ExerciseFilterResults>();
+
+    @ViewChild('categoriesFilterSelection', { static: false }) instance: NgbTypeahead;
+
+    selectedCategoryOptions: ExerciseCategoryFilterOption[] = [];
+    selectableCategoryOptions: ExerciseCategoryFilterOption[] = [];
+
+    noFiltersAvailable: boolean = false;
+
+    focus$ = new Subject<string>();
+    click$ = new Subject<string>();
+
+    form: FormGroup;
+
+    model?: string;
+
+    sidebarData?: SidebarData;
+
+    categoryFilter?: FilterOption<ExerciseCategoryFilterOption>;
+    typeFilter?: FilterOption<ExerciseTypeFilterOption>;
+    difficultyFilter?: FilterOption<DifficultyFilterOption>;
+    achievablePoints?: RangeFilter;
+    achievedScore?: RangeFilter;
+
+    exerciseFilters?: ExerciseFilterOptions;
+
+    constructor(private activeModal: NgbActiveModal) {}
+
+    ngOnInit() {
+        this.categoryFilter = this.exerciseFilters?.categoryFilter;
+        this.typeFilter = this.exerciseFilters?.exerciseTypesFilter;
+        this.difficultyFilter = this.exerciseFilters?.difficultyFilter;
+        this.achievablePoints = this.exerciseFilters?.achievablePoints;
+        this.achievedScore = this.exerciseFilters?.achievedScore;
+
+        this.noFiltersAvailable = !(
+            this.categoryFilter?.isDisplayed ||
+            this.typeFilter?.isDisplayed ||
+            this.difficultyFilter?.isDisplayed ||
+            this.achievedScore?.isDisplayed ||
+            this.achievablePoints?.isDisplayed
+        );
+
+        this.updateCategoryOptionsStates();
+    }
+
+    closeModal(): void {
+        this.activeModal.close();
+    }
+
+    search: OperatorFunction<string, readonly ExerciseCategoryFilterOption[]> = (text$: Observable<string>) => {
+        const debouncedText$ = text$.pipe(debounceTime(200), distinctUntilChanged());
+        const clicksWithClosedPopup$ = this.click$.pipe(filter(() => !this.instance.isPopupOpen()));
+        const inputFocus$ = this.focus$;
+
+        return merge(debouncedText$, inputFocus$, clicksWithClosedPopup$).pipe(
+            map((term) =>
+                term === ''
+                    ? this.selectableCategoryOptions
+                    : this.selectableCategoryOptions.filter((categoryFilter: ExerciseCategoryFilterOption) => {
+                          if (categoryFilter.category.category !== undefined) {
+                              return categoryFilter.category.category?.toLowerCase().indexOf(term.toLowerCase()) > -1;
+                          }
+
+                          return false;
+                      }),
+            ),
+        );
+    };
+    resultFormatter = (exerciseCategory: ExerciseCategoryFilterOption) => exerciseCategory.category.category ?? '';
+
+    onSelectItem(event: any) {
+        const isEnterPressedForNotExistingItem = !event.item;
+        if (isEnterPressedForNotExistingItem) {
+            event.preventDefault();
+            event.stopPropagation();
+            return;
+        }
+
+        event.preventDefault(); // otherwise clearing the input field will not work https://stackoverflow.com/questions/39783936/how-to-clear-the-typeahead-input-after-a-result-is-selected
+        const filterOption: ExerciseCategoryFilterOption = event.item;
+        filterOption.searched = true;
+        this.updateCategoryOptionsStates();
+        this.model = undefined; // Clear the input field after selection
+    }
+
+    removeItem(item: ExerciseCategoryFilterOption): () => void {
+        return () => {
+            item.searched = false;
+            this.updateCategoryOptionsStates();
+        };
+    }
+
+    applyFilter(): void {
+        if (!this.sidebarData?.groupedData) {
+            return;
+        }
+
+        const appliedFilterDetails = this.getAppliedFilterDetails();
+        for (const groupedDataKey in this.sidebarData.groupedData) {
+            this.sidebarData.groupedData[groupedDataKey].entityData = this.sidebarData.groupedData[groupedDataKey].entityData.filter((sidebarElement) =>
+                satisfiesFilters(sidebarElement, appliedFilterDetails),
+            );
+        }
+        this.sidebarData.ungroupedData = this.sidebarData.ungroupedData?.filter((sidebarElement: SidebarCardElement) => satisfiesFilters(sidebarElement, appliedFilterDetails));
+
+        this.filterApplied.emit({
+            filteredSidebarData: this.sidebarData,
+            appliedExerciseFilters: this.exerciseFilters,
+            isFilterActive: this.isFilterActive(appliedFilterDetails),
+        });
+
+        this.closeModal();
+    }
+
+    private getAppliedFilterDetails(): FilterDetails {
+        return {
+            searchedTypes: this.getSearchedTypes(),
+            selectedCategories: this.getSelectedCategories(),
+            searchedDifficulties: this.getSearchedDifficulties(),
+            isScoreFilterApplied: isRangeFilterApplied(this.achievedScore),
+            isPointsFilterApplied: isRangeFilterApplied(this.achievablePoints),
+            achievedScore: this.achievedScore,
+            achievablePoints: this.achievablePoints,
+        };
+    }
+
+    private getSearchedTypes(): ExerciseType[] | undefined {
+        return this.typeFilter?.options.filter((type) => type.checked).map((type) => type.value);
+    }
+
+    private getSelectedCategories(): ExerciseCategory[] {
+        return this.selectedCategoryOptions
+            .filter((categoryOption: ExerciseCategoryFilterOption) => categoryOption.searched)
+            .map((categoryOption: ExerciseCategoryFilterOption) => categoryOption.category);
+    }
+
+    private getSearchedDifficulties(): DifficultyLevel[] | undefined {
+        return this.difficultyFilter?.options.filter((difficulty) => difficulty.checked).map((difficulty) => difficulty.value);
+    }
+
+    private isFilterActive(filterDetails: FilterDetails): boolean {
+        return (
+            !!filterDetails.selectedCategories.length ||
+            !!filterDetails.searchedTypes?.length ||
+            !!filterDetails.searchedDifficulties?.length ||
+            filterDetails.isScoreFilterApplied ||
+            filterDetails.isPointsFilterApplied
+        );
+    }
+
+    clearFilter() {
+        this.categoryFilter?.options.forEach((categoryOption) => (categoryOption.searched = false));
+        this.typeFilter?.options.forEach((typeOption) => (typeOption.checked = false));
+        this.difficultyFilter?.options.forEach((difficultyOption) => (difficultyOption.checked = false));
+
+        this.resetRangeFilter(this.achievedScore);
+        this.resetRangeFilter(this.achievablePoints);
+
+        this.applyFilter();
+    }
+
+    private resetRangeFilter(rangeFilter?: RangeFilter) {
+        if (!rangeFilter?.filter) {
+            return;
+        }
+
+        const filter = rangeFilter.filter;
+        filter.selectedMin = filter.generalMin;
+        filter.selectedMax = filter.generalMax;
+    }
+
+    private updateCategoryOptionsStates() {
+        this.selectedCategoryOptions = this.getUpdatedSelectedCategoryOptions();
+        this.selectableCategoryOptions = this.getSelectableCategoryOptions();
+    }
+
+    private getUpdatedSelectedCategoryOptions(): ExerciseCategoryFilterOption[] {
+        return this.categoryFilter?.options.filter((categoryFilter) => categoryFilter.searched) ?? [];
+    }
+
+    private getSelectableCategoryOptions(): ExerciseCategoryFilterOption[] {
+        return this.categoryFilter?.options.filter((categoryFilter) => !categoryFilter.searched) ?? [];
+    }
+}
diff --git a/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts
new file mode 100644
index 000000000000..de922fce195d
--- /dev/null
+++ b/src/main/webapp/app/shared/exercise-filter/exercise-filter-modal.helper.ts
@@ -0,0 +1,84 @@
+import { SidebarCardElement } from 'app/types/sidebar';
+import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { FilterDetails, RangeFilter } from 'app/types/exercise-filter';
+import { getLatestResultOfStudentParticipation } from 'app/exercises/shared/participation/participation.utils';
+
+export function satisfiesDifficultyFilter(sidebarElement: SidebarCardElement, searchedDifficulties?: DifficultyLevel[]): boolean {
+    if (!searchedDifficulties?.length) {
+        return true;
+    }
+    if (!sidebarElement.difficulty) {
+        return false;
+    }
+
+    return searchedDifficulties.includes(sidebarElement.difficulty);
+}
+
+export function satisfiesTypeFilter(sidebarElement: SidebarCardElement, searchedTypes?: ExerciseType[]): boolean {
+    if (!searchedTypes?.length) {
+        return true;
+    }
+    if (!sidebarElement.exercise?.type) {
+        return false;
+    }
+
+    return searchedTypes.includes(sidebarElement.exercise.type);
+}
+
+export function satisfiesCategoryFilter(sidebarElement: SidebarCardElement, selectedCategories: ExerciseCategory[]): boolean {
+    if (!selectedCategories.length) {
+        return true;
+    }
+    if (!sidebarElement?.exercise?.categories) {
+        return false;
+    }
+
+    // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability
+    const isAnyExerciseCategoryMatchingASelectedCategory = sidebarElement.exercise.categories.some((category) =>
+        selectedCategories.some((selectedCategory) => selectedCategory.equals(category)),
+    );
+    return isAnyExerciseCategoryMatchingASelectedCategory;
+}
+
+export function satisfiesScoreFilter(sidebarElement: SidebarCardElement, isFilterApplied: boolean, achievedScoreFilter?: RangeFilter): boolean {
+    if (!isFilterApplied || !achievedScoreFilter) {
+        return true;
+    }
+
+    const latestResult = getLatestResultOfStudentParticipation(sidebarElement.studentParticipation, true);
+    if (!latestResult?.score) {
+        return achievedScoreFilter.filter.selectedMin === 0;
+    }
+
+    const isScoreInSelectedMinRange = latestResult.score >= achievedScoreFilter.filter.selectedMin;
+    const isScoreInSelectedMaxRange = latestResult.score <= achievedScoreFilter.filter.selectedMax;
+
+    return isScoreInSelectedMinRange && isScoreInSelectedMaxRange;
+}
+
+export function satisfiesPointsFilter(sidebarElement: SidebarCardElement, isPointsFilterApplied: boolean, achievablePointsFilter?: RangeFilter): boolean {
+    if (!isPointsFilterApplied || !achievablePointsFilter) {
+        return true;
+    }
+
+    /** {@link Exercise.maxPoints} must be in the range 1 - 9999 */
+    if (!sidebarElement.exercise?.maxPoints) {
+        return false;
+    }
+
+    const isAchievablePointsInSelectedMinRange = sidebarElement.exercise.maxPoints >= achievablePointsFilter.filter.selectedMin;
+    const isAchievablePointsInSelectedMaxRange = sidebarElement.exercise.maxPoints <= achievablePointsFilter.filter.selectedMax;
+
+    return isAchievablePointsInSelectedMinRange && isAchievablePointsInSelectedMaxRange;
+}
+
+export function satisfiesFilters(sidebarElement: SidebarCardElement, filterDetails: FilterDetails) {
+    return (
+        satisfiesCategoryFilter(sidebarElement, filterDetails.selectedCategories) &&
+        satisfiesDifficultyFilter(sidebarElement, filterDetails.searchedDifficulties) &&
+        satisfiesTypeFilter(sidebarElement, filterDetails.searchedTypes) &&
+        satisfiesScoreFilter(sidebarElement, filterDetails.isScoreFilterApplied, filterDetails.achievedScore) &&
+        satisfiesPointsFilter(sidebarElement, filterDetails.isPointsFilterApplied, filterDetails.achievablePoints)
+    );
+}
diff --git a/src/main/webapp/app/shared/http/file.service.ts b/src/main/webapp/app/shared/http/file.service.ts
index 330d449bc4f6..c14136a6688d 100644
--- a/src/main/webapp/app/shared/http/file.service.ts
+++ b/src/main/webapp/app/shared/http/file.service.ts
@@ -4,7 +4,7 @@ import { lastValueFrom } from 'rxjs';
 import { v4 as uuid } from 'uuid';
 import { Observable } from 'rxjs';
 
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 
 @Injectable({ providedIn: 'root' })
 export class FileService {
diff --git a/src/main/webapp/app/shared/language/translate.directive.ts b/src/main/webapp/app/shared/language/translate.directive.ts
index 8a703341ed63..cb40182df64f 100644
--- a/src/main/webapp/app/shared/language/translate.directive.ts
+++ b/src/main/webapp/app/shared/language/translate.directive.ts
@@ -9,6 +9,7 @@ import { takeUntil } from 'rxjs/operators';
  */
 @Directive({
     selector: '[jhiTranslate]',
+    standalone: true,
 })
 export class TranslateDirective implements OnChanges, OnInit, OnDestroy {
     @Input() jhiTranslate!: string;
diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html
index af13f560659b..556aee6ce6bb 100644
--- a/src/main/webapp/app/shared/layouts/navbar/navbar.component.html
+++ b/src/main/webapp/app/shared/layouts/navbar/navbar.component.html
@@ -36,7 +36,7 @@
                     <li>
                         <a class="dropdown-item" [routerLink]="['/user-settings']" (click)="collapseNavbar()">
                             <fa-icon [icon]="faCog" [fixedWidth]="true" />
-                            <span>{{ 'global.menu.settings' | artemisTranslate }}</span>
+                            <span jhiTranslate="global.menu.settings"></span>
                         </a>
                     </li>
                     <div class="dropdown-divider"></div>
diff --git a/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts b/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts
index b24b25a4b64d..14cc8732f244 100644
--- a/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts
+++ b/src/main/webapp/app/shared/layouts/navbar/navbar.component.ts
@@ -532,6 +532,9 @@ export class NavbarComponent implements OnInit, OnDestroy {
                 // Special case: Don't display the ID here but the name directly (clicking the ID wouldn't work)
                 this.addTranslationAsCrumb(currentPath, 'example-submission-editor');
                 break;
+            case 'attachments':
+                this.addBreadcrumb(currentPath, segment, false);
+                break;
             // No breadcrumbs for those segments
             case 'competency-management':
             case 'prerequisite-management':
diff --git a/src/main/webapp/app/shared/layouts/profiles/profile-info.model.ts b/src/main/webapp/app/shared/layouts/profiles/profile-info.model.ts
index 18c335e0079f..9d7bafb69cde 100644
--- a/src/main/webapp/app/shared/layouts/profiles/profile-info.model.ts
+++ b/src/main/webapp/app/shared/layouts/profiles/profile-info.model.ts
@@ -56,6 +56,8 @@ export class ProfileInfo {
         };
     };
     public theiaPortalURL: string;
+    public operatorName: string;
+    public operatorAdminName?: string;
 }
 
 export const hasEditableBuildPlan = (profileInfo: ProfileInfo): boolean => {
diff --git a/src/main/webapp/app/shared/layouts/profiles/profile.service.ts b/src/main/webapp/app/shared/layouts/profiles/profile.service.ts
index ce197b034a47..ac828dc310ea 100644
--- a/src/main/webapp/app/shared/layouts/profiles/profile.service.ts
+++ b/src/main/webapp/app/shared/layouts/profiles/profile.service.ts
@@ -61,6 +61,8 @@ export class ProfileService {
                         profileInfo.externalUserManagementURL = data.externalUserManagementURL ?? '';
 
                         profileInfo.contact = data.contact;
+                        profileInfo.operatorName = data.operatorName;
+                        profileInfo.operatorAdminName = data.operatorAdminName;
                         profileInfo.registrationEnabled = data.registrationEnabled;
                         profileInfo.needsToAcceptTerms = data.needsToAcceptTerms;
                         profileInfo.allowedEmailPattern = data.allowedEmailPattern;
diff --git a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
index 785e34640ba0..46f976b39ec6 100644
--- a/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
+++ b/src/main/webapp/app/shared/loading-indicator-container/loading-indicator-container.component.html
@@ -1,7 +1,7 @@
 @if (isLoading) {
     <div class="d-flex justify-content-center spinner">
         <div class="spinner-border" role="status">
-            <span class="sr-only">{{ 'loading' | artemisTranslate }}</span>
+            <span class="sr-only" jhiTranslate="loading"></span>
         </div>
     </div>
 } @else {
diff --git a/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.component.ts b/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.component.ts
deleted file mode 100644
index d0ddebb5007b..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.component.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-import { Component, ElementRef, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output, forwardRef } from '@angular/core';
-import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import 'brace';
-import 'brace/theme/monokai';
-import 'brace/theme/chrome';
-import 'brace/theme/dreamweaver';
-import 'brace/theme/dracula';
-import 'brace/ext/language_tools';
-import 'brace/ext/modelist';
-import 'brace/mode/java';
-import 'brace/mode/sh';
-import 'brace/mode/markdown';
-import 'brace/mode/haskell';
-import 'brace/mode/ocaml';
-import 'brace/mode/c_cpp';
-import 'brace/mode/python';
-import 'brace/mode/swift';
-import 'brace/mode/yaml';
-import 'brace/mode/makefile';
-import 'brace/mode/kotlin';
-import 'brace/mode/assembly_x86';
-import 'brace/mode/vhdl';
-import { ThemeService } from 'app/core/theme/theme.service';
-import { Subscription } from 'rxjs';
-
-declare let ace: any;
-
-export const MAX_TAB_SIZE = 8;
-
-@Component({
-    selector: 'jhi-ace-editor',
-    template: '',
-    styles: [':host { display:block;width:100%; }'],
-    providers: [
-        {
-            provide: NG_VALUE_ACCESSOR,
-            useExisting: forwardRef(() => AceEditorComponent),
-            multi: true,
-        },
-    ],
-})
-export class AceEditorComponent implements ControlValueAccessor, OnInit, OnDestroy {
-    @Output() textChanged = new EventEmitter();
-    @Output() textChange = new EventEmitter();
-    @Input() style: any = {};
-
-    /**
-     * Sets the size in spaces of newly inserted tabs and the display size of existing true tabs.
-     *
-     * @param value The display width between 1 and {@link MAX_TAB_SIZE} (both inclusive).
-     */
-    @Input()
-    public set tabSize(value: number) {
-        if (value > 0 && value <= MAX_TAB_SIZE) {
-            this._editor.session.setTabSize(value);
-        }
-    }
-
-    oldText: string;
-    timeoutSaving: any;
-
-    private _options: any = {};
-    private _readOnly = false;
-    private _theme = 'dreamweaver';
-    private _mode = 'java';
-    private _autoUpdateContent = true;
-    private _editor: any; // TODO: use Editor (defined in brace) or Editor (defined in ace-builds) and make sure to use typings consistently
-    private _durationBeforeCallback = 0;
-    private _text = '';
-
-    private themeSubscription: Subscription;
-
-    constructor(
-        elementRef: ElementRef,
-        private zone: NgZone,
-        private themeService: ThemeService,
-    ) {
-        const el = elementRef.nativeElement;
-        this.zone.runOutsideAngular(() => {
-            this._editor = ace['edit'](el);
-        });
-        this._editor.$blockScrolling = Infinity;
-    }
-
-    ngOnInit() {
-        this.init();
-        this.initEvents();
-    }
-
-    ngOnDestroy() {
-        this._editor.destroy();
-        this.themeSubscription?.unsubscribe();
-    }
-
-    init() {
-        this.setOptions(this._options || {});
-        this.setMode(this._mode);
-        this.setReadOnly(this._readOnly);
-    }
-
-    initEvents() {
-        this._editor.on('change', () => this.updateText());
-        this._editor.on('paste', () => this.updateText());
-
-        this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe(() => this.setThemeFromMode());
-    }
-
-    updateText() {
-        const newVal = this._editor.getValue();
-        if (newVal === this.oldText) {
-            return;
-        }
-        if (!this._durationBeforeCallback) {
-            this._text = newVal;
-            this.zone.run(() => {
-                this.textChange.emit(newVal);
-                this.textChanged.emit(newVal);
-            });
-            this._onChange(newVal);
-        } else {
-            if (this.timeoutSaving) {
-                clearTimeout(this.timeoutSaving);
-            }
-
-            this.timeoutSaving = setTimeout(() => {
-                this._text = newVal;
-                this.zone.run(() => {
-                    this.textChange.emit(newVal);
-                    this.textChanged.emit(newVal);
-                });
-                this.timeoutSaving = null;
-            }, this._durationBeforeCallback);
-        }
-        this.oldText = newVal;
-    }
-
-    @Input()
-    set options(options: any) {
-        this.setOptions(options);
-    }
-
-    setOptions(options: any) {
-        this._options = options;
-        this._editor.setOptions(options || {});
-    }
-
-    @Input()
-    set readOnly(readOnly: boolean) {
-        this.setReadOnly(readOnly);
-    }
-
-    setReadOnly(readOnly: boolean) {
-        this._readOnly = readOnly;
-        this._editor.setReadOnly(readOnly);
-    }
-
-    @Input()
-    set mode(mode: string) {
-        this.setMode(mode);
-    }
-
-    setMode(mode: string) {
-        this._mode = mode;
-        if (typeof this._mode === 'object') {
-            this._editor.getSession().setMode(this._mode);
-        } else {
-            this._editor.getSession().setMode(`ace/mode/${this._mode}`);
-        }
-
-        this.setThemeFromMode();
-    }
-
-    private setThemeFromMode() {
-        const currentApplicationTheme = this.themeService.getCurrentTheme();
-        this._theme = this._mode.toLowerCase() === 'markdown' ? currentApplicationTheme.markdownAceTheme : currentApplicationTheme.codeAceTheme;
-        this._editor.setTheme(`ace/theme/${this._theme}`);
-    }
-
-    get value() {
-        return this.text;
-    }
-
-    @Input()
-    set value(value: string) {
-        this.setText(value);
-    }
-
-    writeValue(value: string) {
-        this.setText(value);
-    }
-
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    private _onChange = (_: any) => {};
-
-    registerOnChange(fn: any) {
-        this._onChange = fn;
-    }
-
-    private _onTouched = () => {};
-
-    registerOnTouched(fn: any) {
-        this._onTouched = fn;
-    }
-
-    get text() {
-        return this._text;
-    }
-
-    @Input()
-    set text(text: string) {
-        this.setText(text);
-    }
-
-    setText(text: string) {
-        if (text == undefined) {
-            text = '';
-        }
-        if (this._text !== text && this._autoUpdateContent) {
-            this._text = text;
-            this._editor.setValue(text);
-            this._onChange(text);
-            this._editor.clearSelection();
-        }
-    }
-
-    @Input()
-    set autoUpdateContent(status: boolean) {
-        this.setAutoUpdateContent(status);
-    }
-
-    setAutoUpdateContent(status: boolean) {
-        this._autoUpdateContent = status;
-    }
-
-    @Input()
-    set durationBeforeCallback(num: number) {
-        this.setDurationBeforeCallback(num);
-    }
-
-    setDurationBeforeCallback(num: number) {
-        this._durationBeforeCallback = num;
-    }
-
-    getEditor() {
-        return this._editor;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.module.ts b/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.module.ts
deleted file mode 100644
index 4962eeb93346..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/ace-editor/ace-editor.module.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { NgModule } from '@angular/core';
-import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component';
-
-@NgModule({
-    declarations: [AceEditorComponent],
-    exports: [AceEditorComponent],
-})
-export class AceEditorModule {}
diff --git a/src/main/webapp/app/shared/markdown-editor/command-constants.ts b/src/main/webapp/app/shared/markdown-editor/command-constants.ts
deleted file mode 100644
index a65e67529016..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/command-constants.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ReferenceType } from 'app/shared/metis/metis.util';
-
-export type ValueItem = {
-    id: string;
-    value: string;
-    type?: string;
-    elements?: ValueItem[];
-    attachmentUnits?: ValueItem[];
-};
-
-export type SlideItem = {
-    id: string;
-    slideImagePath: string;
-    slideNumber: number;
-    courseArtifactType: ReferenceType;
-};
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/attachmentCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/attachmentCommand.ts
deleted file mode 100644
index 19dcfaa8d522..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/attachmentCommand.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faImage } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class AttachmentCommand extends Command {
-    buttonIcon = faImage as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.imageUpload';
-
-    /**
-     * @function execute
-     * @desc insert/remove the markdown command for uploading an attachment
-     *       1. Check if the selected text includes ('![](http://)')
-     *       2. If included reduce the selected text by this elements and replace the selected text by textToAdd
-     *       3. If not included add ('![](http://)') at the cursor position in the editor
-     *       4. Attachment in Markdown language appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('![](http://)')) {
-            const textToAdd = selectedText.slice(12);
-            this.insertText(textToAdd);
-        } else {
-            const range = this.getRange();
-            selectedText = `![](http://)`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/bold.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/bold.command.ts
deleted file mode 100644
index 3ebf66c361a6..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/bold.command.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faBold } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class BoldCommand extends Command {
-    buttonIcon = faBold as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.bold';
-
-    /**
-     * @function execute
-     * @desc Make/Remove bold text
-     *       1. Check if the selected text includes (**)
-     *       2. If included reduce the selected text by these elements and replace the selected text by textToAdd
-     *       3. If not included, add (**) before and after the selected text and insert them into the editor
-     *       4. Bold markdown appears
-     */
-    execute(): void {
-        const selectedText = this.getSelectedText();
-        let textToAdd = '';
-
-        if (selectedText.slice(0, 2) === '**' && selectedText.slice(selectedText.length - 2, selectedText.length) === '**') {
-            textToAdd = selectedText.slice(2, -2);
-            this.insertText(textToAdd);
-        } else {
-            const trimmedText = this.deleteWhiteSpace(selectedText);
-            textToAdd = `**${trimmedText}**`;
-            this.addRefinedText(selectedText, textToAdd);
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/code.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/code.command.ts
deleted file mode 100644
index 37382b93d663..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/code.command.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faCode } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class CodeCommand extends Command {
-    buttonIcon = faCode as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.code';
-
-    /**
-     * @function execute
-     * @desc 1. check if the selected text starts with '`' and ends with '`'
-     *       2. if it does include those elements reduce the selected text by this elements and add replace the selected text by the reduced text
-     *       3. if it does not include those add (`) before and after the selected text and add them to the text editor
-     *       4. code markdown appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.startsWith('`') && selectedText.endsWith('`')) {
-            const textToAdd = selectedText.slice(1, -1);
-            this.insertText(textToAdd);
-        } else {
-            const range = this.getRange();
-            selectedText = '`' + selectedText + '`';
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/codeblock.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/codeblock.command.ts
deleted file mode 100644
index 7adeb548b581..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/codeblock.command.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faFileCode } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class CodeBlockCommand extends Command {
-    buttonIcon = faFileCode as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.codeBlock';
-
-    /**
-     * @function execute
-     * @desc add (```java) before and (```) after the selected text
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-        const range = this.getRange();
-        const initText = 'Source Code';
-        selectedText = '```java\n' + (selectedText || initText) + '\n```';
-        this.replace(range, selectedText);
-        this.focus();
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/colorPicker.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/colorPicker.command.ts
deleted file mode 100644
index a311650ac3bb..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/colorPicker.command.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { Command } from './command';
-
-export class ColorPickerCommand extends Command {
-    buttonIcon = '' as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.color';
-
-    /**
-     * @function execute
-     * @desc Set/ Remove color
-     *       1. Check if the selected text includes (<span)
-     *       2. If included reduce the selected text by the html elements for setting the color and replace the selected text by textToAdd
-     *       3. If not included insert the html element that change the style of the selectedText by setting the chosen color
-     *       4. Color changes occur
-     */
-    execute(color: string): void {
-        const selectedText = this.getSelectedText();
-
-        if (selectedText.includes('class="green"') || selectedText.includes('class="white"')) {
-            const textToAdd = selectedText.slice(20, -7);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('class="yellow"') || selectedText.includes('class="orange"')) {
-            const textToAdd = selectedText.slice(21, -7);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('class="red"')) {
-            const textToAdd = selectedText.slice(18, -7);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('class="blue"') || selectedText.includes('class="lila"')) {
-            const textToAdd = selectedText.slice(19, -7);
-            this.insertText(textToAdd);
-        } else {
-            this.insertHTMLForColorChange(selectedText, color);
-        }
-    }
-
-    /**
-     * @function insertHTMLForColorChange
-     * @desc Insert a html span with the color changes
-     * Note: Markdown does not support color changes - this is why html injection is used
-     */
-    insertHTMLForColorChange(selectedText: string, color: string) {
-        let textToAdd = '';
-        switch (color) {
-            case '#ca2024':
-                textToAdd = `<span class="red">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#3ea119':
-                textToAdd = `<span class="green">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#ffffff':
-                textToAdd = `<span class="white">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#000000':
-                textToAdd = `${selectedText}`;
-                // this.execute('#000000');
-                // textToAdd = `<span class="black">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#fffa5c':
-                textToAdd = `<span class="yellow">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#0d3cc2':
-                textToAdd = `<span class="blue">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#b05db8':
-                textToAdd = `<span class="lila">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-            case '#d86b1f':
-                textToAdd = `<span class="orange">` + `${selectedText}` + `</span>`;
-                this.insertText(textToAdd);
-                break;
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/command.ts b/src/main/webapp/app/shared/markdown-editor/commands/command.ts
deleted file mode 100644
index af44c39a9136..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/command.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { ElementRef } from '@angular/core';
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { Range, acequire } from 'brace';
-
-// Work around to update the range
-const RangeCtor = acequire('ace/range').Range as typeof Range;
-
-/**
- * abstract class for all commands - default and domain commands of Artemis
- * default commands: markdown commands e.g. bold, italic
- * domain commands: Artemis customized commands
- */
-export abstract class Command {
-    buttonIcon: IconProp;
-    buttonTranslationString: string;
-    protected aceEditor: any;
-    protected markdownWrapper: ElementRef;
-
-    public setEditor(aceEditor: any): void {
-        this.aceEditor = aceEditor;
-    }
-
-    public setMarkdownWrapper(ref: ElementRef) {
-        this.markdownWrapper = ref;
-    }
-
-    protected getSelectedText(): string {
-        return this.aceEditor.getSelectedText();
-    }
-
-    /**
-     * Extends the current selection to full lines.
-     *
-     * @return The complete lines of the selected text.
-     */
-    protected getExtendedSelectedText(): string[] {
-        const text = this.getText();
-
-        // Split text by line breaks
-        const lines = text.split('\n');
-
-        const range = this.getRange();
-
-        // Update the range
-        this.aceEditor.selection.setRange(new RangeCtor(range.start.row, 0, range.end.row, lines[range.end.row].length));
-
-        // Return extended selection as array
-        return lines.slice(range.start.row, range.end.row + 1);
-    }
-
-    protected getText(): string {
-        return this.aceEditor.getValue();
-    }
-
-    protected insertText(text: string) {
-        this.aceEditor.insert(text);
-    }
-
-    protected focus() {
-        this.aceEditor.focus();
-    }
-
-    protected getRange(): Range {
-        return this.aceEditor.selection.getRange();
-    }
-
-    protected replace(range: Range, text: string) {
-        this.aceEditor.session.replace(range, text);
-    }
-
-    protected clearSelection() {
-        this.aceEditor.clearSelection();
-    }
-
-    protected moveCursorTo(row: number, column: number) {
-        this.aceEditor.moveCursorTo(row, column);
-    }
-
-    protected getCursorPosition() {
-        return this.aceEditor.getCursorPosition();
-    }
-
-    protected getLine(row: number) {
-        return this.aceEditor.getSession().getLine(row);
-    }
-
-    protected getCurrentLine() {
-        const cursor = this.getCursorPosition();
-        return this.getLine(cursor.row);
-    }
-
-    protected moveCursorToEndOfRow() {
-        const cursor = this.getCursorPosition();
-        const currentLine = this.aceEditor.getSession().getLine(cursor.row);
-        this.clearSelection();
-        this.moveCursorTo(cursor.row, currentLine.length);
-    }
-
-    protected addCompleter(completer: any) {
-        this.aceEditor.completers = [...(this.aceEditor.completers || []), completer];
-    }
-
-    abstract execute(input?: string): void;
-
-    protected deleteWhiteSpace(text: string) {
-        return text.trim();
-    }
-
-    protected addRefinedText(selectedText: string, textToAdd: string) {
-        if (selectedText.charAt(0) === ' ' && selectedText.charAt(selectedText.length - 1) === ' ') {
-            return this.insertText(' ' + textToAdd + ' ');
-        } else if (selectedText.charAt(0) === ' ') {
-            return this.insertText(' ' + textToAdd);
-        } else if (selectedText.charAt(selectedText.length - 1) === ' ') {
-            return this.insertText(textToAdd + ' ');
-        } else {
-            return this.insertText(textToAdd);
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/channelMentionCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/channelMentionCommand.ts
deleted file mode 100644
index 58241d8b73de..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/channelMentionCommand.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { InteractiveSearchCommand } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-import { faHashtag } from '@fortawesome/free-solid-svg-icons';
-import { HttpResponse } from '@angular/common/http';
-import { Observable, map, of } from 'rxjs';
-import { MetisService } from 'app/shared/metis/metis.service';
-import { ChannelIdAndNameDTO } from 'app/entities/metis/conversation/channel.model';
-import { ChannelService } from 'app/shared/metis/conversations/channel.service';
-
-export class ChannelMentionCommand extends InteractiveSearchCommand {
-    buttonIcon = faHashtag;
-
-    private cachedResponse: HttpResponse<ChannelIdAndNameDTO[]>;
-
-    constructor(
-        private readonly channelService: ChannelService,
-        private readonly metisService: MetisService,
-    ) {
-        super();
-    }
-
-    protected getAssociatedInputCharacter(): string {
-        return '#';
-    }
-
-    performSearch(searchTerm: string): Observable<HttpResponse<ChannelIdAndNameDTO[]>> {
-        // all channels are returned within a response. Therefore, the command can cache it
-        if (this.cachedResponse) {
-            return of(this.filterCachedResponse(searchTerm));
-        }
-        return this.channelService.getPublicChannelsOfCourse(this.metisService.getCourse().id!).pipe(
-            map((response) => {
-                this.cachedResponse = response;
-                return this.filterCachedResponse(searchTerm);
-            }),
-        );
-    }
-
-    protected selectionToText(selected: ChannelIdAndNameDTO): string {
-        return `[channel]${selected['name'] ?? 'empty'}(${selected.id})[/channel]`;
-    }
-
-    private filterCachedResponse(searchTerm: string): HttpResponse<ChannelIdAndNameDTO[]> {
-        const channels = this.cachedResponse.body!.filter((dto) => dto.name?.toLowerCase().includes(searchTerm.toLowerCase()));
-        return new HttpResponse({ body: channels });
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts
deleted file mode 100644
index ba955b868eb9..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand';
-import { MetisService } from 'app/shared/metis/metis.service';
-
-export class ExerciseReferenceCommand extends MultiOptionCommand {
-    metisService: MetisService;
-
-    buttonTranslationString = 'artemisApp.metis.editor.exercise';
-
-    constructor(metisService: MetisService) {
-        super();
-        this.metisService = metisService;
-
-        this.setValues(
-            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-            this.metisService.getCourse().exercises?.map((exercise) => ({
-                id: exercise.id!.toString(),
-                value: exercise.title!,
-                type: exercise.type,
-            }))!,
-        );
-    }
-
-    /**
-     * @function execute
-     * @param {string} selectedExerciseId   ID of the exercise to be referenced
-     * @desc                                Add an exercise reference link in markdown language
-     *                                      1. Add '[{exercise-title}](/courses/{courseId}/exercises/{exerciseId}})' at the cursor in the editor
-     *                                      2. Link in markdown language appears which when clicked navigates to the exercise page
-     */
-    execute(selectedExerciseId: string): void {
-        const selectedExercise = this.getValues().find((value) => value.id.toString() === selectedExerciseId)!;
-        const referenceLink = `[${selectedExercise.type}]${selectedExercise.value}(${this.metisService.getLinkForExercise(selectedExercise.id)})[/${selectedExercise.type}]`;
-        this.insertText(referenceLink);
-        this.focus();
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts
deleted file mode 100644
index 8a1cce16bd2e..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand';
-import { MetisService } from 'app/shared/metis/metis.service';
-import { ReferenceType } from 'app/shared/metis/metis.util';
-import { LectureService } from 'app/lecture/lecture.service';
-import { Lecture } from 'app/entities/lecture.model';
-import { map } from 'rxjs/operators';
-import { HttpResponse } from '@angular/common/http';
-import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
-import { Slide } from 'app/entities/lecture-unit/slide.model';
-import { Attachment } from 'app/entities/attachment.model';
-import { SlideItem, ValueItem } from 'app/shared/markdown-editor/command-constants';
-import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
-
-export class LectureAttachmentReferenceCommand extends MultiOptionCommand {
-    metisService: MetisService;
-
-    lectureService: LectureService;
-
-    buttonTranslationString = 'artemisApp.metis.editor.lecture';
-
-    constructor(metisService: MetisService, lectureService: LectureService) {
-        super();
-        this.metisService = metisService;
-        this.lectureService = lectureService;
-
-        lectureService
-            .findAllByCourseIdWithSlides(this.metisService.getCourse().id!)
-            .pipe(map((response: HttpResponse<Lecture[]>) => response.body!))
-            .subscribe((lectures: Lecture[]) => {
-                lectures.map((lecture) => {
-                    this.setValues([
-                        ...this.values,
-                        {
-                            id: lecture.id!.toString(),
-                            value: lecture.title!,
-                            type: ReferenceType.LECTURE,
-                            elements: this.lectureAttachments(lecture.attachments!),
-                            attachmentUnits: this.attachmentUnitsWithSlides(lecture.lectureUnits!),
-                        },
-                    ]);
-                });
-            });
-    }
-
-    /**
-     * @function execute
-     * @param {string} selectedLectureId   ID of the lecture to be referenced
-     * @param type
-     * @param selectedElementId
-     * @param selectedUnitId
-     * @param selectedSlideId
-     * @desc                                Add a lecture reference link in markdown language
-     *                                      1. Add '[{lecture-title}](/courses/{courseId}/lectures/{lectureId}})' at the cursor in the editor
-     *                                      2. Link in markdown language appears which when clicked navigates to the lecture page
-     */
-    execute(selectedLectureId: string, type?: ReferenceType, selectedElementId?: string, selectedUnitId?: string, selectedSlideId?: string): void {
-        const selectedLecture = this.metisService.getCourse().lectures!.find((value) => value.id!.toString() === selectedLectureId)!;
-        this.lectureService
-            .findWithDetailsWithSlides(selectedLecture.id!)
-            .pipe(map((response: HttpResponse<Lecture>) => response.body!))
-            .subscribe({
-                next: (lecture: Lecture) => {
-                    if (selectedUnitId) {
-                        if (!selectedSlideId) {
-                            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                            const selectedUnit: AttachmentUnit = lecture.lectureUnits?.find((value: AttachmentUnit) => value.id!.toString() === selectedUnitId)!;
-                            const shortLink = selectedUnit.attachment?.link!.split('attachments/')[1];
-                            const referenceLink = `[lecture-unit]${selectedUnit.name}(${shortLink})[/lecture-unit]`;
-                            this.insertText(referenceLink);
-                            this.focus();
-                        } else {
-                            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                            const selectedUnit: AttachmentUnit = lecture.lectureUnits?.find((value: AttachmentUnit) => value.id!.toString() === selectedUnitId)!;
-                            // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                            const selectedSlide: Slide = selectedUnit.slides?.find((value: Slide) => value.id!.toString() === selectedSlideId)!;
-                            const shortLink = selectedSlide.slideImagePath!.split('attachments/')[1];
-                            // Use a regular expression and the replace() method to remove the file name and last slash
-                            const shortLinkWithoutFileName: string = shortLink.replace(new RegExp(`[^/]*${'.png'}`), '').replace(/\/$/, '');
-                            const referenceLink = `[slide]${selectedUnit.name} Slide ${selectedSlide.slideNumber}(${shortLinkWithoutFileName})[/slide]`;
-                            this.insertText(referenceLink);
-                            this.focus();
-                        }
-                    } else {
-                        // eslint-disable-next-line @typescript-eslint/no-non-null-asserted-optional-chain
-                        const selectedAttachment = selectedLecture.attachments?.find((value) => value.id!.toString() === selectedElementId)!;
-                        const shortLink = selectedAttachment ? selectedAttachment.link!.split('attachments/')[1] : '';
-                        const referenceLink =
-                            ReferenceType.LECTURE === type
-                                ? `[lecture]${selectedLecture.title}(${this.metisService.getLinkForLecture(selectedLecture.id!.toString())})[/lecture]`
-                                : `[attachment]${selectedAttachment.name}(${shortLink})[/attachment]`;
-                        this.insertText(referenceLink);
-                        this.focus();
-                    }
-                },
-            });
-    }
-
-    private lectureAttachments(attachments: Attachment[]): ValueItem[] {
-        return attachments?.map((attachment: any) => ({
-            id: attachment.id!.toString(),
-            value: attachment.name!,
-            courseArtifactType: ReferenceType.ATTACHMENT,
-        }));
-    }
-
-    private attachmentUnitsWithSlides(lectureUnits: LectureUnit[]): ValueItem[] {
-        return lectureUnits?.map((unit: any) => {
-            return {
-                id: unit.id!.toString(),
-                value: unit.name!,
-                slides: this.attachmentUnitSlides(unit.slides!),
-                courseArtifactType: ReferenceType.ATTACHMENT_UNITS,
-            };
-        });
-    }
-
-    private attachmentUnitSlides(slides: Slide[]): SlideItem[] {
-        return slides
-            ?.map((slide: Slide) => {
-                return {
-                    id: slide.id!.toString(),
-                    slideNumber: slide.slideNumber!,
-                    slideImagePath: slide.slideImagePath!,
-                    courseArtifactType: ReferenceType.SLIDE,
-                };
-            })
-            .sort((a: SlideItem, b: SlideItem) => a.slideNumber - b.slideNumber);
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/userMentionCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/userMentionCommand.ts
deleted file mode 100644
index 16dfcbbf7f2f..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/courseArtifactReferenceCommands/userMentionCommand.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { InteractiveSearchCommand } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-import { faAt } from '@fortawesome/free-solid-svg-icons';
-import { MetisService } from 'app/shared/metis/metis.service';
-import { ConversationUserDTO } from 'app/entities/metis/conversation/conversation-user-dto.model';
-import { HttpResponse } from '@angular/common/http';
-import { Observable } from 'rxjs';
-import { CourseManagementService } from 'app/course/manage/course-management.service';
-
-export class UserMentionCommand extends InteractiveSearchCommand {
-    buttonIcon = faAt;
-
-    constructor(
-        private readonly courseManagementService: CourseManagementService,
-        private readonly metisService: MetisService,
-    ) {
-        super();
-    }
-
-    protected getAssociatedInputCharacter(): string {
-        return '@';
-    }
-
-    performSearch(searchTerm: string): Observable<HttpResponse<ConversationUserDTO[]>> {
-        return this.courseManagementService.searchMembersForUserMentions(this.metisService.getCourse().id!, searchTerm);
-    }
-
-    protected selectionToText(selected: ConversationUserDTO): string {
-        return `[user]${selected.name}(${selected.login})[/user]`;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts
deleted file mode 100644
index a331a1c07479..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/fullscreen.command.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faCompress } from '@fortawesome/free-solid-svg-icons';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-import { enterFullscreen, exitFullscreen, isFullScreen } from 'app/shared/util/fullscreen.util';
-
-/**
- * Toggles fullscreen on button press.
- * Uses the markdown editor wrapper including tabs as element for fullscreen.
- *
- * The command needs to check different browser implementations of the fullscreen mode so it is handled correctly.
- */
-export class FullscreenCommand extends Command {
-    buttonIcon = faCompress as IconProp;
-    buttonTranslationString = 'artemisApp.markdownEditor.commands.fullscreen';
-
-    execute(): void {
-        if (isFullScreen()) {
-            exitFullscreen();
-        } else {
-            const element = this.markdownWrapper.nativeElement;
-            enterFullscreen(element);
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts
deleted file mode 100644
index b37e8dce1c20..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/headingOne.command.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faHeading } from '@fortawesome/free-solid-svg-icons';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-export class HeadingOneCommand extends Command {
-    buttonIcon = faHeading as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingOne';
-
-    /**
-     * @function execute
-     * @desc Create/remove heading one in markdown language
-     *       1. Check if the selected text includes (#) and/or ('Heading 1')
-     *       2. If included  reduce the selected text by this elements and add replace the selected text by textToAdd
-     *       3. If not included add (#) before the selected text and insert them into the editor
-     *       4. Heading one in markdown language appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('#') && !selectedText.includes('Heading 1')) {
-            const textToAdd = selectedText.slice(2);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('#') && selectedText.includes('Heading 1')) {
-            const textToAdd = selectedText.slice(2, -9);
-            this.insertText(textToAdd);
-        } else {
-            const initText = 'Heading 1';
-            const range = this.getRange();
-            selectedText = `# ${selectedText || initText}`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts
deleted file mode 100644
index 0d9e3ac9185d..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/headingThree.command.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faHeading } from '@fortawesome/free-solid-svg-icons';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-export class HeadingThreeCommand extends Command {
-    buttonIcon = faHeading as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingThree';
-
-    /**
-     * @function execute
-     * @desc Create/Remove heading three language
-     *       1. check if the selected text includes (###) and/or ('Heading 3')
-     *       2. If included reduce the selected text by this elements and add replace the selected text by textToAdd
-     *       3. If not included  add (###) before the selected text and insert them into the editor
-     *       4. Heading three in markdown language appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('###') && !selectedText.includes('Heading 3')) {
-            const textToAdd = selectedText.slice(4);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('###') && selectedText.includes('Heading 3')) {
-            const textToAdd = selectedText.slice(4, -9);
-            this.insertText(textToAdd);
-        } else {
-            const initText = 'Heading 3';
-            const range = this.getRange();
-            selectedText = `### ${selectedText || initText}`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts
deleted file mode 100644
index 4f14cafd8e0b..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/headingTwo.command.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faHeading } from '@fortawesome/free-solid-svg-icons';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-export class HeadingTwoCommand extends Command {
-    buttonIcon = faHeading as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.headingTwo';
-
-    /**
-     * @function execute
-     * @desc Create/Remove heading two language
-     *       1. Check if the selected text includes (##) and/or ('Heading 2')
-     *       2. If included  reduce the selected text by this elements and add replace the selected text by textToAdd
-     *       3. If not included add (##) before the selected text and insert them into the editor
-     *       4. Heading two in markdown language appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('##') && !selectedText.includes('Heading 2')) {
-            const textToAdd = selectedText.slice(3);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('##') && selectedText.includes('Heading 2')) {
-            const textToAdd = selectedText.slice(3, -9);
-            this.insertText(textToAdd);
-        } else {
-            const initText = 'Heading 2';
-            const range = this.getRange();
-            selectedText = `## ${selectedText || initText}`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts
deleted file mode 100644
index a6024ed958b1..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/interactiveSearchCommand.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { HttpResponse } from '@angular/common/http';
-import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand';
-import { Observable } from 'rxjs';
-import { SelectWithSearchComponent } from 'app/shared/markdown-editor/select-with-search/select-with-search.component';
-
-export interface SelectableItem {
-    name?: string;
-}
-
-export abstract class InteractiveSearchCommand extends MultiOptionCommand {
-    private selectWithSearchComponent: SelectWithSearchComponent;
-    execute(): void {
-        this.aceEditor.execCommand(this.getAssociatedInputCharacter());
-    }
-
-    private searchPositionStart: { row: number; column: number } | undefined;
-
-    setEditor(aceEditor: any) {
-        super.setEditor(aceEditor);
-
-        this.aceEditor.commands.addCommand({
-            name: this.getAssociatedInputCharacter(),
-            bindKey: { win: this.getAssociatedInputCharacter(), mac: this.getAssociatedInputCharacter() },
-            exec: (editor: any) => {
-                if (this.searchPositionStart) {
-                    return;
-                }
-
-                const cursorPosition = this.getCursorPosition();
-                const lineContent = editor.session.getLine(cursorPosition.row).substring(0, cursorPosition.column);
-
-                editor.insert(this.getAssociatedInputCharacter());
-                if (cursorPosition.column === 0 || lineContent.slice(-1).match(/\s/)) {
-                    this.searchPositionStart = cursorPosition;
-                    this.selectWithSearchComponent?.open();
-                    this.aceEditor.focus();
-                }
-            },
-        } as any);
-    }
-
-    setSelectWithSearchComponent(component: SelectWithSearchComponent) {
-        this.selectWithSearchComponent = component;
-    }
-
-    insertSelection(selected: SelectableItem | undefined) {
-        if (selected !== undefined) {
-            const cursorPosition = this.aceEditor.getCursorPosition() as { row: number; column: number };
-
-            this.aceEditor.session
-                .getDocument()
-                .removeInLine(cursorPosition.row, this.searchPositionStart?.row === cursorPosition.row ? this.searchPositionStart.column : 0, cursorPosition.column);
-
-            this.searchPositionStart = undefined;
-
-            this.insertText(this.selectionToText(selected));
-        }
-
-        this.searchPositionStart = undefined;
-        this.aceEditor.focus();
-    }
-
-    abstract performSearch(searchTerm: string): Observable<HttpResponse<SelectableItem[]>>;
-
-    protected abstract selectionToText(selected: any): string;
-
-    protected abstract getAssociatedInputCharacter(): string;
-
-    getCursorScreenPosition(): any {
-        const cursorPosition = super.getCursorPosition();
-        return this.aceEditor.renderer.textToScreenCoordinates(cursorPosition.row, cursorPosition.column);
-    }
-
-    updateSearchTerm() {
-        if (!this.searchPositionStart) {
-            return;
-        }
-
-        const cursorPosition = this.aceEditor.getCursorPosition();
-        const lineContent = this.aceEditor.session.getLine(cursorPosition.row);
-
-        const lastAtIndex = lineContent
-            .substring(cursorPosition.row === this.searchPositionStart.row ? this.searchPositionStart.column : 0, cursorPosition.column + 1)
-            .lastIndexOf(this.getAssociatedInputCharacter());
-
-        if (lastAtIndex >= 0) {
-            const searchTerm = lineContent
-                .substring(0, cursorPosition.column + 1)
-                .split(this.getAssociatedInputCharacter())
-                .pop();
-
-            this.selectWithSearchComponent.updateSearchTerm(searchTerm);
-        } else {
-            this.selectWithSearchComponent.close();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts
deleted file mode 100644
index 48d2ac7f4248..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/italic.command.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faItalic } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class ItalicCommand extends Command {
-    buttonIcon = faItalic as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.italic';
-
-    /**
-     * @function execute
-     * @desc Make/Remove italic text
-     *       1. Check if the selected text includes (*)
-     *       2. If included reduce the selected text by this elements and replace the selected text by textToAdd
-     *       3. If not included add (*) before and after the selected text and insert them into the editor
-     *       4. Italic in markdown language appears
-     */
-    execute(): void {
-        const selectedText = this.getSelectedText();
-        let textToAdd = '';
-
-        if (selectedText.charAt(0) === '*' && selectedText.charAt(selectedText.length - 1) === '*') {
-            textToAdd = selectedText.slice(1, -1);
-            this.insertText(textToAdd);
-        } else {
-            const trimmedText = this.deleteWhiteSpace(selectedText);
-            textToAdd = `*${trimmedText}*`;
-            this.addRefinedText(selectedText, textToAdd);
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts
deleted file mode 100644
index 893ca18141e7..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/katex.command.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faEquals } from '@fortawesome/free-solid-svg-icons';
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-/**
- * Insert a katex compatible formula.
- * Uses an e-function as the example.
- */
-export class KatexCommand extends DomainTagCommand {
-    buttonIcon = faEquals as IconProp;
-    buttonTranslationString = 'artemisApp.markdownEditor.commands.katex';
-    execute(): void {
-        const text = `${this.getOpeningIdentifier()}e^{\\frac{1}{4} y^2}${this.getClosingIdentifier()}`;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    getOpeningIdentifier(): string {
-        return '$$ ';
-    }
-
-    getClosingIdentifier(): string {
-        return ' $$';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts
deleted file mode 100644
index ef16cdfe80b7..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/link.command.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faLink } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class LinkCommand extends Command {
-    buttonIcon = faLink as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.link';
-
-    /**
-     * @function execute
-     * @desc Add/Remove a link in markdown language
-     *       1. check if the selected text includes ('[](http://)')
-     *       2. If included reduce the selected text by this elements and replace the selected text by textToAdd
-     *       3. If not included add ('[](http://)') at the cursor in the editor
-     *       4. Link in markdown language appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('[](http://)')) {
-            const textToAdd = selectedText.slice(11);
-            this.insertText(textToAdd);
-        } else {
-            const range = this.getRange();
-            selectedText = `[](http://)`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/multiOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/multiOptionCommand.ts
deleted file mode 100644
index bc6bdfcb419f..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/multiOptionCommand.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Command } from 'app/shared/markdown-editor/commands/command';
-import { ValueItem } from 'app/shared/markdown-editor/command-constants';
-
-export abstract class MultiOptionCommand extends Command {
-    protected values: ValueItem[] = [];
-
-    getValues() {
-        return this.values;
-    }
-
-    setValues(values: ValueItem[]) {
-        this.values = values;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/orderedListCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/orderedListCommand.ts
deleted file mode 100644
index 015656f337ab..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/orderedListCommand.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faListOl } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class OrderedListCommand extends Command {
-    buttonIcon = faListOl as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.orderedList';
-
-    /**
-     * @function execute
-     * @desc Use the Markdown language for creating/removing an ordered list
-     */
-    execute(): void {
-        const extendedText = this.getExtendedSelectedText();
-        this.handleManipulation(extendedText);
-    }
-
-    /**
-     * Performs the necessary manipulations.
-     * @param extendedText the extended text
-     */
-    handleManipulation(extendedText: string[]): void {
-        let manipulatedText = '';
-        let position = 1;
-
-        extendedText.forEach((line, index) => {
-            // Special case: Single empty line
-            if (line === '') {
-                if (extendedText.length === 1) {
-                    manipulatedText = '1. ';
-                    return;
-                }
-            } else {
-                // Manipulate the line, e.g. remove the number or add the number.
-                manipulatedText += this.manipulateLine(line, position);
-                position++;
-            }
-
-            if (index !== extendedText.length - 1) {
-                manipulatedText += '\n';
-            }
-        });
-        this.replace(this.getRange(), manipulatedText);
-    }
-
-    /**
-     * Manipulates a given line and adds or removes the numbers at the beginning.
-     * @param line to manipulate
-     * @param position of the line in the ordered list
-     * @return manipulated line
-     */
-    manipulateLine(line: string, position: number): string {
-        const index = line.indexOf('.');
-
-        // Calc leading whitespaces
-        const whitespaces = line.search(/\S|$/);
-
-        // There is a dot in this line
-        if (index !== -1) {
-            const elements = [line.slice(whitespaces, index), line.slice(index + 1)];
-
-            // Check if this is really a number
-            if (elements[0] !== '' && !isNaN(Number(elements[0]))) {
-                // Add whitespaces and remove first whitespace after the dot
-                return ' '.repeat(whitespaces) + elements[1].substring(1);
-            }
-        }
-
-        // Add the position of the list element
-        return ' '.repeat(whitespaces) + `${position}. ${line.substring(whitespaces)}`;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/reference.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/reference.command.ts
deleted file mode 100644
index 7da9c5bcd44a..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/reference.command.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faQuoteLeft } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class ReferenceCommand extends Command {
-    buttonIcon = faQuoteLeft as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.quote';
-
-    /**
-     * @function execute
-     * @desc Add/Remove a reference in markdown language
-     *       1. Check if the selected text includes ('>') and/or ('Reference')
-     *       2. If included reduce the selected text by this elements and add replace the selected text by textToAdd
-     *       3. If not included add ('>') before the selected text and insert into editor
-     *       4. Reference in markdown appears
-     */
-    execute(): void {
-        let selectedText = this.getSelectedText();
-
-        if (selectedText.includes('>') && !selectedText.includes('Reference')) {
-            const textToAdd = selectedText.slice(2);
-            this.insertText(textToAdd);
-        } else if (selectedText.includes('>') && selectedText.includes('Reference')) {
-            const textToAdd = selectedText.slice(2, -9);
-            this.insertText(textToAdd);
-        } else {
-            const range = this.getRange();
-            const initText = 'Reference';
-            selectedText = `> ${selectedText || initText}`;
-            this.replace(range, selectedText);
-            this.focus();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/underline.command.ts b/src/main/webapp/app/shared/markdown-editor/commands/underline.command.ts
deleted file mode 100644
index b7a88c662249..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/underline.command.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faUnderline } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class UnderlineCommand extends Command {
-    buttonIcon = faUnderline as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.underline';
-
-    /**
-     * @function execute
-     * @desc Add/Remove underline text
-     *       1. Check if the selected text includes (<ins>)
-     *       2. If included (ins) reduce the selected text by these elements and replace the selected text by textToAdd
-     *       3. If not included, add (<ins>) before and after the selected text and insert them into the editor
-     *       4. Underline in markdown language appears
-     */
-    execute(): void {
-        const chosenText = this.getSelectedText();
-
-        if (chosenText.includes('<ins>')) {
-            const textToAdd = chosenText.slice(5, -6);
-            this.insertText(textToAdd);
-        } else {
-            const textToAdd = `<ins>${chosenText}</ins>`;
-            this.insertText(textToAdd);
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/commands/unorderedListCommand.ts b/src/main/webapp/app/shared/markdown-editor/commands/unorderedListCommand.ts
deleted file mode 100644
index 257ea83e77ee..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/commands/unorderedListCommand.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { IconProp } from '@fortawesome/fontawesome-svg-core';
-import { faListUl } from '@fortawesome/free-solid-svg-icons';
-import { Command } from './command';
-
-export class UnorderedListCommand extends Command {
-    buttonIcon = faListUl as IconProp;
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.unorderedList';
-
-    /**
-     * @function execute
-     * @desc Use the Markdown language for creating an unordered list
-     */
-    execute(): void {
-        const extendedText = this.getExtendedSelectedText();
-        this.handleManipulation(extendedText);
-    }
-
-    /**
-     * Performs the necessary manipulations.
-     * @param extendedText the extended text
-     */
-    handleManipulation(extendedText: string[]): void {
-        let manipulatedText = '';
-
-        extendedText.forEach((line, index) => {
-            // Special case: Single empty line
-            if (line === '') {
-                if (extendedText.length === 1) {
-                    manipulatedText = '- ';
-                    return;
-                }
-            } else {
-                manipulatedText += this.manipulateLine(line);
-            }
-
-            if (index !== extendedText.length - 1) {
-                manipulatedText += '\n';
-            }
-        });
-        this.replace(this.getRange(), manipulatedText);
-    }
-
-    /**
-     * Manipulates a given line and adds or removes the - at the beginning.
-     * @param line to manipulate
-     * @return manipulated line
-     */
-    manipulateLine(line: string): string {
-        const index = line.indexOf('-');
-
-        // Calc leading whitespaces
-        const whitespaces = line.search(/\S|$/);
-
-        // There is - in this line
-        if (index !== -1) {
-            const elements = [line.slice(whitespaces, index), line.slice(index + 1)];
-
-            // Check if this is the first -
-            if (elements[0] === '' && elements[1].length >= 1 && elements[1].startsWith(' ')) {
-                // Add whitespaces and remove first whitespace after the dot
-                return ' '.repeat(whitespaces) + elements[1].substring(1);
-            }
-        }
-
-        // Add the -
-        return ' '.repeat(whitespaces) + `- ${line.substring(whitespaces)}`;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts
deleted file mode 100644
index 4a9764fc02a2..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/correctOptionCommand.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-
-export class CorrectOptionCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[correct]';
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption';
-
-    /**
-     * @function execute
-     * @desc Add a new correct answer option to the text editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + ' Enter a correct answer option here';
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the correct option
-     */
-    getOpeningIdentifier(): string {
-        return CorrectOptionCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the correct option
-     */
-    getClosingIdentifier(): string {
-        return '[/correct]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts
deleted file mode 100644
index b7070571e62d..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/credits.command.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-export class CreditsCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[credits]';
-    public static readonly TEXT = '0';
-    // ' Add points students should get for this instruction here';
-    displayCommandButton = false;
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addCredits';
-
-    /**
-     * @function execute
-     * @desc Add a credits for the corresponding instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + CreditsCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the credits
-     */
-    getOpeningIdentifier(): string {
-        return CreditsCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the credits
-     */
-    getClosingIdentifier(): string {
-        return '[/credits]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts
deleted file mode 100644
index fb2ce14041c3..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domain-multi-option-list.command.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { DomainMultiOptionCommand } from 'app/shared/markdown-editor/domainCommands/domainMultiOptionCommand';
-import { getStringSegmentPositions } from 'app/shared/util/global.utils';
-import { removeTextRange } from 'app/shared/util/markdown.util';
-
-/**
- * Allows the insertion of values within a comma separated list.
- * Will e.g. remove duplicates and append new items to the list.
- */
-export abstract class DomainMultiOptionListCommand extends DomainMultiOptionCommand {
-    protected abstract getValueMeta(): string;
-
-    setEditor(aceEditor: any) {
-        super.setEditor(aceEditor);
-
-        const autoCompleter = {
-            getCompletions: (editor: any, session: any, pos: any, prefix: any, callback: any) => {
-                callback(
-                    null,
-                    this.getValues().map(({ value, id }) => {
-                        return {
-                            caption: value,
-                            value: id,
-                            meta: this.getValueMeta(),
-                        };
-                    }),
-                );
-            },
-        };
-
-        this.addCompleter(autoCompleter);
-    }
-
-    /**
-     * Update the list of values in the multi option list. Makes sure to not add duplicates into the brackets.
-     *
-     * @function execute
-     * @desc insert selected value into text
-     */
-    execute(valueToAdd: string): void {
-        const cursorPosition = this.getCursorPosition();
-        const matchInTag = this.isCursorWithinTag();
-
-        this.clearSelection();
-
-        const newValuesList = this.generateValueList(matchInTag, valueToAdd, cursorPosition);
-        const newValuesStringified = `${this.getOpeningIdentifier()}${newValuesList.join(',')}${this.getClosingIdentifier()}`;
-        if (matchInTag) {
-            removeTextRange(
-                { col: matchInTag.matchStart, row: cursorPosition.row },
-                {
-                    col: matchInTag.matchEnd,
-                    row: cursorPosition.row,
-                },
-                this.aceEditor,
-            );
-        }
-        this.insertText(newValuesStringified);
-        this.focus();
-    }
-
-    /**
-     * Given a match, the new value to add and the cursor position, determine and return the updated value list.
-     * a) The cursor is within the brackets -> add/replace value in list.
-     * b) The cursor is NOT within the brackets -> just paste in a new value.
-     *
-     * @param match
-     * @param valueToAdd
-     * @param cursorPosition
-     */
-    private generateValueList = (
-        match: { matchStart: number; matchEnd: number; innerTagContent: string } | null,
-        valueToAdd: string,
-        cursorPosition: { row: number; column: number },
-    ): string[] => {
-        const { column } = cursorPosition;
-        // Check if the cursor is within the tag - if so, add the value to the list.
-        // Also don't add a value again that is already included.
-        if (match && !match.innerTagContent.includes(valueToAdd)) {
-            const currentValues = match.innerTagContent.split(',');
-            const stringPositions = getStringSegmentPositions(match.innerTagContent, ',');
-            const wordUnderCursor = stringPositions.find(({ start, end }) => column - 1 - match.matchStart > start && column - 1 - match.matchStart < end);
-            if (wordUnderCursor) {
-                // Case 1: Replace value.
-                return currentValues.map((val) => (val === wordUnderCursor.word ? valueToAdd : val));
-            } else if (column >= match.matchEnd - 1) {
-                // Case 2: Add value on left side.
-                return [...currentValues, valueToAdd];
-            } else if (column <= match.matchStart + 1) {
-                // Case 3: Add value on right side.
-                return [valueToAdd, ...currentValues];
-            } else {
-                // Case 4: Fallback - replace current.
-                return [valueToAdd];
-            }
-        } else if (match && match.innerTagContent.includes(valueToAdd)) {
-            // Case 5: The value is already included, do nothing.
-            return match.innerTagContent.split(',');
-        } else {
-            // Case 6: There is no content yet, just paste the current value in.
-            return [valueToAdd];
-        }
-    };
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts
deleted file mode 100644
index b5922fb35e3c..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainCommand.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { Command } from 'app/shared/markdown-editor/commands/command';
-import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
-
-/** abstract class for all domainCommands - customized commands for Artemis specific use cases
- * e.g. multiple choice questions, drag and drop questions
- * Each domain command has its own logic and a unique identifier**/
-export abstract class DomainCommand extends Command {
-    abstract getOpeningIdentifier(): string; // e.g. [exp]
-    abstract getClosingIdentifier(): string; // e.g. [/exp]
-    displayCommandButton = true;
-
-    /**
-     * Generate a regex that can be used to get the content alone or including the tags.
-     * index 0: Get content with tags around it.
-     * index 1: Get content without the tags.
-     */
-    getTagRegex(flags = ''): RegExp {
-        const escapedOpeningIdentifier = escapeStringForUseInRegex(this.getOpeningIdentifier()),
-            escapedClosingIdentifier = escapeStringForUseInRegex(this.getClosingIdentifier());
-        return new RegExp(`${escapedOpeningIdentifier}(.*)${escapedClosingIdentifier}`, flags);
-    }
-
-    /**
-     * Checks if the cursor is placed within the identifiers of a domain command.
-     * Returns the content between the identifiers if there is match, otherwise returns null.
-     */
-    isCursorWithinTag(): { matchStart: number; matchEnd: number; innerTagContent: string } | null {
-        const { row, column } = this.aceEditor.getCursorPosition(),
-            line = this.aceEditor.getSession().getLine(row),
-            regex = this.getTagRegex('g');
-
-        const indexes: Array<{ matchStart: number; matchEnd: number; innerTagContent: string }> = [];
-
-        // A line can have multiple tags in it, so we need to check for multiple matches.
-        let match = regex.exec(line);
-        while (match != undefined) {
-            indexes.push({ matchStart: match.index, matchEnd: match.index + match[0].length, innerTagContent: match[1] });
-            match = regex.exec(line);
-        }
-        const matchOnCursor = indexes.find(({ matchStart, matchEnd }) => column > matchStart && column <= matchEnd);
-        return matchOnCursor || null;
-    }
-
-    /**
-     * Checks if there is a tag in the line of the cursor.
-     * Returns the content between the identifiers if there is match, otherwise returns null.
-     */
-    isTagInRow(row: number): { matchStart: number; matchEnd: number; innerTagContent: string } | null {
-        const line = this.aceEditor.getSession().getLine(row),
-            regex = this.getTagRegex();
-
-        if (!line) {
-            return null;
-        }
-
-        const match = line.match(regex);
-        if (!match) {
-            return null;
-        }
-        return { matchStart: match.index, matchEnd: match.index + match[0].length, innerTagContent: match[1] };
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts
deleted file mode 100644
index 6918dd1adf80..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainMultiOptionCommand.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-import { ValueItem } from 'app/shared/markdown-editor/command-constants';
-
-/**
- * This domain command will be used as a dropdown in the markdown editor.
- */
-export abstract class DomainMultiOptionCommand extends DomainCommand {
-    protected values: ValueItem[] = [];
-    setValues(values: ValueItem[]) {
-        this.values = values;
-    }
-    getValues() {
-        return this.values;
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts
deleted file mode 100644
index ff2c857c2558..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/domainTag.command.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-
-/**
- * This domain command will be used as a button in the markdown editor.
- */
-export abstract class DomainTagCommand extends DomainCommand {}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts
deleted file mode 100644
index e8e0ccbb7efd..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/explanation.command.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-
-export const explanationCommandIdentifier = '[exp]';
-
-export class ExplanationCommand extends DomainTagCommand {
-    public static readonly TEXT = ' Add an explanation here (only visible in feedback after quiz has ended)';
-
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addExplanation';
-
-    /**
-     * @function execute
-     * @desc Add a new explanation to answer option or question title in the text editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n\t' + this.getOpeningIdentifier() + ExplanationCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the explanation
-     */
-    getOpeningIdentifier(): string {
-        return explanationCommandIdentifier;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the explanation
-     */
-    getClosingIdentifier(): string {
-        return '[/exp]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts
deleted file mode 100644
index 739b531dbff5..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/feedback.command.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-export class FeedbackCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[feedback]';
-    public static readonly TEXT = 'Add feedback for students here (visible for students)';
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addFeedback';
-    displayCommandButton = false;
-
-    /**
-     * @function execute
-     * @desc Add a new feedback for the corresponding instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + FeedbackCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the feedback
-     */
-    getOpeningIdentifier(): string {
-        return FeedbackCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the feedback
-     */
-    getClosingIdentifier(): string {
-        return '[/feedback]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts
deleted file mode 100644
index 372842e7dbf7..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingCriterionCommand.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command';
-
-export class GradingCriterionCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[criterion]';
-    public static readonly TEXT = ' Add criteria title (only visible for tutors)';
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addCriterion';
-    displayCommandButton = true;
-    gradingInstructionCommand = new GradingInstructionCommand();
-
-    /**
-     * @function execute
-     * @desc Add a new criterion for the corresponding exercise in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + GradingCriterionCommand.TEXT + '\n' + this.gradingInstructionCommand.instructionText();
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the criterion
-     */
-    getOpeningIdentifier(): string {
-        return GradingCriterionCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the criterion
-     */
-    getClosingIdentifier(): string {
-        return '[/criterion]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts
deleted file mode 100644
index 31d3179aacc3..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingInstruction.command.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command';
-import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command';
-import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand';
-import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command';
-
-export class GradingInstructionCommand extends DomainTagCommand {
-    creditsCommand = new CreditsCommand();
-    gradingScaleCommand = new GradingScaleCommand();
-    instructionCommand = new InstructionDescriptionCommand();
-    feedbackCommand = new FeedbackCommand();
-    usageCountCommand = new UsageCountCommand();
-
-    public static readonly IDENTIFIER = '[instruction]';
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addInstruction';
-
-    instructionText(): string {
-        return (
-            this.getOpeningIdentifier() +
-            '\n' +
-            '\t' +
-            (this.creditsCommand.getOpeningIdentifier() +
-                CreditsCommand.TEXT +
-                '\n' +
-                '\t' +
-                this.gradingScaleCommand.getOpeningIdentifier() +
-                GradingScaleCommand.TEXT +
-                '\n' +
-                '\t' +
-                this.instructionCommand.getOpeningIdentifier() +
-                InstructionDescriptionCommand.TEXT +
-                '\n' +
-                '\t' +
-                this.feedbackCommand.getOpeningIdentifier() +
-                FeedbackCommand.TEXT +
-                '\n' +
-                '\t' +
-                this.usageCountCommand.getOpeningIdentifier() +
-                UsageCountCommand.TEXT) +
-            '\n'
-        );
-    }
-    /**
-     * @function execute
-     * @desc Add a new grading instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = this.instructionText();
-
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the grading instruction
-     */
-    getOpeningIdentifier(): string {
-        return GradingInstructionCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the grading instruction
-     */
-    getClosingIdentifier(): string {
-        return '[/instruction]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts
deleted file mode 100644
index df7834baf6b3..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/gradingScaleCommand.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-export class GradingScaleCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[gradingScale]';
-    public static readonly TEXT = 'Add instruction grading scale here (only visible for tutors)';
-    displayCommandButton = false;
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addGradingScale';
-
-    /**
-     * @function execute
-     * @desc Add a new gradingScale to the instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + GradingScaleCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the gradingScale
-     */
-    getOpeningIdentifier(): string {
-        return GradingScaleCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the gradingScale
-     */
-    getClosingIdentifier(): string {
-        return '[/gradingScale]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts
deleted file mode 100644
index 380bd4efa65e..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/hint.command.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-
-export const hintCommentIdentifier = '[hint]';
-
-export class HintCommand extends DomainTagCommand {
-    public static readonly TEXT = ' Add a hint here (visible during the quiz via ?-Button)';
-
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addHint';
-
-    /**
-     * @function execute
-     * @desc Add a new hint to the answer option or question title in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n\t' + this.getOpeningIdentifier() + HintCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the hint
-     */
-    getOpeningIdentifier(): string {
-        return hintCommentIdentifier;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the hint
-     */
-    getClosingIdentifier(): string {
-        return '[/hint]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts
deleted file mode 100644
index 02891d0d345f..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/incorrectOptionCommand.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-
-export class IncorrectOptionCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[wrong]';
-    buttonTranslationString = 'artemisApp.multipleChoiceQuestion.editor.addInCorrectAnswerOption';
-
-    /**
-     * @function execute
-     * @desc Add a new incorrect answer option to the text editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + ' Enter a wrong answer option here';
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the correct option
-     */
-    getOpeningIdentifier(): string {
-        return IncorrectOptionCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the correct option
-     */
-    getClosingIdentifier(): string {
-        return '[/wrong]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts
deleted file mode 100644
index 00e10e7d10b4..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/instructionDescription.command.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-export class InstructionDescriptionCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[description]';
-    public static readonly TEXT = 'Add grading instruction here (only visible for tutors)';
-    displayCommandButton = false;
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addInstruction';
-
-    /**
-     * @function execute
-     * @desc Add a new description of the instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + InstructionDescriptionCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the instruction description
-     */
-    getOpeningIdentifier(): string {
-        return InstructionDescriptionCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the instruction description
-     */
-    getClosingIdentifier(): string {
-        return '[/description]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/task.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/task.command.ts
deleted file mode 100644
index 721785b5d4fd..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/task.command.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
-
-export class TaskCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[task]';
-    public static readonly TASK_PLACE_HOLDER = 'Task Short Description';
-    public static readonly TEST_CASE_PLACEHOLDER = 'testCaseName';
-
-    buttonTranslationString = 'artemisApp.programmingExercise.problemStatement.taskCommand';
-
-    setEditor(aceEditor: any) {
-        super.setEditor(aceEditor);
-
-        const taskCommandCompleter = {
-            getCompletions: (editor: any, session: any, pos: any, prefix: any, callback: any) => {
-                callback(null, { caption: 'task', value: this.getTask(), meta: 'insert task' });
-            },
-        };
-        this.addCompleter(taskCommandCompleter);
-    }
-
-    /**
-     * The task structure is coupled to the value used in `ProgrammingExerciseTaskService` in the server and
-     * `ProgrammingExerciseTaskExtensionWrapper` in the client
-     * If you change the template, make sure to change it in all places!
-     */
-    private getTask() {
-        return `${this.getOpeningIdentifier()}[${TaskCommand.TASK_PLACE_HOLDER}](${TaskCommand.TEST_CASE_PLACEHOLDER})`;
-    }
-
-    public getTagRegex(flags = ''): RegExp {
-        const escapedOpeningIdentifier = escapeStringForUseInRegex(this.getOpeningIdentifier());
-        return new RegExp(`${escapedOpeningIdentifier}(.*)`, flags);
-    }
-
-    /**
-     * @function execute
-     * @desc add a new task. doesn't use the closing identifier for legacy reasons.
-     */
-    execute(): void {
-        const currentLine = this.getCurrentLine();
-        const startingNumber = currentLine.match(/(\d+)\..*/);
-        const thisLineNumber = startingNumber && startingNumber.length > 1 ? `\n${Number(startingNumber[1]) + 1}.` : '1.';
-        const taskText = `${thisLineNumber} ${this.getTask()}`;
-        this.moveCursorToEndOfRow();
-        this.insertText(taskText);
-        this.focus();
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the task
-     */
-    getOpeningIdentifier(): string {
-        return TaskCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the explanation
-     */
-    getClosingIdentifier(): string {
-        return '[/task]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/testCase.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/testCase.command.ts
deleted file mode 100644
index 6380c73c3234..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/programming-exercise/testCase.command.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { DomainMultiOptionListCommand } from 'app/shared/markdown-editor/domainCommands/domain-multi-option-list.command';
-
-export class TestCaseCommand extends DomainMultiOptionListCommand {
-    buttonTranslationString = 'artemisApp.programmingExercise.problemStatement.testCaseCommand';
-
-    protected getValueMeta(): string {
-        return 'testCase';
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the task
-     */
-    getOpeningIdentifier(): string {
-        return '(';
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the explanation
-     */
-    getClosingIdentifier(): string {
-        return ')';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/domainCommands/usageCount.command.ts b/src/main/webapp/app/shared/markdown-editor/domainCommands/usageCount.command.ts
deleted file mode 100644
index 9fd37ec38da3..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/domainCommands/usageCount.command.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { DomainTagCommand } from 'app/shared/markdown-editor/domainCommands/domainTag.command';
-import { addTextAtCursor } from 'app/shared/util/markdown.util';
-
-export class UsageCountCommand extends DomainTagCommand {
-    public static readonly IDENTIFIER = '[maxCountInScore]';
-    public static readonly TEXT = '0';
-    // 'Add how often the credits should be taken into consideration for this instruction: 0 -> the credits should be added as often as the instruction occurs' +
-    // ' x of type int -> credits will be added x times only, if instruction occurs more than x times it will not be counted and instead marked as subsequent fault';
-
-    buttonTranslationString = 'artemisApp.assessmentInstructions.instructions.editor.addCountUsage';
-    displayCommandButton = false;
-
-    /**
-     * @function execute
-     * @desc Add a new usage count for the corresponding instruction in the editor at the location of the cursor
-     */
-    execute(): void {
-        const text = '\n' + this.getOpeningIdentifier() + UsageCountCommand.TEXT;
-        addTextAtCursor(text, this.aceEditor);
-    }
-
-    /**
-     * @function getOpeningIdentifier
-     * @desc identify the start of the usage count
-     */
-    getOpeningIdentifier(): string {
-        return UsageCountCommand.IDENTIFIER;
-    }
-
-    /**
-     * @function getClosingIdentifier
-     * @desc identify the end of the usage count
-     */
-    getClosingIdentifier(): string {
-        return '[/maxCountInScore]';
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html
deleted file mode 100644
index 441a919c35f5..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<div #wrapper class="markdown-editor-wrapper">
-    <nav ngbNav #nav="ngbNav" class="nav-tabs" [destroyOnHide]="false" (navChange)="changeNavigation($event)">
-        <!-- editor -->
-        <ng-container ngbNavItem="editor_edit">
-            @if (showEditButton) {
-                <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0">{{ 'entity.action.edit' | artemisTranslate }}</a>
-            }
-            <ng-template ngbNavContent>
-                <div [ngStyle]="{ 'minHeight.px': minHeightEditor }" class="height-100 markdown-editor d-flex flex-column" [id]="uniqueMarkdownEditorId">
-                    <jhi-ace-editor
-                        #aceEditor
-                        [mode]="aceEditorOptions.mode"
-                        [autoUpdateContent]="aceEditorOptions.autoUpdateContent"
-                        [text]="markdown || ''"
-                        (textChange)="markdownTextChange($event)"
-                        class="form-control markdown-editor__content"
-                        (textChanged)="editorContentString = $event"
-                        [class.file-input]="enableFileUpload"
-                        (dragover)="enableFileUpload ? $event.preventDefault() : ''"
-                        (drop)="enableFileUpload ? onFileDrop($event) : ''"
-                        (paste)="enableFileUpload ? onFilePaste($event) : ''"
-                    />
-                    <!-- manual input for file upload -->
-                    @if (enableFileUpload) {
-                        <input
-                            [id]="'file-upload ' + uniqueMarkdownEditorId"
-                            class="markdown-editor__file-input"
-                            type="file"
-                            accept="image/*"
-                            [multiple]="true"
-                            (change)="onFileUpload($event)"
-                        />
-                        <label [for]="'file-upload ' + uniqueMarkdownEditorId" class="markdown-editor__file-label d-inline">
-                            <div class="row mx-0 align-items-baseline">
-                                <span class="col upload-subtitle">{{ 'artemisApp.markdownEditor.fileUpload' | artemisTranslate }}</span>
-                                <a class="col-auto" href="http://demo.showdownjs.com">
-                                    <fa-icon [icon]="faQuestionCircle" [ngbTooltip]="'artemisApp.markdownEditor.guide' | artemisTranslate" />
-                                </a>
-                            </div>
-                        </label>
-                    }
-                    <!-- Required for resizing; don't remove empty span -->
-                    @if (enableResize) {
-                        <fa-icon [icon]="faGripLines" class="rg-bottom md-resize-icon"><span></span></fa-icon>
-                    }
-                </div>
-            </ng-template>
-        </ng-container>
-        <!-- visual Mode -->
-        <ng-container ngbNavItem="editor_visual">
-            @if (showVisualModeButton) {
-                <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0">{{ 'entity.action.visual' | artemisTranslate }}</a>
-            }
-            <ng-template ngbNavContent>
-                <ng-content select="[#visual]" />
-            </ng-template>
-        </ng-container>
-        <!-- preview -->
-        <ng-container ngbNavItem="editor_preview">
-            @if (showPreviewButton) {
-                <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0">{{ 'entity.action.preview' | artemisTranslate }}</a>
-            }
-            <ng-template ngbNavContent>
-                <ng-content select="[#preview]" />
-                @if (showDefaultPreview) {
-                    <div class="pt-1 background-editor-high markdown-preview" [innerHTML]="previewTextAsHtml" [ngStyle]="{ 'minHeight.px': 0.75 * minHeightEditor }">Preview</div>
-                }
-            </ng-template>
-        </ng-container>
-        <!-- commands -->
-        @if (!previewMode && !visualMode) {
-            <ng-container ngbNavItem>
-                <div class="markdown-editor__commands">
-                    <div class="markdown-editor__commands-default">
-                        <!--default commands (e.g. bold)-->
-                        @for (command of defaultCommands | negatedTypeCheck: MultiOptionCommand; track defaultCommands.indexOf(command)) {
-                            <button type="button" class="btn btn-sm py-0" (click)="command.execute()" [ngbTooltip]="command.buttonTranslationString | artemisTranslate">
-                                <fa-icon [icon]="command.buttonIcon" />
-                            </button>
-                        }
-                        <!--style command -->
-                        @if (headerCommands.length > 0) {
-                            <div class="btn-group" ngbDropdown role="group" aria-label="Button group with nested dropdown">
-                                <button class="btn btn-sm px-2 py-0" type="button" id="dropdownBasic1" ngbDropdownToggle>
-                                    {{ 'artemisApp.multipleChoiceQuestion.editor.style' | artemisTranslate }}
-                                </button>
-                                <div class="dropdown-menu" ngbDropdownMenu>
-                                    @for (command of headerCommands; track command) {
-                                        <button class="dropdown-item" (click)="command.execute()" type="button">
-                                            {{ command.buttonTranslationString | artemisTranslate }}
-                                        </button>
-                                    }
-                                </div>
-                            </div>
-                        }
-                        @for (command of defaultCommands | typeCheck: InteractiveSearchCommand; track defaultCommands.indexOf(command)) {
-                            <jhi-select-with-search [command]="command" [editorContentString]="editorContentString" />
-                        }
-                        @for (command of defaultCommands | typeCheck: MultiOptionCommand | negatedTypeCheck: InteractiveSearchCommand; track defaultCommands.indexOf(command)) {
-                            <div>
-                                <button
-                                    mat-button
-                                    [matMenuTriggerFor]="isTypeOfExerciseReferenceCommand(command) ? subMenuExercise : subMenuLecture"
-                                    type="button"
-                                    class="btn btn-sm m-0 ml-1 py-0"
-                                >
-                                    <span class="default-font-size">{{ command.buttonTranslationString | artemisTranslate }}</span>
-                                    <fa-icon [icon]="faAngleDown" class="ms-1" />
-                                </button>
-                                <mat-menu #subMenuExercise="matMenu" type="button">
-                                    @if (!command.getValues() || command.getValues().length === 0) {
-                                        <button mat-button [disabled]="true" jhiTranslate="global.generic.emptyList" type="button"></button>
-                                    }
-                                    @for (item of command.getValues(); track item) {
-                                        @if (item.type !== 'LECTURE') {
-                                            <button mat-menu-item (click)="command.execute(item.id, item.type)" type="button">{{ item.value }}</button>
-                                        }
-                                    }
-                                </mat-menu>
-                                <mat-menu #subMenuLecture="matMenu" type="button">
-                                    @if (!command.getValues() || command.getValues().length === 0) {
-                                        <button mat-button [disabled]="true" jhiTranslate="global.generic.emptyList" type="button"></button>
-                                    }
-                                    @for (lecture of command.getValues(); track lecture.id) {
-                                        @if (lecture.type === 'LECTURE') {
-                                            <button mat-menu-item [matMenuTriggerFor]="lectureMenuUnits" type="button">
-                                                {{ lecture.value }}
-                                            </button>
-                                        }
-                                        <mat-menu #lectureMenuUnits="matMenu" type="button">
-                                            @if (lecture.type === 'LECTURE') {
-                                                <button mat-menu-item (click)="command.execute(lecture.id, lecture.type)" type="button" class="border-bottom">
-                                                    {{ lecture.value }}
-                                                </button>
-                                            }
-                                            @for (unit of lecture.attachmentUnits; track unit.id) {
-                                                @if (unit.courseArtifactType === 'ATTACHMENT_UNITS') {
-                                                    <button mat-menu-item [matMenuTriggerFor]="lectureMenuUnitsSlide" type="button">
-                                                        <span>{{ unit.value }}</span>
-                                                    </button>
-                                                }
-                                                <mat-menu #lectureMenuUnitsSlide="matMenu" type="button">
-                                                    <button
-                                                        mat-menu-item
-                                                        (click)="command.execute(lecture.id, lecture.type, undefined, unit.id)"
-                                                        type="button"
-                                                        class="border-bottom"
-                                                    >
-                                                        {{ unit.value }}
-                                                    </button>
-                                                    @if (!unit.slides || unit.slides.length === 0) {
-                                                        <button mat-button [disabled]="true" jhiTranslate="global.generic.emptyList" type="button"></button>
-                                                    }
-                                                    @for (slide of unit.slides; track slide.id) {
-                                                        <button mat-menu-item (click)="command.execute(lecture.id, lecture.type, undefined, unit.id, slide.id)" type="button">
-                                                            <span>Slide {{ slide.slideNumber }}</span>
-                                                        </button>
-                                                    }
-                                                </mat-menu>
-                                            }
-                                            @for (attachment of lecture.elements; track attachment.id) {
-                                                <button mat-menu-item type="button" (click)="command.execute(lecture.id, attachment.type, attachment.id)">
-                                                    <span>{{ attachment.value }}</span>
-                                                </button>
-                                            }
-                                        </mat-menu>
-                                    }
-                                </mat-menu>
-                            </div>
-                        }
-                        <!--color picker command -->
-                        @if (colorCommands.length > 0) {
-                            <div class="btn-group col-xs-6">
-                                <div class="color-preview btn btn-sm px-2 py-0" (click)="openColorSelector($event)">{{ 'artemisApp.markdownEditor.color' | artemisTranslate }}</div>
-                                <jhi-color-selector [tagColors]="markdownColors" (selectedColor)="onSelectedColor($event)" />
-                            </div>
-                        }
-                        <!-- domain commands -->
-                        @if (domainCommands && domainCommands.length !== 0) {
-                            <div class="markdown-editor__commands-domain">
-                                @for (command of domainCommands | typeCheck: DomainTagCommand; track domainCommands.indexOf(command)) {
-                                    @if (command.displayCommandButton) {
-                                        <div class="btn btn-sm px-2 py-0" (click)="command.execute()">
-                                            {{ command.buttonTranslationString | artemisTranslate }}
-                                        </div>
-                                    }
-                                }
-                                @for (command of domainCommands | typeCheck: DomainMultiOptionCommand; track domainCommands.indexOf(command)) {
-                                    <div ngbDropdown class="btn-group">
-                                        <button class="btn btn-sm px-2 py-0" type="button" ngbDropdownToggle>
-                                            {{ command.buttonTranslationString | artemisTranslate }}
-                                        </button>
-                                        <div ngbDropdownMenu>
-                                            @for (item of command.getValues(); track item) {
-                                                <button class="btn-sm" type="button" (click)="command.execute(item.id)" ngbDropdownItem>
-                                                    {{ item.value }}
-                                                </button>
-                                            }
-                                            @if (!command.getValues().length) {
-                                                <button [disabled]="true" ngbDropdownItem jhiTranslate="global.generic.emptyList"></button>
-                                            }
-                                        </div>
-                                    </div>
-                                }
-                            </div>
-                        }
-                        <div class="ms-auto">
-                            @for (command of metaCommands; track metaCommands.indexOf(command)) {
-                                <button type="button" class="btn btn-sm px-2 py-0" (click)="command.execute()" [ngbTooltip]="command.buttonTranslationString | artemisTranslate">
-                                    <fa-icon [icon]="command.buttonIcon" />
-                                </button>
-                            }
-                        </div>
-                    </div>
-                </div>
-            </ng-container>
-        }
-    </nav>
-    <div [ngbNavOutlet]="nav"></div>
-</div>
diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss
deleted file mode 100644
index 008cc9349fe4..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.scss
+++ /dev/null
@@ -1,132 +0,0 @@
-.markdown-editor-wrapper {
-    display: flex;
-    flex-flow: column nowrap;
-    flex: 1 1 auto;
-    height: inherit;
-    color: var(--md-wrapper-color);
-
-    // This is a fix for using the fullscreen mode on Safari.
-    &:-webkit-full-screen {
-        width: 100%;
-        height: 100%;
-    }
-
-    .md-resize-icon {
-        color: var(--md-resize-icon-color);
-    }
-
-    .tab-list {
-        background: var(--md-tab-list-bg);
-    }
-    .tab-content,
-    .tab-content > .active {
-        display: flex;
-        flex-flow: column nowrap;
-        flex: 1 1 auto;
-        height: 100%;
-    }
-
-    .no-dropdown-indicator::after {
-        display: none;
-    }
-
-    .markdown-editor {
-        display: flex;
-        flex-flow: column nowrap;
-        flex: 1 1 auto;
-        touch-action: none;
-
-        // Fix for full screen mode, otherwise the color is black.
-        background-color: var(--md-editor-background);
-
-        &__content {
-            height: 100% !important;
-            width: 100%;
-            flex: 1 1 auto;
-            overflow: auto;
-        }
-
-        .file-input {
-            border-bottom: 1px dotted var(--md-file-input-border-color);
-            border-bottom-left-radius: 0;
-            border-bottom-right-radius: 0;
-        }
-
-        &__file-input {
-            // cannot be set to 'display: false' or similar
-            // input value would not be sent
-            width: 0.1px;
-            height: 0.1px;
-            opacity: 0;
-            overflow: hidden;
-            position: absolute;
-            z-index: -1;
-        }
-
-        &__file-input:focus,
-        &__file-label:focus {
-            outline: 1px dotted #000;
-            outline: -webkit-focus-ring-color auto 5px;
-        }
-
-        &__file-label {
-            cursor: pointer;
-            width: 100%;
-            border: 1px solid var(--border-color);
-            border-top: none;
-            border-radius: 0 0.15em 0.15em 0;
-
-            .upload-subtitle {
-                font-size: 12px;
-                color: var(--bs-secondary);
-            }
-        }
-
-        &__markdown {
-            height: inherit;
-            overflow: auto;
-            padding: 1rem;
-        }
-
-        &__commands {
-            &-default,
-            &-domain {
-                display: flex;
-                flex-flow: row wrap;
-                align-items: center;
-            }
-
-            .mat-mdc-button {
-                height: fit-content;
-            }
-        }
-
-        .rg-bottom {
-            align-self: center;
-        }
-    }
-}
-
-.background-editor-high {
-    overflow: scroll;
-}
-
-.dropdown-menu {
-    max-height: 300px;
-    overflow-y: auto;
-
-    li {
-        position: relative;
-    }
-}
-
-.nested {
-    padding-left: 30px;
-}
-.nested-slide {
-    padding-left: 50px;
-}
-
-.default-font-size {
-    font-size: var(--bs-body-font-size);
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts b/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts
deleted file mode 100644
index 1795b4718b6e..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.component.ts
+++ /dev/null
@@ -1,519 +0,0 @@
-import { AfterViewInit, Component, ContentChild, ElementRef, EventEmitter, Input, Output, ViewChild, ViewEncapsulation } from '@angular/core';
-import { SafeHtml } from '@angular/platform-browser';
-// Note: this import has to be before the 'brace' imports
-import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component';
-import 'brace/theme/chrome';
-import 'brace/mode/markdown';
-import 'brace/mode/latex';
-import 'brace/ext/language_tools';
-import { Interactable } from '@interactjs/core/Interactable';
-import interact from 'interactjs';
-import { ArtemisMarkdownService } from 'app/shared/markdown.service';
-import { FileUploaderService } from 'app/shared/http/file-uploader.service';
-import { AlertService, AlertType } from 'app/core/util/alert.service';
-import { ColorSelectorComponent } from 'app/shared/color-selector/color-selector.component';
-import { DomainTagCommand } from './domainCommands/domainTag.command';
-import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
-import { UnderlineCommand } from 'app/shared/markdown-editor/commands/underline.command';
-import { ColorPickerCommand } from 'app/shared/markdown-editor/commands/colorPicker.command';
-import { BoldCommand } from 'app/shared/markdown-editor/commands/bold.command';
-import { AttachmentCommand } from 'app/shared/markdown-editor/commands/attachmentCommand';
-import { ReferenceCommand } from 'app/shared/markdown-editor/commands/reference.command';
-import { DomainMultiOptionCommand } from 'app/shared/markdown-editor/domainCommands/domainMultiOptionCommand';
-import { FullscreenCommand } from 'app/shared/markdown-editor/commands/fullscreen.command';
-import { HeadingOneCommand } from 'app/shared/markdown-editor/commands/headingOne.command';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command';
-import { OrderedListCommand } from 'app/shared/markdown-editor/commands/orderedListCommand';
-import { HeadingTwoCommand } from 'app/shared/markdown-editor/commands/headingTwo.command';
-import { LinkCommand } from 'app/shared/markdown-editor/commands/link.command';
-import { CodeCommand } from 'app/shared/markdown-editor/commands/code.command';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-import { UnorderedListCommand } from 'app/shared/markdown-editor/commands/unorderedListCommand';
-import { HeadingThreeCommand } from 'app/shared/markdown-editor/commands/headingThree.command';
-import { CodeBlockCommand } from 'app/shared/markdown-editor/commands/codeblock.command';
-import { faAngleDown, faAngleRight, faGripLines, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
-import { MultiOptionCommand } from 'app/shared/markdown-editor/commands/multiOptionCommand';
-import { v4 as uuid } from 'uuid';
-import { MultipleChoiceVisualQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component';
-import { ExerciseReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand';
-import { InteractiveSearchCommand } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-
-export enum MarkdownEditorHeight {
-    INLINE = 100,
-    SMALL = 200,
-    MEDIUM = 500,
-    LARGE = 1000,
-    EXTRA_LARGE = 1500,
-}
-
-export enum EditorMode {
-    NONE = 'none',
-    LATEX = 'latex',
-}
-
-const getAceMode = (mode: EditorMode) => {
-    switch (mode) {
-        case EditorMode.LATEX:
-            return 'ace/mode/latex';
-        case EditorMode.NONE:
-            return null;
-        default:
-            return null;
-    }
-};
-
-@Component({
-    selector: 'jhi-markdown-editor',
-    templateUrl: './markdown-editor.component.html',
-    styleUrls: ['./markdown-editor.component.scss'],
-    encapsulation: ViewEncapsulation.None,
-})
-export class MarkdownEditorComponent implements AfterViewInit {
-    public MultiOptionCommand = MultiOptionCommand;
-    public DomainMultiOptionCommand = DomainMultiOptionCommand;
-    public DomainTagCommand = DomainTagCommand;
-    public InteractiveSearchCommand = InteractiveSearchCommand;
-    // This ref is used for entering the fullscreen mode.
-    @ViewChild('wrapper', { read: ElementRef, static: false }) wrapper: ElementRef;
-    @ViewChild('aceEditor', { static: false })
-    aceEditorContainer: AceEditorComponent;
-    aceEditorOptions = {
-        autoUpdateContent: true,
-        mode: 'markdown',
-    };
-    @ViewChild(ColorSelectorComponent, { static: false }) colorSelector: ColorSelectorComponent;
-
-    /** {string} which is initially displayed in the editor generated and passed on from the parent component*/
-    @Input() markdown?: string;
-    @Input() editorMode = EditorMode.NONE;
-    @Input() showLineNumbers = false;
-    @Output() markdownChange = new EventEmitter<string>();
-    @Output() html = new EventEmitter<SafeHtml | null>();
-
-    /** default colors for the markdown editor*/
-    markdownColors = ['#ca2024', '#3ea119', '#ffffff', '#000000', '#fffa5c', '#0d3cc2', '#b05db8', '#d86b1f'];
-    selectedColor = '#000000';
-    /** {array} containing all colorPickerCommands
-     * IMPORTANT: If you want to use the colorpicker you have to implement <div class="markdown-preview"></div>
-     * because the class definitions are saved within that method*/
-    @Input() colorCommands: Command[] = [new ColorPickerCommand()];
-
-    /**
-     * Use this array for commands that are not related to the markdown but to the editor (e.g. fullscreen mode).
-     * These elements will be displayed on the right side of the command bar.
-     */
-    @Input() metaCommands: Command[] = [new FullscreenCommand()];
-
-    /** {array} containing all default commands accessible for the editor per default */
-    @Input() defaultCommands: Command[] = [
-        new BoldCommand(),
-        new ItalicCommand(),
-        new UnderlineCommand(),
-        new ReferenceCommand(),
-        new CodeCommand(),
-        new CodeBlockCommand(),
-        new LinkCommand(),
-        new AttachmentCommand(),
-        new OrderedListCommand(),
-        new UnorderedListCommand(),
-    ];
-
-    /** {array} containing all header commands accessible for the markdown editor per default*/
-    @Input() headerCommands: Command[] = [new HeadingOneCommand(), new HeadingTwoCommand(), new HeadingThreeCommand()];
-
-    /** {domainCommands} containing all domain commands which need to be set by the parent component which contains the markdown editor */
-    @Input() domainCommands: Array<DomainCommand>;
-
-    /** {textWithDomainCommandsFound} emits an {array} of text lines with the corresponding domain command to the parent component which contains the markdown editor */
-    @Output() textWithDomainCommandsFound = new EventEmitter<[string, DomainCommand | null][]>();
-
-    @Output() onPreviewSelect = new EventEmitter();
-    @Output() onEditSelect = new EventEmitter();
-
-    /** {showPreviewButton}
-     * 1. true -> the preview of the editor is used
-     * 2. false -> the preview of the parent component is used, parent has to set this value to false with an input */
-    @Input() showPreviewButton = true;
-
-    /**
-     * true -> the markdown content will be rendered and shown, used when there are no special additions (e.g. text exercises)
-     * false -> the parent component adds its own preview content with id=preview. Used e.g. for programming exercises
-     */
-    @Input() showDefaultPreview = true;
-
-    @Input() showEditButton = true;
-
-    @Input() showVisualModeButton = false;
-
-    /** {previewTextAsHtml} text that is emitted to the parent component if the parent does not use any domain commands */
-    previewTextAsHtml: SafeHtml | null;
-
-    /** {previewMode} when editor is created the preview is set to false, since the edit mode is set active */
-    previewMode = false;
-
-    /** {visualMode} when editor is created the visual mode is set to false, since the edit mode is set active */
-    visualMode = false;
-    @Input()
-    minHeightEditor = MarkdownEditorHeight.SMALL.valueOf();
-
-    @ContentChild(MultipleChoiceVisualQuestionComponent, { static: false }) visualChild: MultipleChoiceVisualQuestionComponent;
-
-    /** Resizable constants **/
-    @Input()
-    enableResize = true;
-    @Input()
-    resizableMaxHeight = MarkdownEditorHeight.LARGE;
-    @Input()
-    resizableMinHeight = MarkdownEditorHeight.SMALL;
-    interactResizable: Interactable;
-
-    /** {enableFileUpload}
-     * whether to show the file upload field and enable the drag and drop functionality
-     * enabled by default
-     */
-    @Input()
-    enableFileUpload = true;
-
-    // Icons
-    faQuestionCircle = faQuestionCircle;
-    faGripLines = faGripLines;
-    faAngleRight = faAngleRight;
-    faAngleDown = faAngleDown;
-
-    uniqueMarkdownEditorId: string;
-
-    editorContentString: string;
-
-    constructor(
-        private artemisMarkdown: ArtemisMarkdownService,
-        private fileUploaderService: FileUploaderService,
-        private alertService: AlertService,
-    ) {
-        this.uniqueMarkdownEditorId = 'markdown-editor-' + uuid();
-    }
-
-    /** opens the button for selecting the color */
-    openColorSelector(event: MouseEvent) {
-        const marginTop = 35;
-        const height = 110;
-        this.colorSelector.openColorSelector(event, marginTop, height);
-    }
-
-    /** selected text is changed into the chosen color */
-    onSelectedColor(selectedColor: string) {
-        this.selectedColor = selectedColor;
-        this.colorCommands[0].execute(selectedColor);
-    }
-
-    /**
-     * @function addCommand
-     * @param command
-     * @desc customize the user interface of the markdown editor by adding a command
-     */
-    addCommand(command: Command) {
-        this.defaultCommands.push(command);
-    }
-
-    /**
-     * @function removeCommand
-     * @param classRef Command
-     * @desc customize the user interface of the markdown editor by removing a command
-     */
-    removeCommand(classRef: typeof Command) {
-        setTimeout(() => (this.defaultCommands = this.defaultCommands.filter((element) => !(element instanceof classRef))));
-    }
-
-    isTypeOfExerciseReferenceCommand(commandToCheck: MultiOptionCommand) {
-        return commandToCheck instanceof ExerciseReferenceCommand;
-    }
-
-    ngAfterViewInit(): void {
-        // Commands may want to add custom completers - remove standard completers of the ace editor.
-        this.aceEditorContainer.getEditor().setOptions({
-            enableBasicAutocompletion: true,
-            enableLiveAutocompletion: true,
-        });
-        this.aceEditorContainer.getEditor().completers = [];
-
-        if (this.domainCommands == undefined || this.domainCommands.length === 0) {
-            [...this.defaultCommands, ...this.colorCommands, ...(this.headerCommands || []), ...this.metaCommands].forEach((command) => {
-                command.setEditor(this.aceEditorContainer.getEditor());
-                command.setMarkdownWrapper(this.wrapper);
-            });
-        } else {
-            [...this.defaultCommands, ...this.domainCommands, ...this.colorCommands, ...(this.headerCommands || []), ...this.metaCommands].forEach((command) => {
-                command.setEditor(this.aceEditorContainer.getEditor());
-                command.setMarkdownWrapper(this.wrapper);
-            });
-        }
-        this.setupMarkdownEditor();
-        const selectedAceMode = getAceMode(this.editorMode);
-        if (selectedAceMode) {
-            this.aceEditorContainer.getEditor().getSession().setMode(selectedAceMode);
-        }
-
-        if (this.enableResize) {
-            this.setupResizable();
-        }
-    }
-
-    /**
-     * @function setupQuestionEditor
-     * @desc Initializes the ace editor
-     */
-    setupMarkdownEditor(): void {
-        this.aceEditorContainer.getEditor().renderer.setShowGutter(this.showLineNumbers);
-        this.aceEditorContainer.getEditor().renderer.setPadding(10);
-        this.aceEditorContainer.getEditor().renderer.setScrollMargin(8, 8);
-        this.aceEditorContainer.getEditor().setHighlightActiveLine(false);
-        this.aceEditorContainer.getEditor().setShowPrintMargin(false);
-        this.aceEditorContainer.getEditor().clearSelection();
-        this.aceEditorContainer.getEditor().setAutoScrollEditorIntoView(true);
-        this.aceEditorContainer.getEditor().setOptions({ wrap: true });
-    }
-
-    /**
-     * @function setupResizable
-     * @desc Sets up resizable to enable resizing for the user
-     */
-    setupResizable(): void {
-        // Use a unique, random ID to select the editor
-        // This is required to select the correct one in case multiple editors are used at the same time
-        const selector = '#' + this.uniqueMarkdownEditorId;
-
-        // unregister previously set event listeners for class elements
-        interact(selector).unset();
-
-        this.interactResizable = interact(selector)
-            .resizable({
-                // Enable resize from top edge; triggered by class rg-top
-                edges: { left: false, right: false, bottom: '.rg-bottom', top: false },
-                // Set min and max height
-                modifiers: [
-                    interact.modifiers!.restrictSize({
-                        min: { width: 0, height: this.resizableMinHeight },
-                        max: { width: 2000, height: this.resizableMaxHeight },
-                    }),
-                ],
-                inertia: true,
-            })
-            .on('resizestart', function (event: any) {
-                event.target.classList.add('card-resizable');
-            })
-            .on('resizeend', (event: any) => {
-                event.target.classList.remove('card-resizable');
-            })
-            .on('resizemove', (event: any) => {
-                const target = event.target;
-                // Update element height
-                target.style.height = event.rect.height + 'px';
-                this.aceEditorContainer.getEditor().resize();
-            });
-    }
-
-    /**
-     * Parses markdown to generate a preview if the standard preview is used and/or searches for domain command identifiers.
-     * Will emit events for both the generated preview and domain commands.
-     *
-     */
-    parse(): void {
-        if (this.showDefaultPreview) {
-            this.previewTextAsHtml = this.artemisMarkdown.safeHtmlForMarkdown(this.markdown);
-            this.html.emit(this.previewTextAsHtml);
-        }
-        if (this.domainCommands && this.domainCommands.length && this.markdown) {
-            /** create array with domain command identifier */
-            const domainCommandIdentifiersToParse = this.domainCommands.map((command) => command.getOpeningIdentifier());
-            /** create empty array which
-             * will contain the splitted text with the corresponding domainCommandIdentifier which
-             * will be emitted to the parent component */
-            const commandTextsMappedToCommandIdentifiers: [string, DomainCommand | null][] = [];
-            /** create a remainingMarkdownText of the markdown text to loop through it and find the domainCommandIdentifier */
-            let remainingMarkdownText = this.markdown.slice(0);
-
-            /** create string with the identifiers to use for RegEx by deleting the [] of the domainCommandIdentifiers */
-            const commandIdentifiersString = domainCommandIdentifiersToParse
-                .map((tag) => tag.replace('[', '').replace(']', ''))
-                .map(escapeStringForUseInRegex)
-                .join('|');
-
-            /** create a new regex expression which searches for the domainCommands identifiers
-             * (?=   If a command is found, add the command identifier to the result of the split
-             * \\[  look for the character '[' to determine the beginning of the command identifier
-             * (${commandIdentifiersString}) look if after the '[' one of the element of commandIdentifiersString is contained
-             * \\] look for the character ']' to determine the end of the command identifier
-             * )  close the bracket
-             *  g: search in the whole string
-             *  i: case insensitive, neglecting capital letters
-             *  m: match the regex over multiple lines*/
-            const regex = new RegExp(`(?=\\[(${commandIdentifiersString})\\])`, 'gmi');
-
-            /** iterating loop as long as the remainingMarkdownText of the markdown text exists and split the remainingMarkdownText when a domainCommand identifier is found */
-            while (remainingMarkdownText.length) {
-                /** As soon as an identifier is with regEx the remainingMarkdownText of the markdown text is split and saved into {array} textWithCommandIdentifier
-                 *  split: saves its values into an {array}
-                 *  limit 1: indicated that as soon as an identifier is found remainingMarkdownText is split */
-                const [textWithCommandIdentifier] = remainingMarkdownText.split(regex, 1);
-                /** substring: reduces the {string} by the length in the brackets
-                 *  Split the remainingMarkdownText by the length of {array} textWithCommandIdentifier to get the remaining array
-                 *  and save it into remainingMarkdownText to start the loop again and search for further domainCommandIdentifiers
-                 *  when remainingMarkdownText is empty the while loop will terminate*/
-                remainingMarkdownText = remainingMarkdownText.substring(textWithCommandIdentifier.length);
-                /** call the parseLineForDomainCommand for each extracted textWithCommandIdentifier
-                 *   trim: reduced the whitespacing linebreaks */
-                const commandTextWithCommandIdentifier = this.parseLineForDomainCommand(textWithCommandIdentifier.trim());
-                /** push the commandTextWithCommandIdentifier into the commandTextsMappedToCommandIdentifiers*/
-                commandTextsMappedToCommandIdentifiers.push(commandTextWithCommandIdentifier);
-            }
-            /** emit the {array} commandTextsMappedToCommandIdentifiers to the client*/
-            this.textWithDomainCommandsFound.emit(commandTextsMappedToCommandIdentifiers);
-        }
-    }
-
-    /**
-     * @function parseLineForDomainCommand
-     * @desc Couple each text with the domainCommandIdentifier to emit that to the parent component for the value assignment
-     *       1. Check which domainCommand identifier is contained within the text
-     *       2. Remove the domainCommand identifier from the text
-     *       3. Create an array with first element text and second element the domainCommand identifier
-     * @param text {string} from the parse function
-     * @return array of the text with the domainCommand identifier
-     */
-    private parseLineForDomainCommand = (text: string): [string, DomainCommand | null] => {
-        for (const domainCommand of this.domainCommands) {
-            const possibleOpeningCommandIdentifier = [
-                domainCommand.getOpeningIdentifier(),
-                domainCommand.getOpeningIdentifier().toLowerCase(),
-                domainCommand.getOpeningIdentifier().toUpperCase(),
-            ];
-            if (possibleOpeningCommandIdentifier.some((identifier) => text.indexOf(identifier) !== -1)) {
-                // TODO when closingIdentifiers are used write a method to extract them from the text
-                const trimmedLineWithoutIdentifier = possibleOpeningCommandIdentifier.reduce((line, identifier) => line.replace(identifier, ''), text).trim();
-                return [trimmedLineWithoutIdentifier, domainCommand];
-            }
-        }
-        return [text.trim(), null];
-    };
-
-    /**
-     * @function togglePreview
-     * @desc Toggle the preview in the template and parse the text
-     */
-    changeNavigation(event: any): void {
-        this.previewMode = event.nextId === 'editor_preview';
-        this.visualMode = event.nextId === 'editor_visual';
-
-        if (this.previewMode) {
-            this.onPreviewSelect.emit();
-        } else {
-            this.onEditSelect.emit();
-        }
-
-        if (event.activeId === 'editor_visual' && this.visualChild) {
-            this.markdown = this.visualChild.parseQuestion();
-
-            if (this.previewMode) {
-                this.parse();
-            }
-        }
-
-        // The text must only be parsed when the active tab before event was edit, otherwise the text can't have changed.
-        if (event.activeId === 'editor_edit') {
-            this.parse();
-        }
-    }
-
-    /**
-     * @function onFileUpload
-     * @desc handle file upload for input
-     * @param event
-     */
-    onFileUpload(event: any): void {
-        if (event.target.files.length >= 1) {
-            this.embedFiles(Array.from(event.target.files));
-        }
-    }
-
-    /**
-     * @function onFileDrop
-     * @desc handle drop of files
-     * @param {DragEvent} event
-     */
-    onFileDrop(event: DragEvent): void {
-        event.preventDefault();
-        if (event.dataTransfer?.items) {
-            // Use DataTransferItemList interface to access the file(s)
-            const files = new Array<File>();
-            for (let i = 0; i < event.dataTransfer.items.length; i++) {
-                // If dropped items aren't files, reject them
-                if (event.dataTransfer.items[i].kind === 'file') {
-                    const file = event.dataTransfer.items[i].getAsFile();
-                    if (file) {
-                        files.push(file);
-                    }
-                }
-            }
-            this.embedFiles(files);
-        } else if (event.dataTransfer?.files) {
-            // Use DataTransfer interface to access the file(s)
-            this.embedFiles(Array.from(event.dataTransfer.files));
-        }
-    }
-
-    /**
-     * @function onFilePaste
-     * @desc handle paste of files
-     * @param {ClipboardEvent} event
-     */
-    onFilePaste(event: ClipboardEvent): void {
-        if (event.clipboardData?.items) {
-            const images = new Array<File>();
-            for (let i = 0; i < event.clipboardData.items.length; i++) {
-                if (event.clipboardData.items[i].kind === 'file') {
-                    const file = event.clipboardData.items[i].getAsFile();
-                    if (file) {
-                        images.push(file);
-                    }
-                }
-            }
-            this.embedFiles(images);
-        }
-    }
-
-    /**
-     * @function embedFiles
-     * @desc generate and embed markdown code for files
-     * @param {FileList} files
-     */
-    embedFiles(files: File[]): void {
-        const aceEditor = this.aceEditorContainer.getEditor();
-        files.forEach((file: File) => {
-            this.fileUploaderService.uploadMarkdownFile(file).then(
-                (res) => {
-                    const extension = file.name.split('.').pop()!.toLocaleLowerCase();
-
-                    let textToAdd = `[${file.name}](${res.path})\n`;
-                    if (extension !== 'pdf') {
-                        // Show file as embedded image
-                        textToAdd = '!' + textToAdd;
-                    }
-
-                    aceEditor.insert(textToAdd);
-                },
-                (error: Error) => {
-                    this.alertService.addAlert({
-                        type: AlertType.DANGER,
-                        message: error.message,
-                        disableTranslation: true,
-                    });
-                },
-            );
-        });
-    }
-
-    markdownTextChange(value: any) {
-        this.markdown = value;
-        this.markdownChange.emit(value as string);
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts
index cb04a2cbab90..198dad328789 100644
--- a/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts
+++ b/src/main/webapp/app/shared/markdown-editor/markdown-editor.module.ts
@@ -1,19 +1,16 @@
-import { MarkdownEditorComponent } from './markdown-editor.component';
 import { NgModule } from '@angular/core';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { FormsModule } from '@angular/forms';
 import { ArtemisColorSelectorModule } from 'app/shared/color-selector/color-selector.module';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { MatMenuModule } from '@angular/material/menu';
 import { MatButtonModule } from '@angular/material/button';
-import { SelectWithSearchComponent } from './select-with-search/select-with-search.component';
 import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
 
 @NgModule({
-    imports: [ArtemisSharedModule, AceEditorModule, MonacoEditorModule, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule],
-    declarations: [MarkdownEditorComponent, MarkdownEditorMonacoComponent, SelectWithSearchComponent],
-    exports: [MarkdownEditorComponent, MarkdownEditorMonacoComponent],
+    imports: [ArtemisSharedModule, MonacoEditorModule, FormsModule, ArtemisColorSelectorModule, MatMenuModule, MatButtonModule, DragDropModule],
+    declarations: [MarkdownEditorMonacoComponent],
+    exports: [MarkdownEditorMonacoComponent],
 })
 export class ArtemisMarkdownEditorModule {}
diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html
index 075014915cf8..52d80f585633 100644
--- a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html
+++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.html
@@ -2,17 +2,18 @@
     <div
         #wrapper
         class="markdown-editor-wrapper"
-        [style.overflow]="inPreviewMode ? 'auto' : 'visible'"
-        [style.height.px]="inPreviewMode ? undefined : targetWrapperHeight"
+        [style.overflow]="inEditMode ? 'visible' : 'auto'"
+        [style.height.px]="inEditMode ? targetWrapperHeight : undefined"
         [style.cursor]="isResizing ? 'ns-resize' : undefined"
+        [style.min-height.px]="minWrapperHeight"
     >
         <nav ngbNav #actionPalette #nav="ngbNav" class="nav-tabs" [destroyOnHide]="false" (navChange)="onNavChanged($event)">
-            <ng-container ngbNavItem="editor_edit">
+            <ng-container [ngbNavItem]="TAB_EDIT">
                 @if (showEditButton) {
                     <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0"><span jhiTranslate="entity.action.edit"></span></a>
                 }
                 <ng-template ngbNavContent>
-                    <div class="markdown-editor markdown-editor-wrapper flex-column" [ngClass]="{ 'd-flex': !inPreviewMode, 'd-none': inPreviewMode }">
+                    <div class="markdown-editor markdown-editor-wrapper flex-column" [ngClass]="{ 'd-flex': inEditMode, 'd-none': !inEditMode }">
                         <jhi-monaco-editor
                             class="h-100"
                             [shrinkToFit]="false"
@@ -20,6 +21,7 @@
                             (textChanged)="onTextChanged($event)"
                             (contentHeightChanged)="onContentHeightChanged($event)"
                             (drop)="onFileDrop($event)"
+                            (onBlurEditor)="onBlurEditor.emit()"
                         />
                         @if (enableFileUpload) {
                             <div class="d-flex" #fileUploadFooter>
@@ -48,16 +50,31 @@
                     </div>
                 </ng-template>
             </ng-container>
-            <ng-container ngbNavItem="editor_preview">
+            <ng-container [ngbNavItem]="TAB_VISUAL">
+                @if (showVisualButton) {
+                    <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0" jhiTranslate="entity.action.visual"></a>
+                }
+                <ng-template ngbNavContent>
+                    <div class="mt-1 mb-2 mx-2 overflow-auto">
+                        <ng-content select="[#visual]"></ng-content>
+                    </div>
+                </ng-template>
+            </ng-container>
+            <ng-container [ngbNavItem]="TAB_PREVIEW">
                 @if (showPreviewButton) {
                     <a ngbNavLink class="btn-sm text-normal px-2 py-0 m-0"><span jhiTranslate="entity.action.preview"></span></a>
                 }
                 <ng-template ngbNavContent>
-                    <ng-content class="overflow-auto" select="[#previewMonaco]" />
-                    <!-- TODO preview handling for other exercise types -->
+                    <div class="mt-1 mb-2 mx-2 overflow-auto">
+                        <ng-content class="overflow-auto p-1" select="[#previewMonaco]">
+                            @if (showDefaultPreview) {
+                                <div class="p-0 m-0 background-editor-high markdown-preview" [innerHTML]="defaultPreviewHtml"></div>
+                            }
+                        </ng-content>
+                    </div>
                 </ng-template>
             </ng-container>
-            @if (!inPreviewMode) {
+            @if (inEditMode) {
                 <ng-container ngbNavItem>
                     <div class="d-flex align-items-center" [style.flex-flow]="'row wrap'">
                         <!-- Standard -->
@@ -194,7 +211,7 @@
         </nav>
         <div [ngbNavOutlet]="nav"></div>
     </div>
-    @if (enableResize && !inPreviewMode) {
+    @if (enableResize && inEditMode) {
         <div #resizePlaceholder [style.cursor]="isResizing ? 'ns-resize' : undefined" class="d-flex justify-content-center resize-placeholder">
             <fa-icon
                 cdkDrag
diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.scss b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.scss
index d0b4779091e5..4b06f7427978 100644
--- a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.scss
+++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.scss
@@ -1,10 +1,36 @@
 .markdown-editor-wrapper {
+    display: flex;
+    flex-flow: column nowrap;
+    flex: 1 1 auto;
+    height: inherit;
+    color: var(--md-wrapper-color);
     background-color: var(--md-editor-background);
+
+    // This is a fix for using the fullscreen mode on Safari.
+    &:-webkit-full-screen {
+        width: 100%;
+        height: 100%;
+    }
+
+    .markdown-editor {
+        border: 1px solid var(--border-color);
+    }
+
+    .md-resize-icon {
+        color: var(--md-resize-icon-color);
+    }
+
+    .tab-list {
+        background: var(--md-tab-list-bg);
+    }
+
+    .no-dropdown-indicator::after {
+        display: none;
+    }
 }
 
 .resize-placeholder {
     border: 1px solid var(--border-color);
-    border-bottom: none;
 }
 
 .file-upload-footer-input {
@@ -30,3 +56,20 @@
         color: var(--bs-secondary);
     }
 }
+
+.background-editor-high {
+    overflow: auto;
+}
+
+.dropdown-menu {
+    max-height: 300px;
+    overflow-y: auto;
+
+    li {
+        position: relative;
+    }
+}
+
+.default-font-size {
+    font-size: var(--bs-body-font-size);
+}
diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.ts b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.ts
index e257b5209175..7f9fe5ee75d4 100644
--- a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.ts
+++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-monaco.component.ts
@@ -13,7 +13,6 @@ import {
     computed,
 } from '@angular/core';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
 import { NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap';
 import { MonacoEditorAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-action.model';
 import { MonacoBoldAction } from 'app/shared/monaco-editor/model/actions/monaco-bold.action';
@@ -42,6 +41,18 @@ import { MonacoLectureAttachmentReferenceAction } from 'app/shared/monaco-editor
 import { LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 import { ReferenceType } from 'app/shared/metis/metis.util';
 import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model';
+import { SafeHtml } from '@angular/platform-browser';
+import { ArtemisMarkdownService } from 'app/shared/markdown.service';
+import { parseMarkdownForDomainActions } from 'app/shared/markdown-editor/monaco/markdown-editor-parsing.helper';
+import { COMMUNICATION_MARKDOWN_EDITOR_OPTIONS, DEFAULT_MARKDOWN_EDITOR_OPTIONS } from 'app/shared/monaco-editor/monaco-editor-option.helper';
+
+export enum MarkdownEditorHeight {
+    INLINE = 100,
+    SMALL = 300,
+    MEDIUM = 500,
+    LARGE = 1000,
+    EXTRA_LARGE = 1500,
+}
 
 interface MarkdownActionsByGroup {
     standard: MonacoEditorAction[];
@@ -56,6 +67,8 @@ interface MarkdownActionsByGroup {
     meta: MonacoEditorAction[];
 }
 
+export type TextWithDomainAction = { text: string; action?: MonacoEditorDomainAction };
+
 const EXTERNAL_HEIGHT = 'external';
 
 /**
@@ -64,12 +77,13 @@ const EXTERNAL_HEIGHT = 'external';
  * from covering the border while shrinking.
  */
 const BORDER_WIDTH_OFFSET = 3;
+const BORDER_HEIGHT_OFFSET = 2;
 
 // TODO: Once the old markdown editor is gone, remove the style url.
 @Component({
     selector: 'jhi-markdown-editor-monaco',
     templateUrl: './markdown-editor-monaco.component.html',
-    styleUrls: ['./markdown-editor-monaco.component.scss', '../markdown-editor.component.scss'],
+    styleUrls: ['./markdown-editor-monaco.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterViewInit, OnDestroy {
@@ -98,17 +112,30 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
     @Input()
     showPreviewButton = true;
 
+    @Input()
+    showVisualButton = false;
+
+    @Input()
+    showDefaultPreview = true;
+
+    @Input()
+    useDefaultMarkdownEditorOptions = true;
+
     @Input()
     showEditButton = true;
 
+    /**
+     * If set to true, the editor will grow and shrink to fit its content. However, the height will still be constrained by {@link resizableMinHeight} and {@link resizableMaxHeight}.
+     * In particular, an empty editor will have the height of {@link resizableMinHeight} upon initialization, no matter what value {@link initialEditorHeight} has.
+     */
     @Input()
     linkEditorHeightToContentHeight = false;
 
     /**
      * The initial height the editor should have. If set to 'external', the editor will try to grow to the available space.
      */
-    @Input({ required: true })
-    initialEditorHeight: MarkdownEditorHeight | 'external';
+    @Input()
+    initialEditorHeight: MarkdownEditorHeight | 'external' = MarkdownEditorHeight.SMALL;
 
     @Input()
     resizableMaxHeight = MarkdownEditorHeight.LARGE;
@@ -158,10 +185,26 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
     @Output()
     onEditSelect = new EventEmitter<void>();
 
+    @Output()
+    onBlurEditor = new EventEmitter<void>();
+
+    @Output()
+    textWithDomainActionsFound = new EventEmitter<TextWithDomainAction[]>();
+
+    @Output()
+    onDefaultPreviewHtmlChanged = new EventEmitter<SafeHtml | undefined>();
+
+    @Output()
+    onLeaveVisualTab = new EventEmitter<void>();
+
+    defaultPreviewHtml: SafeHtml | undefined;
     inPreviewMode = false;
+    inVisualMode = false;
+    inEditMode = true;
     uniqueMarkdownEditorId: string;
     resizeObserver?: ResizeObserver;
     targetWrapperHeight?: number;
+    minWrapperHeight?: number;
     constrainDragPositionFn?: (pointerPosition: Point) => Point;
     isResizing = false;
     displayedActions: MarkdownActionsByGroup = {
@@ -186,19 +229,27 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
 
     colorSignal: Signal<string[]> = computed(() => [...this.colorToClassMap.keys()]);
 
+    static readonly TAB_EDIT = 'editor_edit';
+    static readonly TAB_PREVIEW = 'editor_preview';
+    static readonly TAB_VISUAL = 'editor_visual';
     readonly colorPickerMarginTop = 35;
     readonly colorPickerHeight = 110;
     // Icons
     protected readonly faQuestionCircle = faQuestionCircle;
     protected readonly faGripLines = faGripLines;
     protected readonly faAngleDown = faAngleDown;
-    // Types exposed to the template
+    // Types and values exposed to the template
     protected readonly LectureUnitType = LectureUnitType;
     protected readonly ReferenceType = ReferenceType;
+    // We cannot reference these static fields in the template, so we expose them here.
+    protected readonly TAB_EDIT = MarkdownEditorMonacoComponent.TAB_EDIT;
+    protected readonly TAB_PREVIEW = MarkdownEditorMonacoComponent.TAB_PREVIEW;
+    protected readonly TAB_VISUAL = MarkdownEditorMonacoComponent.TAB_VISUAL;
 
     constructor(
         private alertService: AlertService,
         private fileUploaderService: FileUploaderService,
+        private artemisMarkdown: ArtemisMarkdownService,
     ) {
         this.uniqueMarkdownEditorId = 'markdown-editor-' + uuid();
     }
@@ -206,24 +257,33 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
     ngAfterContentInit(): void {
         // Affects the template - done in this method to avoid ExpressionChangedAfterItHasBeenCheckedErrors.
         this.targetWrapperHeight = this.initialEditorHeight !== EXTERNAL_HEIGHT ? this.initialEditorHeight.valueOf() : undefined;
+        this.minWrapperHeight = this.resizableMinHeight.valueOf();
         this.constrainDragPositionFn = this.constrainDragPosition.bind(this);
         this.displayedActions = {
-            standard: this.defaultActions,
-            header: this.headerActions?.actions ?? [],
-            color: this.colorAction,
+            standard: this.filterDisplayedActions(this.defaultActions),
+            header: this.filterDisplayedActions(this.headerActions?.actions ?? []),
+            color: this.filterDisplayedAction(this.colorAction),
             domain: {
-                withoutOptions: this.domainActions.filter((action) => !(action instanceof MonacoEditorDomainActionWithOptions)),
-                withOptions: <MonacoEditorDomainActionWithOptions[]>this.domainActions.filter((action) => action instanceof MonacoEditorDomainActionWithOptions),
+                withoutOptions: this.filterDisplayedActions(this.domainActions.filter((action) => !(action instanceof MonacoEditorDomainActionWithOptions))),
+                withOptions: this.filterDisplayedActions(this.domainActions.filter((action) => action instanceof MonacoEditorDomainActionWithOptions)),
             },
-            lecture: this.lectureReferenceAction,
-            meta: this.metaActions,
+            lecture: this.filterDisplayedAction(this.lectureReferenceAction),
+            meta: this.filterDisplayedActions(this.metaActions),
         };
     }
 
+    filterDisplayedActions<T extends MonacoEditorAction>(actions: T[]): T[] {
+        return actions.filter((action) => !action.hideInEditor);
+    }
+
+    filterDisplayedAction<T extends MonacoEditorAction>(action?: T): T | undefined {
+        return action?.hideInEditor ? undefined : action;
+    }
+
     ngAfterViewInit(): void {
         this.adjustEditorDimensions();
         this.monacoEditor.setWordWrap(true);
-        this.monacoEditor.changeModel('markdown-content.custom-md', this._markdown, 'custom-md');
+        this.monacoEditor.changeModel('markdown-content.custom-md', this._markdown ?? '', 'custom-md');
         this.resizeObserver = new ResizeObserver(() => {
             this.adjustEditorDimensions();
         });
@@ -232,6 +292,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
         if (this.fileUploadFooter?.nativeElement) {
             this.resizeObserver.observe(this.fileUploadFooter.nativeElement);
         }
+        if (this.actionPalette?.nativeElement) {
+            this.resizeObserver.observe(this.actionPalette.nativeElement);
+        }
         [
             this.defaultActions,
             this.headerActions?.actions ?? [],
@@ -248,6 +311,10 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
                 }
                 this.monacoEditor.registerAction(action);
             });
+
+        if (this.useDefaultMarkdownEditorOptions) {
+            this.monacoEditor.applyOptionPreset(DEFAULT_MARKDOWN_EDITOR_OPTIONS);
+        }
     }
 
     /**
@@ -289,9 +356,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
      * Adjusts the height of the element when the content height changes.
      * @param newContentHeight The new height of the content in the editor.
      */
-    onContentHeightChanged(newContentHeight: number): void {
+    onContentHeightChanged(newContentHeight: number | undefined): void {
         if (this.linkEditorHeightToContentHeight) {
-            const totalHeight = newContentHeight + this.getElementClientHeight(this.fileUploadFooter) + this.getElementClientHeight(this.actionPalette);
+            const totalHeight = (newContentHeight ?? 0) + this.getElementClientHeight(this.fileUploadFooter) + this.getElementClientHeight(this.actionPalette);
             // Clamp the height so it is between the minimum and maximum height.
             this.targetWrapperHeight = Math.max(this.resizableMinHeight, Math.min(this.resizableMaxHeight, totalHeight));
         }
@@ -305,7 +372,7 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
         const elementHeight = this.getElementClientHeight(this.isInitialHeightExternal() ? this.fullElement : this.wrapper);
         const fileUploadFooterHeight = this.getElementClientHeight(this.fileUploadFooter);
         const actionPaletteHeight = this.getElementClientHeight(this.actionPalette);
-        return elementHeight - fileUploadFooterHeight - actionPaletteHeight;
+        return elementHeight - fileUploadFooterHeight - actionPaletteHeight - BORDER_HEIGHT_OFFSET;
     }
 
     /**
@@ -327,7 +394,9 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
      * Adjust the dimensions of the editor to fit the available space.
      */
     adjustEditorDimensions(): void {
-        this.monacoEditor.layoutWithFixedSize(this.getEditorWidth(), this.getEditorHeight());
+        this.onContentHeightChanged(this.monacoEditor.getContentHeight());
+        const editorHeight = this.getEditorHeight();
+        this.monacoEditor.layoutWithFixedSize(this.getEditorWidth(), editorHeight);
     }
 
     /**
@@ -335,13 +404,36 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
      * @param event The event that contains the new active tab.
      */
     onNavChanged(event: NgbNavChangeEvent) {
-        this.inPreviewMode = event.nextId === 'editor_preview';
-        if (!this.inPreviewMode) {
+        this.inPreviewMode = event.nextId === this.TAB_PREVIEW;
+        this.inVisualMode = event.nextId === this.TAB_VISUAL;
+        this.inEditMode = event.nextId === this.TAB_EDIT;
+        if (this.inEditMode) {
             this.adjustEditorDimensions();
             this.monacoEditor.focus();
-        } else {
+            this.onEditSelect.emit();
+        } else if (this.inPreviewMode) {
             this.onPreviewSelect.emit();
         }
+
+        // Some components need to know when the user leaves the visual tab, as it might make changes to the underlying data.
+        if (event.activeId === this.TAB_VISUAL) {
+            this.onLeaveVisualTab.emit();
+        }
+
+        // Parse the markdown when switching away from the edit tab or from visual to preview mode, as the visual mode may make changes to the markdown.
+        if (event.activeId === this.TAB_EDIT || (event.activeId === this.TAB_VISUAL && this.inPreviewMode)) {
+            this.parseMarkdown();
+        }
+    }
+
+    parseMarkdown(domainActionsToCheck: MonacoEditorDomainAction[] = this.domainActions): void {
+        if (this.showDefaultPreview) {
+            this.defaultPreviewHtml = this.artemisMarkdown.safeHtmlForMarkdown(this._markdown);
+            this.onDefaultPreviewHtmlChanged.emit(this.defaultPreviewHtml);
+        }
+        if (domainActionsToCheck.length && this._markdown) {
+            this.textWithDomainActionsFound.emit(parseMarkdownForDomainActions(this._markdown, domainActionsToCheck));
+        }
     }
 
     /**
@@ -434,7 +526,7 @@ export class MarkdownEditorMonacoComponent implements AfterContentInit, AfterVie
      * Enable the text field mode of the editor. This makes the editor look and behave like a normal text field.
      */
     enableTextFieldMode(): void {
-        this.monacoEditor.enableTextFieldMode();
+        this.monacoEditor.applyOptionPreset(COMMUNICATION_MARKDOWN_EDITOR_OPTIONS);
     }
 
     /**
diff --git a/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts
new file mode 100644
index 000000000000..058cacf8c2ba
--- /dev/null
+++ b/src/main/webapp/app/shared/markdown-editor/monaco/markdown-editor-parsing.helper.ts
@@ -0,0 +1,61 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
+import { TextWithDomainAction } from './markdown-editor-monaco.component';
+
+/**
+ * Searches for the domain actions in the given markdown text and returns the text split into parts, each part associated with the domain action it belongs to.
+ * Note that the text will be trimmed before being returned.
+ * @param markdown The markdown text to parse
+ * @param domainActions The domain actions to search for in the markdown
+ */
+export function parseMarkdownForDomainActions(markdown: string, domainActions: MonacoEditorDomainAction[]): TextWithDomainAction[] {
+    let remainingText = markdown;
+    const actionIdentifiersString = domainActions
+        .map((action) => action.getOpeningIdentifier())
+        .map((identifier) => identifier.replace('[', '').replace(']', ''))
+        .map(escapeStringForUseInRegex)
+        .join('|');
+    const textMappedToActionIdentifiers: TextWithDomainAction[] = [];
+
+    /*
+     * The following regex is used to split the text into parts, each part associated with the domain action it belongs to. It is structured as follows:
+     * 1. (?=   If an action is found, add the action identifier to the result of the split
+     * 2. \\[  look for the character '[' to determine the beginning of the action identifier
+     * 3. (${actionIdentifiersString}) look if after the '[' one of the element of actionIdentifiersString is contained
+     * 4. ] look for the character ']' to determine the end of the action identifier
+     * 5. ) ends the group
+     * Flags:
+     * - g: search in the whole string
+     * - m: match the regex over multiple lines
+     * - i: case-insensitive matching
+     */
+    const regex = new RegExp(`(?=\\[(${actionIdentifiersString})])`, 'gmi');
+    while (remainingText.length) {
+        const [textWithActionIdentifier] = remainingText.split(regex, 1);
+        remainingText = remainingText.substring(textWithActionIdentifier.length);
+        const textWithDomainAction = parseLineForDomainAction(textWithActionIdentifier.trim(), domainActions);
+        textMappedToActionIdentifiers.push(textWithDomainAction);
+    }
+
+    return textMappedToActionIdentifiers;
+}
+
+/**
+ * Checks if the given line contains any of the domain action identifiers and returns the text without the identifier along with the domain action it belongs to.
+ * @param text The text to parse
+ * @param domainActions The domain actions to search for in the text
+ */
+function parseLineForDomainAction(text: string, domainActions: MonacoEditorDomainAction[]): TextWithDomainAction {
+    for (const domainAction of domainActions) {
+        const possibleOpeningIdentifiers = [
+            domainAction.getOpeningIdentifier(),
+            domainAction.getOpeningIdentifier().toLowerCase(),
+            domainAction.getOpeningIdentifier().toUpperCase(),
+        ];
+        if (possibleOpeningIdentifiers.some((identifier) => text.indexOf(identifier) !== -1)) {
+            const trimmedLineWithoutIdentifier = possibleOpeningIdentifiers.reduce((line, identifier) => line.replace(identifier, ''), text).trim();
+            return { text: trimmedLineWithoutIdentifier, action: domainAction };
+        }
+    }
+    return { text: text.trim() };
+}
diff --git a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.html b/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.html
deleted file mode 100644
index f35d33d0558f..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div #dropdown ngbDropdown class="d-inline-block" (openChange)="$event ? handleMenuOpen() : handleMenuClosed()" autoClose="inside" [placement]="['top-start']">
-    <button type="button" class="btn btn-sm py-0" (click)="handleToggle()">
-        <fa-icon [icon]="command.buttonIcon" />
-    </button>
-    <div ngbDropdownAnchor id="anchor" class="invisible-anchor" [style.top]="offsetY" [style.left]="offsetX"></div>
-    <div ngbDropdownMenu>
-        @for (value of values; track value) {
-            <button ngbDropdownItem type="button" (click)="setSelection(value)">{{ value.name }}</button>
-        }
-    </div>
-</div>
diff --git a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.scss b/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.scss
deleted file mode 100644
index 1b28bd67c7fd..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-.invisible-anchor {
-    position: absolute;
-    width: 0;
-    height: 0;
-}
-
-#anchor::after {
-    display: none;
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.ts b/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.ts
deleted file mode 100644
index af415a2ab1ec..000000000000
--- a/src/main/webapp/app/shared/markdown-editor/select-with-search/select-with-search.component.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewChild } from '@angular/core';
-import { InteractiveSearchCommand, SelectableItem } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-import { AlertService } from 'app/core/util/alert.service';
-import { onError } from 'app/shared/util/global.utils';
-import { Subject, debounce, distinctUntilChanged, switchMap, takeUntil, timer } from 'rxjs';
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { NgbDropdown, NgbDropdownConfig } from '@ng-bootstrap/ng-bootstrap';
-
-interface SearchQuery {
-    searchTerm: string;
-    noDebounce: boolean;
-}
-
-@Component({
-    selector: 'jhi-select-with-search',
-    templateUrl: './select-with-search.component.html',
-    styleUrls: ['./select-with-search.component.scss'],
-    providers: [NgbDropdownConfig],
-})
-export class SelectWithSearchComponent implements OnInit, OnChanges, OnDestroy {
-    @Input() command: InteractiveSearchCommand;
-    @Input() editorContentString: string;
-
-    @ViewChild(NgbDropdown) dropdown: NgbDropdown;
-    @ViewChild('dropdown') dropdownRef: ElementRef;
-
-    private ngUnsubscribe = new Subject<void>();
-    private readonly search$ = new Subject<SearchQuery>();
-
-    values: SelectableItem[] = [];
-    selectedValue: SelectableItem | undefined;
-    offsetX: string;
-    offsetY: string;
-
-    constructor(
-        private readonly alertService: AlertService,
-        private readonly cdr: ChangeDetectorRef,
-    ) {}
-
-    ngOnInit(): void {
-        this.command.setSelectWithSearchComponent(this);
-
-        this.search$
-            .pipe(
-                debounce((searchQuery) => {
-                    return timer(searchQuery.noDebounce ? 0 : 200);
-                }),
-                distinctUntilChanged((prev, curr) => {
-                    return prev === curr;
-                }),
-                switchMap((searchQuery) => this.command.performSearch(searchQuery.searchTerm)),
-                takeUntil(this.ngUnsubscribe),
-            )
-            .subscribe({
-                next: (res: HttpResponse<SelectableItem[]>) => {
-                    this.values = res.body!;
-                    this.cdr.detectChanges();
-                },
-                error: (errorResponse: HttpErrorResponse) => {
-                    onError(this.alertService, errorResponse);
-                },
-            });
-    }
-
-    ngOnChanges(changes: SimpleChanges): void {
-        if (changes.editorContentString) {
-            this.command.updateSearchTerm();
-        }
-    }
-
-    ngOnDestroy(): void {
-        this.ngUnsubscribe.next();
-        this.ngUnsubscribe.complete();
-    }
-
-    open() {
-        this.dropdown.open();
-    }
-
-    close() {
-        this.dropdown.close();
-    }
-
-    updateSearchTerm(searchInput: string | undefined, noDebounce = false) {
-        const searchTerm = searchInput?.trim().toLowerCase() ?? '';
-        this.search$.next({ searchTerm, noDebounce });
-    }
-
-    handleMenuOpen() {
-        const cursorPosition = this.command.getCursorScreenPosition();
-        const dropdownPosition = this.dropdownRef.nativeElement.getBoundingClientRect();
-        this.offsetX = cursorPosition.pageX - dropdownPosition.left + 'px';
-        this.offsetY = cursorPosition.pageY - dropdownPosition.top + 'px';
-        this.updateSearchTerm('', true);
-        this.cdr.detectChanges();
-    }
-
-    handleMenuClosed() {
-        this.command.insertSelection(this.selectedValue);
-        this.selectedValue = undefined;
-    }
-
-    setSelection(value: any) {
-        this.selectedValue = value;
-        this.dropdown.close();
-    }
-
-    handleToggle() {
-        if (this.dropdown.isOpen()) {
-            this.close();
-        } else {
-            this.command.execute();
-        }
-    }
-}
diff --git a/src/main/webapp/app/shared/markdown-editor/value-item.model.ts b/src/main/webapp/app/shared/markdown-editor/value-item.model.ts
new file mode 100644
index 000000000000..dbeacebf118a
--- /dev/null
+++ b/src/main/webapp/app/shared/markdown-editor/value-item.model.ts
@@ -0,0 +1,7 @@
+export type ValueItem = {
+    id: string;
+    value: string;
+    type?: string;
+    elements?: ValueItem[];
+    attachmentUnits?: ValueItem[];
+};
diff --git a/src/main/webapp/app/shared/markdown.module.ts b/src/main/webapp/app/shared/markdown.module.ts
index 00df892f1be2..1d10d89b3045 100644
--- a/src/main/webapp/app/shared/markdown.module.ts
+++ b/src/main/webapp/app/shared/markdown.module.ts
@@ -1,13 +1,12 @@
 import { NgModule } from '@angular/core';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
 
 @NgModule({
     imports: [ArtemisMarkdownEditorModule],
     declarations: [HtmlForMarkdownPipe],
     providers: [ArtemisMarkdownService],
-    exports: [MarkdownEditorComponent, HtmlForMarkdownPipe],
+    exports: [HtmlForMarkdownPipe],
 })
 export class ArtemisMarkdownModule {}
diff --git a/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html b/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html
index 9233592719d3..2e2e9d8fa18f 100644
--- a/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html
+++ b/src/main/webapp/app/shared/metis/message/message-inline-input/message-inline-input.component.html
@@ -11,10 +11,10 @@
             @if (!warningDismissed) {
                 <div class="alert alert-warning alert-dismissible text-start fade show" role="alert">
                     <button type="button" class="btn-close" (click)="closeAlert()" aria-label="Close"></button>
-                    <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTranslate }}</h4>
-                    <p>{{ 'artemisApp.messageWarning.mainParagraph' | artemisTranslate }}</p>
+                    <h4 class="alert-heading" jhiTranslate="artemisApp.messageWarning.headerText"></h4>
+                    <p jhiTranslate="artemisApp.messageWarning.mainParagraph"></p>
                     <hr />
-                    <p class="mb-0">{{ 'artemisApp.messageWarning.lastParagraph' | artemisTranslate }}</p>
+                    <p class="mb-0" jhiTranslate="artemisApp.messageWarning.lastParagraph"></p>
                 </div>
             }
             @if (editType === EditType.UPDATE) {
diff --git a/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html b/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html
index 79fa12a7be05..6ae8fa99fa7b 100644
--- a/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html
+++ b/src/main/webapp/app/shared/metis/message/message-reply-inline-input/message-reply-inline-input.component.html
@@ -12,10 +12,10 @@
             @if (!warningDismissed) {
                 <div class="alert alert-warning alert-dismissible text-start fade show" role="alert">
                     <button type="button" class="btn-close" (click)="closeAlert()" aria-label="Close"></button>
-                    <h4 class="alert-heading">{{ 'artemisApp.messageWarning.headerText' | artemisTranslate }}</h4>
-                    <p>{{ 'artemisApp.messageWarning.mainParagraph' | artemisTranslate }}</p>
+                    <h4 class="alert-heading" jhiTranslate="artemisApp.messageWarning.headerText"></h4>
+                    <p jhiTranslate="artemisApp.messageWarning.mainParagraph"></p>
                     <hr />
-                    <p class="mb-0">{{ 'artemisApp.messageWarning.lastParagraph' | artemisTranslate }}</p>
+                    <p class="mb-0" jhiTranslate="artemisApp.messageWarning.lastParagraph"></p>
                 </div>
             }
             @if (editType === EditType.UPDATE) {
diff --git a/src/main/webapp/app/shared/metis/posting-content/posting-content-part/posting-content-part.component.html b/src/main/webapp/app/shared/metis/posting-content/posting-content-part/posting-content-part.component.html
index dca01f77b208..d564239cc342 100644
--- a/src/main/webapp/app/shared/metis/posting-content/posting-content-part/posting-content-part.component.html
+++ b/src/main/webapp/app/shared/metis/posting-content/posting-content-part/posting-content-part.component.html
@@ -39,9 +39,7 @@
         </a>
         @if (imageNotFound) {
             <div class="card">
-                <h5 class="card-body">
-                    <fa-icon class="px-1" [icon]="faBan" /><span>{{ 'artemisApp.markdownEditor.preview.slideNotFound' | artemisTranslate }}</span>
-                </h5>
+                <h5 class="card-body"><fa-icon class="px-1" [icon]="faBan" /><span jhiTranslate="artemisApp.markdownEditor.preview.slideNotFound"></span></h5>
             </div>
         }
     </div>
diff --git a/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html b/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
index 8ad661f40efd..6e952f156bcb 100644
--- a/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
+++ b/src/main/webapp/app/shared/metis/posting-content/posting-content.component.html
@@ -5,9 +5,7 @@
             <span class="clickable p-0">
                 <fa-icon [icon]="showContent ? faAngleUp : faAngleDown" [size]="'xs'" [ngStyle]="{ color: '#6a737d' }" (click)="showContent = !showContent" />
             </span>
-            <span class="toggle-content">
-                {{ showContent ? ('artemisApp.metis.post.collapseContent' | artemisTranslate) : ('artemisApp.metis.post.showContent' | artemisTranslate) }}
-            </span>
+            <span class="toggle-content" jhiTranslate="{{ showContent ? 'artemisApp.metis.post.collapseContent' : 'artemisApp.metis.post.showContent' }}"></span>
             @if (showContent) {
                 <div>
                     @for (postingContentPart of postingContentParts; track postingContentPart) {
@@ -18,7 +16,7 @@
                         />
                     }
                     @if (isEdited) {
-                        <span class="edited-text">{{ 'artemisApp.metis.edited' | artemisTranslate }}</span>
+                        <span class="edited-text" jhiTranslate="artemisApp.metis.edited"></span>
                     }
                 </div>
             }
@@ -35,7 +33,7 @@
                 />
             }
             @if (isEdited) {
-                <span class="edited-text">{{ 'artemisApp.metis.edited' | artemisTranslate }}</span>
+                <span class="edited-text" jhiTranslate="artemisApp.metis.edited"></span>
             }
             <jhi-link-preview-container [data]="content" [author]="author" [posting]="posting" [isEdited]="isEdited" [isReply]="isReply" />
         </div>
diff --git a/src/main/webapp/app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html b/src/main/webapp/app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html
index eb40b78344cd..cd2a9ff14182 100644
--- a/src/main/webapp/app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html
+++ b/src/main/webapp/app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component.html
@@ -7,9 +7,7 @@ <h4 class="modal-title">{{ modalTitle | artemisTranslate }}</h4>
         <div class="modal-body">
             <!-- info if announcement is created-->
             @if (this.editType === EditType.CREATE && isCommunicationPage && getAsChannel(posting.conversation)?.isAnnouncementChannel) {
-                <div class="alert alert-warning">
-                    {{ 'artemisApp.metis.post.announcementHint' | artemisTranslate }}
-                </div>
+                <div class="alert alert-warning" jhiTranslate="artemisApp.metis.post.announcementHint"></div>
             }
             <!-- title -->
             <div class="position-relative mb-3">
diff --git a/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts b/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts
index 1c8abc2d4b55..5d327cbe390e 100644
--- a/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts
+++ b/src/main/webapp/app/shared/metis/posting-create-edit.directive.ts
@@ -4,7 +4,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { Posting } from 'app/entities/metis/posting.model';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { PostingEditType } from 'app/shared/metis/metis.util';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
+
+import { MarkdownEditorHeight } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 // Note: this number should be the same as in Posting.java
 const MAX_CONTENT_LENGTH = 5000;
diff --git a/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.html b/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.html
index fb18ef521aa2..cd20f9b54615 100644
--- a/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.html
+++ b/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.html
@@ -12,6 +12,8 @@
         [enableFileUpload]="false"
         [colorAction]="undefined"
         [enableResize]="false"
+        [showDefaultPreview]="false"
+        [useDefaultMarkdownEditorOptions]="false"
         [linkEditorHeightToContentHeight]="true"
         [initialEditorHeight]="editorHeight"
         [resizableMinHeight]="editorHeight"
diff --git a/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.ts b/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.ts
index decd36d41b61..567846a81e3b 100644
--- a/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.ts
+++ b/src/main/webapp/app/shared/metis/posting-markdown-editor/posting-markdown-editor.component.ts
@@ -13,7 +13,6 @@ import {
     forwardRef,
 } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { LectureService } from 'app/lecture/lecture.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
@@ -26,7 +25,7 @@ import { MonacoUnderlineAction } from 'app/shared/monaco-editor/model/actions/mo
 import { MonacoQuoteAction } from 'app/shared/monaco-editor/model/actions/monaco-quote.action';
 import { MonacoCodeAction } from 'app/shared/monaco-editor/model/actions/monaco-code.action';
 import { MonacoCodeBlockAction } from 'app/shared/monaco-editor/model/actions/monaco-code-block.action';
-import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { MonacoChannelReferenceAction } from 'app/shared/monaco-editor/model/actions/communication/monaco-channel-reference.action';
 import { MonacoUserMentionAction } from 'app/shared/monaco-editor/model/actions/communication/monaco-user-mention.action';
 import { MonacoExerciseReferenceAction } from 'app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action';
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts
index d9e2024b7513..846241c6dd94 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/communication/monaco-exercise-reference.action.ts
@@ -2,7 +2,7 @@ import { TranslateService } from '@ngx-translate/core';
 import * as monaco from 'monaco-editor';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { MonacoEditorDomainActionWithOptions } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model';
-import { ValueItem } from 'app/shared/markdown-editor/command-constants';
+import { ValueItem } from 'app/shared/markdown-editor/value-item.model';
 
 /**
  * Action to insert a reference to an exercise into the editor. Users that type a / will see a list of available exercises to reference.
@@ -59,4 +59,8 @@ export class MonacoExerciseReferenceAction extends MonacoEditorDomainActionWithO
         super.dispose();
         this.disposableCompletionProvider?.dispose();
     }
+
+    getOpeningIdentifier(): string {
+        return '[exercise]';
+    }
 }
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts
new file mode 100644
index 000000000000..200a239de9ee
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action.ts
@@ -0,0 +1,20 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import * as monaco from 'monaco-editor';
+
+export class MonacoGradingCreditsAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-credits.action';
+    static readonly IDENTIFIER = '[credits]';
+    static readonly TEXT = '0';
+
+    constructor() {
+        super(MonacoGradingCreditsAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addCredits', undefined, undefined, true);
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingCreditsAction.TEXT, true, false);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingCreditsAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts
new file mode 100644
index 000000000000..02302850bca5
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action.ts
@@ -0,0 +1,22 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from '../monaco-editor-domain-action.model';
+import { MonacoGradingInstructionAction } from './monaco-grading-instruction.action';
+
+export class MonacoGradingCriterionAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-criterion.action';
+    static readonly IDENTIFIER = '[criterion]';
+    static readonly TEXT = 'Add criterion title (only visible to tutors)';
+
+    constructor(private readonly gradingInstructionAction: MonacoGradingInstructionAction) {
+        super(MonacoGradingCriterionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addCriterion');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingCriterionAction.TEXT, false, false);
+        this.gradingInstructionAction.executeInCurrentEditor();
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingCriterionAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts
new file mode 100644
index 000000000000..f04d861cb4d7
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action.ts
@@ -0,0 +1,20 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+
+export class MonacoGradingDescriptionAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-description.action';
+    static readonly IDENTIFIER = '[description]';
+    static readonly TEXT = 'Add grading instruction here (only visible for tutors)';
+
+    constructor() {
+        super(MonacoGradingDescriptionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addDescription', undefined, undefined, true);
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingDescriptionAction.TEXT, true, false);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingDescriptionAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts
new file mode 100644
index 000000000000..2dc1306eeffd
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action.ts
@@ -0,0 +1,20 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+
+export class MonacoGradingFeedbackAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-feedback.action';
+    static readonly IDENTIFIER = '[feedback]';
+    static readonly TEXT = 'Add feedback for students here (visible for students)';
+
+    constructor() {
+        super(MonacoGradingFeedbackAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addFeedback', undefined, undefined, true);
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingFeedbackAction.TEXT, true, false);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingFeedbackAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts
new file mode 100644
index 000000000000..fa14b18da454
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action.ts
@@ -0,0 +1,35 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from '../monaco-editor-domain-action.model';
+import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action';
+import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action';
+import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action';
+import { MonacoGradingFeedbackAction } from './monaco-grading-feedback.action';
+import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action';
+
+export class MonacoGradingInstructionAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-instruction.action';
+    static readonly IDENTIFIER = '[instruction]';
+
+    constructor(
+        private readonly creditsAction: MonacoGradingCreditsAction,
+        private readonly scaleAction: MonacoGradingScaleAction,
+        private readonly descriptionAction: MonacoGradingDescriptionAction,
+        private readonly feedbackAction: MonacoGradingFeedbackAction,
+        private readonly usageCountAction: MonacoGradingUsageCountAction,
+    ) {
+        super(MonacoGradingInstructionAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addInstruction');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, '', false, false);
+        this.creditsAction.executeInCurrentEditor();
+        this.scaleAction.executeInCurrentEditor();
+        this.descriptionAction.executeInCurrentEditor();
+        this.feedbackAction.executeInCurrentEditor();
+        this.usageCountAction.executeInCurrentEditor();
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingInstructionAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts
new file mode 100644
index 000000000000..53e1bd2b9485
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action.ts
@@ -0,0 +1,20 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import * as monaco from 'monaco-editor';
+
+export class MonacoGradingScaleAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-scale.action';
+    static readonly IDENTIFIER = '[gradingScale]';
+    static readonly TEXT = 'Add instruction grading scale here (only visible for tutors)';
+
+    constructor() {
+        super(MonacoGradingScaleAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addScale', undefined, undefined, true);
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingScaleAction.TEXT, true, false);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingScaleAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts
new file mode 100644
index 000000000000..b68700d3e094
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action.ts
@@ -0,0 +1,20 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+
+export class MonacoGradingUsageCountAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-grading-usage-count.action';
+    static readonly IDENTIFIER = '[maxCountInScore]';
+    static readonly TEXT = '0';
+
+    constructor() {
+        super(MonacoGradingUsageCountAction.ID, 'artemisApp.assessmentInstructions.instructions.editor.addUsageCount', undefined, undefined, true);
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoGradingUsageCountAction.TEXT, true, false);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoGradingUsageCountAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts
index 8a022d32b7fc..07c6c89e4ac5 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-action.model.ts
@@ -11,6 +11,7 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip
     keybindings?: number[];
 
     icon?: IconDefinition;
+    readonly hideInEditor: boolean;
 
     /**
      * The disposable action that is returned by `editor.addAction`. This is required to unregister the action from the editor.
@@ -28,12 +29,14 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip
      * @param translationKey The translation key of the action label.
      * @param icon The icon to display in the editor toolbar, if any.
      * @param keybindings The keybindings to trigger the action, if any.
+     * @param hideInEditor Whether to hide the action in the editor toolbar. Defaults to false.
      */
-    constructor(id: string, translationKey: string, icon?: IconDefinition, keybindings?: number[]) {
+    constructor(id: string, translationKey: string, icon?: IconDefinition, keybindings?: number[], hideInEditor?: boolean) {
         this.id = id;
         this.translationKey = translationKey;
         this.icon = icon;
         this.keybindings = keybindings;
+        this.hideInEditor = hideInEditor ?? false;
     }
 
     /**
@@ -61,6 +64,7 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip
      */
     dispose(): void {
         this.disposableAction?.dispose();
+        this.disposableAction = undefined;
         this._editor = undefined;
     }
 
@@ -321,6 +325,10 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip
         }
     }
 
+    getPosition(editor: monaco.editor.ICodeEditor): monaco.IPosition {
+        return editor.getPosition() ?? { lineNumber: 1, column: 1 };
+    }
+
     /**
      * Sets the selection of the given editor to the given range and reveals it in the center of the editor.
      * @param editor The editor to set the selection in.
@@ -331,6 +339,24 @@ export abstract class MonacoEditorAction implements monaco.editor.IActionDescrip
         editor.revealRangeInCenter(selection);
     }
 
+    /**
+     * Clears the current selection in the given editor, but preserves the cursor position.
+     * @param editor The editor to clear the selection in.
+     */
+    clearSelection(editor: monaco.editor.ICodeEditor): void {
+        const position = this.getPosition(editor);
+        this.setSelection(editor, new monaco.Range(position.lineNumber, position.column, position.lineNumber, position.column));
+    }
+
+    /**
+     * Adjusts the cursor position so it is at the end of the current line.
+     * @param editor The editor to adjust the cursor position in.
+     */
+    moveCursorToEndOfLine(editor: monaco.editor.ICodeEditor): void {
+        const position: monaco.IPosition = { ...this.getPosition(editor), column: Number.POSITIVE_INFINITY };
+        this.setPosition(editor, position);
+    }
+
     /**
      * Toggles the fullscreen mode of the given element. If no element is provided, the editor's DOM node is used.
      * @param editor The editor to toggle the fullscreen mode for.
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts
index f5723fef6394..83969d07626d 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action-with-options.model.ts
@@ -1,5 +1,5 @@
 import { MonacoEditorDomainAction } from './monaco-editor-domain-action.model';
-import { ValueItem } from 'app/shared/markdown-editor/command-constants';
+import { ValueItem } from 'app/shared/markdown-editor/value-item.model';
 
 export interface DomainActionWithOptionsArguments {
     selectedItem: ValueItem;
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts
index c914241efa76..2a9999e96fd2 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model.ts
@@ -1,7 +1,36 @@
 import { MonacoEditorAction } from './monaco-editor-action.model';
+import * as monaco from 'monaco-editor';
 
 /**
  * Class representing domain actions for Artemis-specific use cases.
- * TODO: In the future, each domain action should have its own logic and a unique identifier (e.g. multiple choice questions, drag and drop questions).
  */
-export abstract class MonacoEditorDomainAction extends MonacoEditorAction {}
+export abstract class MonacoEditorDomainAction extends MonacoEditorAction {
+    abstract getOpeningIdentifier(): string;
+
+    /**
+     * Inserts, below the current line, a new line with the domain action identifier and the given text.
+     * Afterward, if specified, sets the selection to cover exactly the provided text part.
+     * @param editor The editor in which to insert the text
+     * @param text The text to insert. Can be empty.
+     * @param indent Whether to indent the inserted text with a tab.
+     * @param updateSelection Whether to update the selection after inserting the text
+     */
+    addTextWithDomainActionIdentifier(editor: monaco.editor.ICodeEditor, text: string, indent = false, updateSelection = true): void {
+        this.clearSelection(editor);
+        this.moveCursorToEndOfLine(editor);
+        const identifierWithText = text ? `${this.getOpeningIdentifier()} ${text}` : this.getOpeningIdentifier();
+        const insertText = indent ? `\n\t${identifierWithText}` : `\n${identifierWithText}`;
+        this.insertTextAtPosition(editor, this.getPosition(editor), insertText);
+        if (updateSelection) {
+            const newPosition = this.getPosition(editor);
+            // Set the selection to cover exactly the text part
+            this.setSelection(editor, {
+                startLineNumber: newPosition.lineNumber,
+                endLineNumber: newPosition.lineNumber,
+                startColumn: newPosition.column - text.length,
+                endColumn: newPosition.column,
+            });
+        }
+        editor.focus();
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts
index 4a605b733520..e7d5de9d0324 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-formula.action.ts
@@ -20,7 +20,11 @@ export class MonacoFormulaAction extends MonacoEditorDomainAction {
      * @param editor The editor in which to toggle formula text.
      */
     run(editor: monaco.editor.ICodeEditor) {
-        this.toggleDelimiterAroundSelection(editor, FORMULA_OPEN_DELIMITER, FORMULA_CLOSE_DELIMITER, MonacoFormulaAction.DEFAULT_FORMULA);
+        this.toggleDelimiterAroundSelection(editor, this.getOpeningIdentifier(), FORMULA_CLOSE_DELIMITER, MonacoFormulaAction.DEFAULT_FORMULA);
         editor.focus();
     }
+
+    getOpeningIdentifier(): string {
+        return FORMULA_OPEN_DELIMITER;
+    }
 }
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-task.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-task.action.ts
index 3a2aa120375a..a55f00bd9d1d 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-task.action.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-task.action.ts
@@ -1,12 +1,16 @@
 import * as monaco from 'monaco-editor';
 import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
 
 /**
  * Action to insert a task into the editor. They follow the format [task][Task Short Description](testCaseName).
  */
 export class MonacoTaskAction extends MonacoEditorDomainAction {
     static readonly ID = 'monaco-task.action';
-    static readonly INSERT_TASK_TEXT = '[task][Task Short Description](testCaseName)\n';
+    static readonly TEXT = '[Task Short Description](testCaseName)\n';
+    static readonly IDENTIFIER = '[task]';
+    static readonly GLOBAL_TASK_REGEX = new RegExp(`${escapeStringForUseInRegex(MonacoTaskAction.IDENTIFIER)}(.*)`, 'g');
+
     constructor() {
         super(MonacoTaskAction.ID, 'artemisApp.programmingExercise.problemStatement.taskCommand', undefined, undefined);
     }
@@ -16,7 +20,11 @@ export class MonacoTaskAction extends MonacoEditorDomainAction {
      * @param editor The editor in which to insert the task.
      */
     run(editor: monaco.editor.ICodeEditor): void {
-        this.replaceTextAtCurrentSelection(editor, MonacoTaskAction.INSERT_TASK_TEXT);
+        this.replaceTextAtCurrentSelection(editor, `${this.getOpeningIdentifier()}${MonacoTaskAction.TEXT}`);
         editor.focus();
     }
+
+    getOpeningIdentifier(): string {
+        return MonacoTaskAction.IDENTIFIER;
+    }
 }
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-test-case.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-test-case.action.ts
index fc243b3943ee..e2d48c615709 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-test-case.action.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/monaco-test-case.action.ts
@@ -74,4 +74,8 @@ export class MonacoTestCaseAction extends MonacoEditorDomainActionWithOptions {
         this.replaceTextAtCurrentSelection(editor, args?.selectedItem?.value ?? MonacoTestCaseAction.DEFAULT_INSERT_TEXT);
         editor.focus();
     }
+
+    getOpeningIdentifier(): string {
+        return '(';
+    }
 }
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts
new file mode 100644
index 000000000000..e8307539ec41
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action.ts
@@ -0,0 +1,20 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import * as monaco from 'monaco-editor';
+
+export class MonacoCorrectMultipleChoiceAnswerAction extends MonacoEditorDomainAction {
+    static readonly ID = 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption';
+    static readonly IDENTIFIER = '[correct]';
+    static readonly TEXT = 'Enter a correct answer option here';
+
+    constructor() {
+        super(MonacoCorrectMultipleChoiceAnswerAction.ID, 'artemisApp.multipleChoiceQuestion.editor.addCorrectAnswerOption');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoCorrectMultipleChoiceAnswerAction.TEXT);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoCorrectMultipleChoiceAnswerAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action.ts
new file mode 100644
index 000000000000..6cc078baa448
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action.ts
@@ -0,0 +1,20 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import * as monaco from 'monaco-editor';
+
+export class MonacoQuizExplanationAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-quiz-explanation.action';
+    static readonly IDENTIFIER = '[exp]';
+    static readonly TEXT = 'Add an explanation here (only visible in feedback after quiz has ended)';
+
+    constructor() {
+        super(MonacoQuizExplanationAction.ID, 'artemisApp.multipleChoiceQuestion.editor.addExplanation');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoQuizExplanationAction.TEXT, true);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoQuizExplanationAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action.ts
new file mode 100644
index 000000000000..29c320bf016b
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action.ts
@@ -0,0 +1,20 @@
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+import * as monaco from 'monaco-editor';
+
+export class MonacoQuizHintAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-quiz-hint.action';
+    static readonly IDENTIFIER = '[hint]';
+    static readonly TEXT = 'Add a hint here (visible during the quiz via ?-Button)';
+
+    constructor() {
+        super(MonacoQuizHintAction.ID, 'artemisApp.multipleChoiceQuestion.editor.addHint');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoQuizHintAction.TEXT, true);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoQuizHintAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action.ts b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action.ts
new file mode 100644
index 000000000000..7c682072eb5a
--- /dev/null
+++ b/src/main/webapp/app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action.ts
@@ -0,0 +1,20 @@
+import * as monaco from 'monaco-editor';
+import { MonacoEditorDomainAction } from 'app/shared/monaco-editor/model/actions/monaco-editor-domain-action.model';
+
+export class MonacoWrongMultipleChoiceAnswerAction extends MonacoEditorDomainAction {
+    static readonly ID = 'monaco-incorrect-multiple-choice-answer.action';
+    static readonly IDENTIFIER = '[wrong]';
+    static readonly TEXT = 'Enter a wrong answer option here';
+
+    constructor() {
+        super(MonacoWrongMultipleChoiceAnswerAction.ID, 'artemisApp.multipleChoiceQuestion.editor.addInCorrectAnswerOption');
+    }
+
+    run(editor: monaco.editor.ICodeEditor): void {
+        this.addTextWithDomainActionIdentifier(editor, MonacoWrongMultipleChoiceAnswerAction.TEXT);
+    }
+
+    getOpeningIdentifier(): string {
+        return MonacoWrongMultipleChoiceAnswerAction.IDENTIFIER;
+    }
+}
diff --git a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts
index b4ddcdc5a58d..e3470bdb6837 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-option-preset.model.ts
@@ -1,17 +1,19 @@
 import * as monaco from 'monaco-editor';
 
+export type MonacoEditorOptions = monaco.editor.IEditorOptions;
+
 /**
  * A preset of Monaco Editor options that can be applied to an editor for specific use cases, e.g. short answer quiz questions.
  * Presets are defined in the file monaco-editor-option.helper.ts.
  */
 export class MonacoEditorOptionPreset {
-    constructor(private options: monaco.editor.IEditorOptions) {}
+    constructor(private options: MonacoEditorOptions) {}
 
     /**
      * Update the editor options with the preset options.
      * @param editor The editor to which the options should be applied.
      */
-    apply(editor: monaco.editor.IStandaloneCodeEditor): void {
+    apply(editor: monaco.editor.ICodeEditor): void {
         editor.updateOptions(this.options);
     }
 }
diff --git a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts
index d138ae87df1c..8ea50ee8898d 100644
--- a/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts
+++ b/src/main/webapp/app/shared/monaco-editor/model/monaco-editor-overlay-widget.model.ts
@@ -20,7 +20,7 @@ export class MonacoEditorOverlayWidget extends MonacoCodeEditorElement implement
     constructor(editor: monaco.editor.ICodeEditor, id: string, domNode: HTMLElement, position: OverlayWidgetPosition) {
         super(editor, id);
         this.domNode = domNode;
-        // At the moment, the inline feedback nodes will only reach their maximum width with the following line. This workaround can be removed as soon as the Ace editor has been replaced.
+        // Ensure that the widget reaches its maximum width.
         this.domNode.style.width = '100%';
         this.position = position;
     }
diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts
index d9c13af84836..ea36346ec1d3 100644
--- a/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts
+++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor-option.helper.ts
@@ -1,4 +1,4 @@
-import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model';
+import { MonacoEditorOptionPreset, MonacoEditorOptions } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model';
 
 export const SHORT_ANSWER_QUIZ_QUESTION_EDITOR_OPTIONS = new MonacoEditorOptionPreset({
     // Hide the gutter
@@ -14,3 +14,40 @@ export const SHORT_ANSWER_QUIZ_QUESTION_EDITOR_OPTIONS = new MonacoEditorOptionP
     // Disable line highlighting
     renderLineHighlight: 'none',
 });
+
+const defaultMarkdownOptions: MonacoEditorOptions = {
+    // Sets up the layout to make the editor look more like a text field (no line numbers, margin, or highlights).
+    lineNumbers: 'off',
+    glyphMargin: false,
+    folding: false,
+    lineDecorationsWidth: '1ch',
+    lineNumbersMinChars: 0,
+    padding: {
+        top: 5,
+    },
+    renderLineHighlight: 'none',
+    // Only show scrollbars if required.
+    scrollbar: {
+        vertical: 'auto',
+        horizontal: 'auto',
+    },
+    overviewRulerLanes: 0,
+    hideCursorInOverviewRuler: true,
+    // The suggestions from showWords are shared between editors of the same language, so we disable them.
+    suggest: {
+        showWords: false,
+    },
+    // We use the 'simple' strategy for word wraps to prevent performance issues. This prevents us from switching to a different font as the lines would no longer break correctly.
+    wordWrap: 'on',
+    wrappingStrategy: 'simple',
+    selectionHighlight: false,
+    occurrencesHighlight: 'off',
+};
+
+export const DEFAULT_MARKDOWN_EDITOR_OPTIONS = new MonacoEditorOptionPreset(defaultMarkdownOptions);
+
+export const COMMUNICATION_MARKDOWN_EDITOR_OPTIONS = new MonacoEditorOptionPreset({
+    ...defaultMarkdownOptions,
+    // Separates the editor suggest widget from the editor's layout. It will stick to the page, but it won't interfere with other elements.
+    fixedOverflowWidgets: true,
+});
diff --git a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts
index e7c5908d1a9a..0e63c2081074 100644
--- a/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts
+++ b/src/main/webapp/app/shared/monaco-editor/monaco-editor.component.ts
@@ -11,7 +11,9 @@ import { MonacoEditorAction } from 'app/shared/monaco-editor/model/actions/monac
 import { TranslateService } from '@ngx-translate/core';
 import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model';
 
-type EditorPosition = { row: number; column: number };
+export const MAX_TAB_SIZE = 8;
+export type EditorPosition = { lineNumber: number; column: number };
+
 @Component({
     selector: 'jhi-monaco-editor',
     template: '',
@@ -100,8 +102,12 @@ export class MonacoEditorComponent implements OnInit, OnDestroy {
     @Output()
     contentHeightChanged = new EventEmitter<number>();
 
+    @Output()
+    onBlurEditor = new EventEmitter<void>();
+
     private contentHeightListener?: monaco.IDisposable;
     private textChangedListener?: monaco.IDisposable;
+    private blurEditorWidgetListener?: monaco.IDisposable;
     private textChangedEmitTimeout?: NodeJS.Timeout;
 
     ngOnInit(): void {
@@ -120,6 +126,10 @@ export class MonacoEditorComponent implements OnInit, OnDestroy {
             }
         });
 
+        this.blurEditorWidgetListener = this._editor.onDidBlurEditorWidget(() => {
+            this.onBlurEditor.emit();
+        });
+
         this.themeSubscription = this.themeService.getCurrentThemeObservable().subscribe((theme) => this.changeTheme(theme));
     }
 
@@ -129,6 +139,7 @@ export class MonacoEditorComponent implements OnInit, OnDestroy {
         this.themeSubscription?.unsubscribe();
         this.textChangedListener?.dispose();
         this.contentHeightListener?.dispose();
+        this.blurEditorWidgetListener?.dispose();
     }
 
     private emitTextChangeEvent() {
@@ -146,14 +157,12 @@ export class MonacoEditorComponent implements OnInit, OnDestroy {
         }
     }
 
-    // Workaround: The rest of the code expects { row, column } - we have { lineNumber, column }. Can be removed when Ace is removed.
     getPosition(): EditorPosition {
-        const position = this._editor.getPosition() ?? new monaco.Position(0, 0);
-        return { row: position.lineNumber, column: position.column };
+        return this._editor.getPosition() ?? { column: 0, lineNumber: 0 };
     }
 
     setPosition(position: EditorPosition) {
-        this._editor.setPosition({ lineNumber: position.row, column: position.column });
+        this._editor.setPosition(position);
     }
 
     setSelection(range: monaco.IRange): void {
@@ -393,43 +402,6 @@ export class MonacoEditorComponent implements OnInit, OnDestroy {
         });
     }
 
-    /**
-     * Enables a text field mode for the editor. This will make the editor look more like a text field and less like a code editor.
-     * In particular, line numbers, margins, and highlights will be disabled.
-     */
-    enableTextFieldMode(): void {
-        this._editor.updateOptions({
-            // Sets up the layout to make the editor look more like a text field (no line numbers, margin, or highlights).
-            lineNumbers: 'off',
-            glyphMargin: false,
-            folding: false,
-            lineDecorationsWidth: '1ch',
-            lineNumbersMinChars: 0,
-            padding: {
-                top: 5,
-            },
-            renderLineHighlight: 'none',
-            selectionHighlight: false,
-            occurrencesHighlight: 'off',
-            // Only show scrollbars if required.
-            scrollbar: {
-                vertical: 'auto',
-                horizontal: 'auto',
-            },
-            overviewRulerLanes: 0,
-            hideCursorInOverviewRuler: true,
-            // The suggestions from showWords are shared between editors of the same language.
-            suggest: {
-                showWords: false,
-            },
-            // Separates the editor suggest widget from the editor's layout. It will stick to the page, but it won't interfere with other elements.
-            fixedOverflowWidgets: true,
-            // We use the 'simple' strategy for word wraps to prevent performance issues. This prevents us from switching to a different font as the lines would no longer break correctly.
-            wrappingStrategy: 'simple',
-        });
-        this.setWordWrap(true);
-    }
-
     /**
      * Applies the given options to the editor.
      * @param options The options to apply.
diff --git a/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html b/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html
index 7b3711efaa4e..87efecdeb42c 100644
--- a/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html
+++ b/src/main/webapp/app/shared/notification/notification-sidebar/notification-sidebar.component.html
@@ -22,9 +22,7 @@
                         <fa-icon class="ng-fa-icon" [icon]="faCog" />
                     </a>
                 </div>
-                <h5 class="mb-3 text-center fw-medium">
-                    {{ 'artemisApp.notification.notifications' | artemisTranslate }}
-                </h5>
+                <h5 class="mb-3 text-center fw-medium" jhiTranslate="artemisApp.notification.notifications"></h5>
                 <button class="close header-icon border-0 bg-transparent pe-2" (click)="toggleSidebar()">
                     <fa-icon class="ng-fa-icon" [icon]="faTimes" />
                 </button>
@@ -37,16 +35,16 @@ <h5 class="mb-3 text-center fw-medium">
                         <fa-icon class="ng-fa-icon" [icon]="faEye" [ngbTooltip]="'artemisApp.notification.showAllSavedNotifications' | artemisTranslate" />
                     }
                 </button>
-                <small class="text-body-secondary">
-                    {{ 'artemisApp.notification.loadedNotificationCount' | artemisTranslate: { loaded: sortedNotifications?.length || '0', total: totalNotifications } }}
-                </small>
+                <small
+                    class="text-body-secondary"
+                    jhiTranslate="artemisApp.notification.loadedNotificationCount"
+                    [translateValues]="{ loaded: sortedNotifications?.length || '0', total: totalNotifications }"
+                ></small>
             </div>
         </div>
         <div id="notification-sidebar-container" (scroll)="onScroll()">
             @if (error) {
-                <div class="alert alert-danger mx-3" role="alert">
-                    {{ 'artemisApp.notification.unexpectedError' | artemisTranslate }}
-                </div>
+                <div class="alert alert-danger mx-3" role="alert" jhiTranslate="artemisApp.notification.unexpectedError"></div>
             }
             @for (notification of sortedNotifications; track notification) {
                 <div class="notification-item p-3" (click)="startNotification(notification)">
@@ -76,14 +74,10 @@ <h5 class="notification-title fw-medium">
                 </div>
             }
             @if (sortedNotifications.length > 0 && sortedNotifications.length >= totalNotifications) {
-                <small class="all-loaded text-center d-block mx-3 my-2">
-                    {{ 'artemisApp.notification.allLoaded' | artemisTranslate }}
-                </small>
+                <small class="all-loaded text-center d-block mx-3 my-2" jhiTranslate="artemisApp.notification.allLoaded"></small>
             }
             @if (sortedNotifications && sortedNotifications.length === 0) {
-                <span class="no-notifications">
-                    {{ 'artemisApp.notification.noNotifications' | artemisTranslate }}
-                </span>
+                <span class="no-notifications" jhiTranslate="artemisApp.notification.noNotifications"></span>
             }
         </div>
     </div>
diff --git a/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts b/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts
index fd3e57b80ddd..d46ee941b24a 100644
--- a/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts
+++ b/src/main/webapp/app/shared/orion/orion-build-and-test.service.ts
@@ -5,12 +5,12 @@ import { filter, map, tap } from 'rxjs/operators';
 import { Observable, Subject, Subscription } from 'rxjs';
 import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
 import { Participation } from 'app/entities/participation/participation.model';
-import { BuildLogEntryArray } from 'app/entities/build-log.model';
-import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { BuildLogEntryArray } from 'app/entities/programming/build-log.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { Result } from 'app/entities/result.model';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { Feedback } from 'app/entities/feedback.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 
 /**
  * Notifies the IDE about a result, that is currently building and forwards incoming test results.
diff --git a/src/main/webapp/app/shared/orion/orion-connector.service.ts b/src/main/webapp/app/shared/orion/orion-connector.service.ts
index b49f8745e8db..61c8a0933cec 100644
--- a/src/main/webapp/app/shared/orion/orion-connector.service.ts
+++ b/src/main/webapp/app/shared/orion/orion-connector.service.ts
@@ -4,7 +4,7 @@ import { ExerciseView, OrionState } from 'app/shared/orion/orion';
 import { Router } from '@angular/router';
 import { REPOSITORY } from 'app/exercises/programming/manage/code-editor/code-editor-instructor-base-container.component';
 import { stringifyCircular } from 'app/shared/util/utils';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { OrionTutorAssessmentComponent } from 'app/orion/assessment/orion-tutor-assessment.component';
 import { AlertService } from 'app/core/util/alert.service';
diff --git a/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html b/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html
index a7b196bb2886..c5234a016536 100644
--- a/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html
+++ b/src/main/webapp/app/shared/participant-scores/participant-scores-distribution/participant-scores-distribution.component.html
@@ -28,17 +28,17 @@
         @if (gradingScaleExists && !isBonus) {
             <div class="d-flex justify-content-center align-items-center">
                 <div class="color-box insufficient-performance"></div>
-                <span class="ms-2">{{ 'artemisApp.examScores.insufficientPerformance' | artemisTranslate }}</span>
+                <span class="ms-2" jhiTranslate="artemisApp.examScores.insufficientPerformance"></span>
                 <div class="ms-4 color-box sufficient-performance"></div>
-                <span class="ms-2">{{ 'artemisApp.examScores.sufficientPerformance' | artemisTranslate }}</span>
+                <span class="ms-2" jhiTranslate="artemisApp.examScores.sufficientPerformance"></span>
             </div>
         }
         @if (!gradingScaleExists || isBonus) {
             <div class="d-flex justify-content-center align-items-center">
                 <div class="color-box critical-performance"></div>
-                <span class="ms-2">{{ 'artemisApp.examScores.criticalPerformance' | artemisTranslate }}</span>
+                <span class="ms-2" jhiTranslate="artemisApp.examScores.criticalPerformance"></span>
                 <div class="ms-4 color-box sufficient-performance"></div>
-                <span class="ms-2">{{ 'artemisApp.examScores.uncriticalPerformance' | artemisTranslate }}</span>
+                <span class="ms-2" jhiTranslate="artemisApp.examScores.uncriticalPerformance"></span>
             </div>
         }
         <jhi-help-icon class="ms-2" placement="right auto" text="{{ helpIconTooltip }}" />
diff --git a/src/main/webapp/app/shared/range-slider/range-slider.component.html b/src/main/webapp/app/shared/range-slider/range-slider.component.html
new file mode 100644
index 000000000000..cf6170502703
--- /dev/null
+++ b/src/main/webapp/app/shared/range-slider/range-slider.component.html
@@ -0,0 +1,32 @@
+<div class="slider m-2 mb-5">
+    <div class="range-input">
+        <div class="progress" [style.left.%]="sliderMinPercentage" [style.right.%]="sliderMaxPercentage"></div>
+        <span class="slider-value" [style.left.%]="sliderMinPercentage * SLIDER_THUMB_LABEL_POSITION_ADJUSTMENT_FACTOR" [style.margin-left]="LABEL_MARGIN + 'rem'"
+            >{{ selectedMinValue }}{{ labelSymbol }}</span
+        >
+        <span class="slider-value" [style.right.%]="sliderMaxPercentage * SLIDER_THUMB_LABEL_POSITION_ADJUSTMENT_FACTOR" [style.margin-right]="LABEL_MARGIN + 'rem'"
+            >{{ selectedMaxValue }}{{ labelSymbol }}</span
+        >
+
+        <input
+            type="range"
+            [min]="generalMinValue"
+            [max]="generalMaxValue"
+            [(ngModel)]="selectedMinValue"
+            class="range-min"
+            [step]="step"
+            (change)="onSelectedMinValueChanged($event)"
+            (input)="updateMinPercentage()"
+        />
+        <input
+            type="range"
+            [min]="generalMinValue"
+            [max]="generalMaxValue"
+            [(ngModel)]="selectedMaxValue"
+            class="range-max"
+            [step]="step"
+            (change)="onSelectedMaxValueChanged($event)"
+            (input)="updateMaxPercentage()"
+        />
+    </div>
+</div>
diff --git a/src/main/webapp/app/shared/range-slider/range-slider.component.scss b/src/main/webapp/app/shared/range-slider/range-slider.component.scss
new file mode 100644
index 000000000000..2342957d2e6d
--- /dev/null
+++ b/src/main/webapp/app/shared/range-slider/range-slider.component.scss
@@ -0,0 +1,65 @@
+$height: 0.5rem;
+$border-radius: 0.5rem;
+
+$slider-thumb-size: 1.2rem;
+$slider-thumb-border-radius: 50%;
+$slider-thumb-color: var(--primary);
+
+.slider {
+    height: $height;
+    border-radius: $border-radius;
+    background: var(--gray-400);
+}
+
+.slider .progress {
+    height: $height;
+    border-radius: $border-radius;
+    position: absolute;
+    background: var(--primary);
+}
+
+.range-input {
+    position: relative;
+}
+
+.range-input input {
+    height: $height;
+    position: absolute;
+    width: 100%;
+    background: none;
+    pointer-events: none;
+    -webkit-appearance: none;
+}
+
+/* Covers Chrome and Safari */
+[type='range']::-webkit-slider-thumb {
+    height: $slider-thumb-size;
+    width: $slider-thumb-size;
+    border-radius: $slider-thumb-border-radius;
+    background: $slider-thumb-color;
+    pointer-events: auto;
+    -webkit-appearance: none;
+    cursor: pointer;
+}
+
+/* covers Mozilla Firefox */
+[type='range']::-moz-range-thumb {
+    height: $slider-thumb-size;
+    width: $slider-thumb-size;
+    border-radius: $slider-thumb-border-radius;
+    background: $slider-thumb-color;
+    pointer-events: auto;
+    -moz-appearance: none;
+    cursor: pointer;
+}
+
+.slider-value {
+    position: absolute;
+    bottom: -2.2rem;
+    pointer-events: none; // we do not want to click the label but the range-thumb
+    color: var(--secondary);
+    text-align: center;
+    justify-content: center;
+    align-content: center;
+    display: flex;
+}
diff --git a/src/main/webapp/app/shared/range-slider/range-slider.component.ts b/src/main/webapp/app/shared/range-slider/range-slider.component.ts
new file mode 100644
index 000000000000..1082ee793ca3
--- /dev/null
+++ b/src/main/webapp/app/shared/range-slider/range-slider.component.ts
@@ -0,0 +1,141 @@
+import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+
+const DEFAULT_STEP = 1;
+
+@Component({
+    selector: 'jhi-range-slider',
+    templateUrl: './range-slider.component.html',
+    styleUrls: ['./range-slider.component.scss'],
+    standalone: true,
+    imports: [FormsModule, ReactiveFormsModule],
+})
+export class RangeSliderComponent implements OnInit, OnDestroy {
+    @Input() generalMaxValue: number;
+    @Input() generalMinValue: number;
+    @Input() step: number = DEFAULT_STEP;
+
+    /** When extending the supported label symbols you might have to adjust the logic for */
+    @Input() labelSymbol?: '%';
+
+    @Input() selectedMinValue: number;
+    @Input() selectedMaxValue: number;
+    @Output() selectedMinValueChange: EventEmitter<number> = new EventEmitter<number>();
+    @Output() selectedMaxValueChange: EventEmitter<number> = new EventEmitter<number>();
+
+    rangeInputElements?: NodeList;
+    eventListeners: { element: HTMLInputElement; listener: (event: Event) => void }[] = [];
+
+    sliderMinPercentage: number;
+    sliderMaxPercentage: number;
+
+    valueRange: number;
+
+    /** Ensures that the label is placed centered underneath the range thumb */
+    LABEL_MARGIN = 0.4;
+
+    /**
+     * By trial and error it was found out that the slider thumbs are moving on
+     * 97% of the width compared to the colored bar that is displayed between the two thumbs.
+     *
+     * This issue is resolved with this factor when multiplied to {@link sliderMinPercentage} and {@link sliderMaxPercentage}
+     * to calculate the position of the label, as it is not the exact same position as the thumbs.
+     *
+     * <i>
+     * To reproduce:
+     * If you inspect the progress bar in the initial state you will see that it is 100% wide and ends at the left end of
+     * the minimum range thumb.
+     * However, if you move the minimum thumb to the right (as far as possible), you will notice that the progress bar
+     * ends at the right end of the range thumb. - This is the problem that we address with this factor.</i>
+     */
+    SLIDER_THUMB_LABEL_POSITION_ADJUSTMENT_FACTOR = 0.97;
+
+    constructor(private elRef: ElementRef) {}
+
+    ngOnInit() {
+        this.rangeInputElements = this.elRef.nativeElement.querySelectorAll('.range-input input');
+
+        this.rangeInputElements?.forEach((input: HTMLInputElement) => {
+            const listener = (event: InputEvent) => {
+                this.ensureMinValueIsSmallerThanMaxValueViceVersa(event);
+            };
+            input.addEventListener('input', listener);
+            this.eventListeners.push({ element: input, listener });
+        });
+        this.valueRange = this.generalMaxValue - this.generalMinValue;
+
+        this.LABEL_MARGIN = this.getLabelMargin();
+
+        this.updateMinPercentage();
+        this.updateMaxPercentage();
+    }
+
+    ngOnDestroy() {
+        this.eventListeners.forEach(({ element, listener }) => {
+            element.removeEventListener('input', listener);
+        });
+    }
+
+    updateMinPercentage() {
+        let newMinSelection = this.selectedMinValue;
+
+        const tryingToSelectInvalidValue = this.selectedMinValue >= this.selectedMaxValue;
+        if (tryingToSelectInvalidValue) {
+            newMinSelection = this.selectedMaxValue - this.step;
+        }
+
+        // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability
+        const newMinPercentage = ((newMinSelection - this.generalMinValue) / this.valueRange) * 100;
+        this.sliderMinPercentage = newMinPercentage;
+    }
+
+    updateMaxPercentage() {
+        let newMaxSelection = this.selectedMaxValue;
+
+        const tryingToSelectInvalidValue = this.selectedMaxValue <= this.selectedMinValue;
+        if (tryingToSelectInvalidValue) {
+            newMaxSelection = this.selectedMinValue + this.step;
+        }
+
+        // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability
+        const newMaxPercentage = 100 - ((newMaxSelection - this.generalMinValue) / this.valueRange) * 100;
+        this.sliderMaxPercentage = newMaxPercentage;
+    }
+
+    onSelectedMinValueChanged(event: Event): void {
+        const updatedMinValue = this.ensureMinValueIsSmallerThanMaxValueViceVersa(event);
+        this.selectedMinValueChange.emit(updatedMinValue);
+    }
+
+    onSelectedMaxValueChanged(event: Event): void {
+        const updatedMaxValue = this.ensureMinValueIsSmallerThanMaxValueViceVersa(event);
+        this.selectedMaxValueChange.emit(updatedMaxValue);
+    }
+
+    private ensureMinValueIsSmallerThanMaxValueViceVersa(event: Event): number {
+        const input = event.target as HTMLInputElement;
+        const minSliderIsUpdated = input.className.includes('range-min');
+
+        if (minSliderIsUpdated) {
+            if (this.selectedMinValue >= this.selectedMaxValue) {
+                this.selectedMinValue = this.selectedMaxValue - this.step;
+            }
+            return this.selectedMinValue;
+        }
+
+        if (this.selectedMaxValue <= this.selectedMinValue) {
+            this.selectedMaxValue = this.selectedMinValue + this.step;
+        }
+        return this.selectedMaxValue;
+    }
+
+    /**
+     * @return margin to labels considering the adjustments needed by the added {@link labelSymbol}
+     */
+    private getLabelMargin() {
+        const BASE_LABEL_MARGIN = 0.4; // should be approximately the width of 1 symbol
+        const shiftToTheLeftDueToAddedSymbols = BASE_LABEL_MARGIN * (this.labelSymbol?.length ?? 0);
+
+        return BASE_LABEL_MARGIN - shiftToTheLeftDueToAddedSymbols;
+    }
+}
diff --git a/src/main/webapp/app/shared/shared-common.module.ts b/src/main/webapp/app/shared/shared-common.module.ts
index 67381071e8cd..b14b2d663504 100644
--- a/src/main/webapp/app/shared/shared-common.module.ts
+++ b/src/main/webapp/app/shared/shared-common.module.ts
@@ -15,13 +15,12 @@ import { CloseCircleComponent } from 'app/shared/close-circle/close-circle.compo
 import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe';
 
 @NgModule({
-    imports: [ArtemisSharedLibsModule],
+    imports: [ArtemisSharedLibsModule, TranslateDirective],
     declarations: [
         ArtemisDatePipe,
         ArtemisDateRangePipe,
         FindLanguageFromKeyPipe,
         AlertOverlayComponent,
-        TranslateDirective,
         SortByDirective,
         SortDirective,
         ArtemisTranslatePipe,
diff --git a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts
index 5fef73b00b99..5cd59c0d3b8e 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts
+++ b/src/main/webapp/app/shared/sidebar/sidebar-accordion/sidebar-accordion.component.ts
@@ -24,10 +24,10 @@ export class SidebarAccordionComponent implements OnChanges, OnInit {
     @Input() showAddOption?: ChannelAccordionShowAdd;
     @Input() channelTypeIcon?: ChannelTypeIcons;
     @Input() collapseState: CollapseState;
+    @Input() isFilterActive: boolean = false;
 
-    //icon
-    faChevronRight = faChevronRight;
-    faFile = faFile;
+    readonly faChevronRight = faChevronRight;
+    readonly faFile = faFile;
 
     ngOnInit() {
         this.expandGroupWithSelectedItem();
@@ -35,7 +35,7 @@ export class SidebarAccordionComponent implements OnChanges, OnInit {
     }
 
     ngOnChanges() {
-        if (this.searchValue) {
+        if (this.searchValue || this.isFilterActive) {
             this.expandAll();
         } else {
             this.setStoredCollapseState();
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.html b/src/main/webapp/app/shared/sidebar/sidebar.component.html
index c9ff6c8a64ae..ea513b48174e 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar.component.html
+++ b/src/main/webapp/app/shared/sidebar/sidebar.component.html
@@ -4,12 +4,28 @@
             @if (searchFieldEnabled) {
                 <div class="mt-2 mb-2">
                     <jhi-search-filter (newSearchEvent)="setSearchValue($event)" class="mb-2" />
+                    @if (showFilter) {
+                        <div class="ms-2 mt-1 text-primary">
+                            <a (click)="openFilterExercisesDialog()">
+                                @if (isFilterActive) {
+                                    <fa-icon [icon]="faFilterCurrentlyApplied" />
+                                } @else {
+                                    <fa-icon [icon]="faFilter" />
+                                }
+                                <span jhiTranslate="artemisApp.courseOverview.exerciseFilter.filter"></span>
+                            </a>
+                        </div>
+                    }
                 </div>
             }
             @if (!sidebarData?.ungroupedData || !(sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue)?.length) {
                 <div
                     [ngClass]="{ 'content-height-dev': !isProduction || isTestServer }"
-                    jhiTranslate="artemisApp.courseOverview.general.noDataFound"
+                    [jhiTranslate]="
+                        (sidebarDataBeforeFiltering?.ungroupedData?.length ?? 0) > 0 && sidebarData.ungroupedData?.length === 0
+                            ? 'artemisApp.courseOverview.general.noElementFoundWithAppliedFilter'
+                            : 'artemisApp.courseOverview.general.noDataFound'
+                    "
                     class="mt-2 text-center scrollable-item-content"
                 ></div>
             } @else {
@@ -36,6 +52,7 @@
                             [channelTypeIcon]="channelTypeIcon"
                             [collapseState]="collapseState"
                             (onUpdateSidebar)="onUpdateSidebar.emit()"
+                            [isFilterActive]="isFilterActive"
                         />
                     } @else {
                         @for (sidebarItem of sidebarData?.ungroupedData | searchFilter: ['title', 'type'] : searchValue; track sidebarItem; let last = $last) {
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.scss b/src/main/webapp/app/shared/sidebar/sidebar.component.scss
index ebfdd50cf1a6..7aa6c10477b1 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar.component.scss
+++ b/src/main/webapp/app/shared/sidebar/sidebar.component.scss
@@ -7,6 +7,7 @@
 }
 
 .scrollable-item-content {
+    overflow-y: auto;
     height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height) - var(--search-height));
     &.content-height-dev {
         height: calc(100vh - var(--sidebar-footer-height-dev) - var(--header-height) - var(--search-height));
@@ -14,8 +15,6 @@
     @media (max-width: 768px) {
         height: calc(100vh - var(--sidebar-footer-height-prod) - var(--header-height) - var(--search-height)) !important;
     }
-
-    overflow-y: auto;
 }
 
 .sidebar {
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.component.ts b/src/main/webapp/app/shared/sidebar/sidebar.component.ts
index fdb0d9adcaaa..de47ff395f76 100644
--- a/src/main/webapp/app/shared/sidebar/sidebar.component.ts
+++ b/src/main/webapp/app/shared/sidebar/sidebar.component.ts
@@ -1,10 +1,20 @@
 import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
-import { faChevronRight, faFilter, faMagnifyingGlass } from '@fortawesome/free-solid-svg-icons';
+import { faFilter, faFilterCircleXmark } from '@fortawesome/free-solid-svg-icons';
 import { ActivatedRoute, Params } from '@angular/router';
 import { Subscription, distinctUntilChanged } from 'rxjs';
 import { ProfileService } from '../layouts/profiles/profile.service';
 import { ChannelAccordionShowAdd, ChannelTypeIcons, CollapseState, SidebarCardSize, SidebarData, SidebarTypes } from 'app/types/sidebar';
 import { SidebarEventService } from './sidebar-event.service';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { cloneDeep } from 'lodash-es';
+import { ExerciseFilterOptions, ExerciseFilterResults } from 'app/types/exercise-filter';
+import {
+    getAchievablePointsAndAchievedScoreFilterOptions,
+    getExerciseCategoryFilterOptions,
+    getExerciseDifficultyFilterOptions,
+    getExerciseTypeFilterOptions,
+} from 'app/shared/sidebar/sidebar.helper';
+import { ExerciseFilterModalComponent } from 'app/shared/exercise-filter/exercise-filter-modal.component';
 
 @Component({
     selector: 'jhi-sidebar',
@@ -22,6 +32,7 @@ export class SidebarComponent implements OnDestroy, OnChanges, OnInit {
     @Input() showAddOption?: ChannelAccordionShowAdd;
     @Input() channelTypeIcon?: ChannelTypeIcons;
     @Input() collapseState: CollapseState;
+    @Input() showFilter: boolean = false;
 
     searchValue = '';
     isCollapsed: boolean = false;
@@ -32,19 +43,26 @@ export class SidebarComponent implements OnDestroy, OnChanges, OnInit {
     profileSubscription?: Subscription;
     sidebarEventSubscription?: Subscription;
     sidebarAccordionEventSubscription?: Subscription;
+
     routeParams: Params;
     isProduction = true;
     isTestServer = false;
 
-    // icons
-    faMagnifyingGlass = faMagnifyingGlass;
-    faChevronRight = faChevronRight;
-    faFilter = faFilter;
+    private modalRef?: NgbModalRef;
+
+    readonly faFilter = faFilter;
+    readonly faFilterCurrentlyApplied = faFilterCircleXmark;
+
+    sidebarDataBeforeFiltering: SidebarData;
+
+    exerciseFilters?: ExerciseFilterOptions;
+    isFilterActive: boolean = false;
 
     constructor(
         private route: ActivatedRoute,
         private profileService: ProfileService,
         private sidebarEventService: SidebarEventService,
+        private modalService: NgbModal,
     ) {}
 
     ngOnInit(): void {
@@ -110,4 +128,43 @@ export class SidebarComponent implements OnDestroy, OnChanges, OnInit {
         };
         return this.sidebarData.sidebarType ? size[this.sidebarData.sidebarType] : 'M';
     }
+
+    openFilterExercisesDialog() {
+        this.initializeFilterOptions();
+
+        if (!this.sidebarDataBeforeFiltering) {
+            this.sidebarDataBeforeFiltering = cloneDeep(this.sidebarData);
+        }
+
+        this.modalRef = this.modalService.open(ExerciseFilterModalComponent, {
+            size: 'lg',
+            backdrop: 'static',
+            animation: true,
+        });
+
+        this.modalRef.componentInstance.sidebarData = cloneDeep(this.sidebarDataBeforeFiltering);
+        this.modalRef.componentInstance.exerciseFilters = cloneDeep(this.exerciseFilters);
+
+        this.modalRef.componentInstance.filterApplied.subscribe((exerciseFilterResults: ExerciseFilterResults) => {
+            this.sidebarData = exerciseFilterResults.filteredSidebarData!;
+            this.exerciseFilters = exerciseFilterResults.appliedExerciseFilters;
+            this.isFilterActive = exerciseFilterResults.isFilterActive;
+        });
+    }
+
+    initializeFilterOptions() {
+        if (this.exerciseFilters) {
+            return;
+        }
+
+        const scoreAndPointsFilterOptions = getAchievablePointsAndAchievedScoreFilterOptions(this.sidebarData, this.exerciseFilters);
+
+        this.exerciseFilters = {
+            categoryFilter: getExerciseCategoryFilterOptions(this.sidebarData, this.exerciseFilters),
+            exerciseTypesFilter: getExerciseTypeFilterOptions(this.sidebarData, this.exerciseFilters),
+            difficultyFilter: getExerciseDifficultyFilterOptions(this.sidebarData, this.exerciseFilters),
+            achievedScore: scoreAndPointsFilterOptions?.achievedScore,
+            achievablePoints: scoreAndPointsFilterOptions?.achievablePoints,
+        };
+    }
 }
diff --git a/src/main/webapp/app/shared/sidebar/sidebar.helper.ts b/src/main/webapp/app/shared/sidebar/sidebar.helper.ts
new file mode 100644
index 000000000000..c77e558b5390
--- /dev/null
+++ b/src/main/webapp/app/shared/sidebar/sidebar.helper.ts
@@ -0,0 +1,269 @@
+import { DifficultyFilterOption, ExerciseCategoryFilterOption, ExerciseFilterOptions, ExerciseTypeFilterOption, FilterOption, RangeFilter } from 'app/types/exercise-filter';
+import { SidebarCardElement, SidebarData } from 'app/types/sidebar';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { DifficultyLevel, ExerciseType, getIcon } from 'app/entities/exercise.model';
+import { getLatestResultOfStudentParticipation } from 'app/exercises/shared/participation/participation.utils';
+import { roundToNextMultiple } from 'app/shared/util/utils';
+
+const POINTS_STEP = 1;
+const SCORE_THRESHOLD_TO_INCREASE_STEP = 20;
+const SMALL_SCORE_STEP = 1;
+const SCORE_STEP = 5;
+
+const DEFAULT_DIFFICULTIES_FILTER: DifficultyFilterOption[] = [
+    { name: 'artemisApp.exercise.easy', value: DifficultyLevel.EASY, checked: false },
+    { name: 'artemisApp.exercise.medium', value: DifficultyLevel.MEDIUM, checked: false },
+    { name: 'artemisApp.exercise.hard', value: DifficultyLevel.HARD, checked: false },
+];
+
+const DEFAULT_EXERCISE_TYPES_FILTER: ExerciseTypeFilterOption[] = [
+    { name: 'artemisApp.courseStatistics.programming', value: ExerciseType.PROGRAMMING, checked: false, icon: getIcon(ExerciseType.PROGRAMMING) },
+    { name: 'artemisApp.courseStatistics.quiz', value: ExerciseType.QUIZ, checked: false, icon: getIcon(ExerciseType.QUIZ) },
+    { name: 'artemisApp.courseStatistics.modeling', value: ExerciseType.MODELING, checked: false, icon: getIcon(ExerciseType.MODELING) },
+    { name: 'artemisApp.courseStatistics.text', value: ExerciseType.TEXT, checked: false, icon: getIcon(ExerciseType.TEXT) },
+    { name: 'artemisApp.courseStatistics.file-upload', value: ExerciseType.FILE_UPLOAD, checked: false, icon: getIcon(ExerciseType.FILE_UPLOAD) },
+];
+
+function getAvailableCategoriesAsFilterOptions(sidebarData?: SidebarData): ExerciseCategoryFilterOption[] | undefined {
+    const sidebarElementsWithExerciseCategory: SidebarCardElement[] | undefined = sidebarData?.ungroupedData?.filter(
+        (sidebarElement: SidebarCardElement) => sidebarElement.exercise?.categories !== undefined,
+    );
+    const availableCategories: ExerciseCategory[] | undefined = sidebarElementsWithExerciseCategory?.flatMap(
+        (sidebarElement: SidebarCardElement) => sidebarElement.exercise?.categories || [],
+    );
+
+    // noinspection UnnecessaryLocalVariableJS: not inlined because the variable name improves readability
+    const availableCategoriesAsFilterOptions: ExerciseCategoryFilterOption[] | undefined = availableCategories?.map((category: ExerciseCategory) => ({
+        category: category,
+        searched: false,
+    }));
+    return availableCategoriesAsFilterOptions;
+}
+
+function getExerciseCategoryFilterOptionsWithoutDuplicates(exerciseCategoryFilterOptions?: ExerciseCategoryFilterOption[]): ExerciseCategoryFilterOption[] | undefined {
+    return exerciseCategoryFilterOptions?.reduce((unique: ExerciseCategoryFilterOption[], item: ExerciseCategoryFilterOption) => {
+        if (!unique.some((uniqueItem) => uniqueItem.category.equals(item.category))) {
+            unique.push(item);
+        }
+        return unique;
+    }, []);
+}
+
+function sortExerciseCategoryFilterOptionsSortedByName(exerciseCategoryFilterOptions?: ExerciseCategoryFilterOption[]): ExerciseCategoryFilterOption[] {
+    return exerciseCategoryFilterOptions?.sort((categoryFilterOptionsA, categoryFilterOptionB) => categoryFilterOptionsA.category.compare(categoryFilterOptionB.category)) ?? [];
+}
+
+/**
+ * @param exerciseFilters that might already be defined for the course sidebar
+ * @param sidebarData that contains the exercises of a course and their information
+ *
+ * @returns already defined category filter options if they exist, otherwise the category filter options based on the sidebar data
+ */
+export function getExerciseCategoryFilterOptions(sidebarData?: SidebarData, exerciseFilters?: ExerciseFilterOptions): FilterOption<ExerciseCategoryFilterOption> {
+    if (exerciseFilters?.categoryFilter) {
+        return exerciseFilters?.categoryFilter;
+    }
+
+    const availableCategoriesAsFilterOptions = getAvailableCategoriesAsFilterOptions(sidebarData);
+    const selectableCategoryFilterOptions = getExerciseCategoryFilterOptionsWithoutDuplicates(availableCategoriesAsFilterOptions);
+    const sortedCategoryFilterOptions = sortExerciseCategoryFilterOptionsSortedByName(selectableCategoryFilterOptions);
+
+    const isDisplayed = !!sortedCategoryFilterOptions.length;
+    return { isDisplayed: isDisplayed, options: selectableCategoryFilterOptions ?? [] };
+}
+
+/**
+ * @param exerciseFilters that might already be defined for the course sidebar
+ * @param sidebarData that contains the exercises of a course and their information
+ *
+ * @returns already defined exercise type filter options if they exist, otherwise the exercise type filter options based on the sidebar data
+ */
+export function getExerciseTypeFilterOptions(sidebarData?: SidebarData, exerciseFilters?: ExerciseFilterOptions): FilterOption<ExerciseTypeFilterOption> {
+    if (exerciseFilters?.exerciseTypesFilter) {
+        return exerciseFilters?.exerciseTypesFilter;
+    }
+
+    const existingExerciseTypes = sidebarData?.ungroupedData
+        ?.filter((sidebarElement: SidebarCardElement) => sidebarElement.type !== undefined)
+        .map((sidebarElement: SidebarCardElement) => sidebarElement.type);
+
+    const availableTypeFilters = DEFAULT_EXERCISE_TYPES_FILTER?.filter((exerciseType) => existingExerciseTypes?.includes(exerciseType.value));
+
+    return { isDisplayed: availableTypeFilters.length > 1, options: availableTypeFilters };
+}
+
+/**
+ * @param exerciseFilters that might already be defined for the course sidebar
+ * @param sidebarData that contains the exercises of a course and their information
+ *
+ * @returns already defined difficulty filter options if they exist, otherwise the difficulty filter options based on the sidebar data
+ */
+export function getExerciseDifficultyFilterOptions(sidebarData?: SidebarData, exerciseFilters?: ExerciseFilterOptions): FilterOption<DifficultyFilterOption> {
+    if (exerciseFilters?.difficultyFilter) {
+        return exerciseFilters.difficultyFilter;
+    }
+
+    const existingDifficulties = sidebarData?.ungroupedData
+        ?.filter((sidebarElement: SidebarCardElement) => sidebarElement.difficulty !== undefined)
+        .map((sidebarElement: SidebarCardElement) => sidebarElement.difficulty);
+
+    const availableDifficultyFilters = DEFAULT_DIFFICULTIES_FILTER?.filter((difficulty) => existingDifficulties?.includes(difficulty.value));
+
+    return { isDisplayed: !!availableDifficultyFilters.length, options: availableDifficultyFilters };
+}
+
+export function isRangeFilterApplied(rangeFilter?: RangeFilter): boolean {
+    if (!rangeFilter?.filter) {
+        return false;
+    }
+
+    const filter = rangeFilter.filter;
+    const isExcludingMinValues = filter.selectedMin !== filter.generalMin;
+    const isExcludingMaxValues = filter.selectedMax !== filter.generalMax;
+    return isExcludingMinValues || isExcludingMaxValues;
+}
+
+function getUpdatedMinAndMaxValues(minValue: number, maxValue: number, currentMaxValue: number) {
+    let updatedMinValue = minValue;
+    let updatedMaxValue = maxValue;
+
+    if (currentMaxValue < minValue) {
+        updatedMinValue = currentMaxValue;
+    }
+    if (currentMaxValue > maxValue) {
+        updatedMaxValue = currentMaxValue;
+    }
+
+    return { updatedMinValue, updatedMaxValue };
+}
+
+/**
+ * The calculation for points and score are intentionally mixed into one method to reduce the number of iterations over the sidebar data.
+ * @param sidebarData
+ */
+function calculateMinAndMaxForPointsAndScore(sidebarData: SidebarData) {
+    let minAchievablePoints = Infinity;
+    let maxAchievablePoints = -Infinity;
+
+    let minAchievedScore = Infinity;
+    let maxAchievedScore = -Infinity;
+
+    sidebarData.ungroupedData?.forEach((sidebarElement: SidebarCardElement) => {
+        if (sidebarElement.exercise?.maxPoints) {
+            const currentExerciseMaxPoints = sidebarElement.exercise.maxPoints;
+
+            const { updatedMinValue, updatedMaxValue } = getUpdatedMinAndMaxValues(minAchievablePoints, maxAchievablePoints, currentExerciseMaxPoints);
+            minAchievablePoints = updatedMinValue;
+            maxAchievablePoints = updatedMaxValue;
+
+            if (sidebarElement.studentParticipation) {
+                const currentExerciseAchievedScore = getLatestResultOfStudentParticipation(sidebarElement.studentParticipation, true)?.score;
+
+                if (currentExerciseAchievedScore !== undefined) {
+                    const { updatedMinValue, updatedMaxValue } = getUpdatedMinAndMaxValues(minAchievedScore, maxAchievedScore, currentExerciseAchievedScore);
+                    minAchievedScore = updatedMinValue;
+                    maxAchievedScore = updatedMaxValue;
+                }
+            }
+        }
+    });
+
+    return { minAchievablePoints, maxAchievablePoints, minAchievedScore, maxAchievedScore };
+}
+
+/**
+ * **Rounds the min and max values for achievable points and achieved score to the next multiple of the step.
+ * The step {@link POINTS_STEP}, and {@link SCORE_STEP} or {@link SMALL_SCORE_STEP} are the selectable values for the range filter.**
+ * <br>
+ * <i>For the **score filter**, the step is increased if we have more than 20 values between the min and max value,
+ * as up to 100 values are theoretically possible.<br>
+ * For the **achievable points filter**, the step is always 1 as exercises usually have between 1 and 15 points,
+ * so we do not need to increase the step and thereby limit accuracy of filter options.</i>
+ *
+ * @param minAchievablePoints
+ * @param maxAchievablePoints
+ * @param minAchievedScore
+ * @param maxAchievedScore
+ */
+function roundRangeFilterMinAndMaxValues(minAchievablePoints: number, maxAchievablePoints: number, minAchievedScore: number, maxAchievedScore: number) {
+    const roundUp = true;
+    const roundDown = false;
+    const minAchievablePointsRounded = roundToNextMultiple(minAchievablePoints, POINTS_STEP, roundDown);
+    const maxAchievablePointsRounded = roundToNextMultiple(maxAchievablePoints, POINTS_STEP, roundUp);
+
+    let minAchievedScoreRounded;
+    let maxAchievedScoreRounded;
+
+    if (maxAchievedScore > SCORE_THRESHOLD_TO_INCREASE_STEP) {
+        minAchievedScoreRounded = roundToNextMultiple(minAchievedScore, SCORE_STEP, roundDown);
+        maxAchievedScoreRounded = roundToNextMultiple(maxAchievedScore, SCORE_STEP, roundUp);
+    } else {
+        minAchievedScoreRounded = roundToNextMultiple(minAchievedScore, SMALL_SCORE_STEP, roundDown);
+        maxAchievedScoreRounded = roundToNextMultiple(maxAchievedScore, SMALL_SCORE_STEP, roundUp);
+    }
+
+    return { minAchievablePointsRounded, maxAchievablePointsRounded, minAchievedScoreRounded, maxAchievedScoreRounded };
+}
+
+function calculateAchievablePointsFilterOptions(sidebarData: SidebarData): { achievablePoints?: RangeFilter; achievedScore?: RangeFilter } {
+    const { minAchievablePoints, maxAchievablePoints, minAchievedScore, maxAchievedScore } = calculateMinAndMaxForPointsAndScore(sidebarData);
+
+    const { minAchievablePointsRounded, maxAchievablePointsRounded, minAchievedScoreRounded, maxAchievedScoreRounded } = roundRangeFilterMinAndMaxValues(
+        minAchievablePoints,
+        maxAchievablePoints,
+        minAchievedScore,
+        maxAchievedScore,
+    );
+
+    return {
+        achievablePoints: {
+            isDisplayed: minAchievablePointsRounded < maxAchievablePointsRounded,
+            filter: {
+                generalMin: minAchievablePointsRounded,
+                generalMax: maxAchievablePointsRounded,
+                selectedMin: minAchievablePointsRounded,
+                selectedMax: maxAchievablePointsRounded,
+                step: POINTS_STEP,
+            },
+        },
+        achievedScore: {
+            isDisplayed: minAchievedScoreRounded < maxAchievedScoreRounded && minAchievedScoreRounded !== Infinity,
+            filter: {
+                generalMin: minAchievedScoreRounded,
+                generalMax: maxAchievedScoreRounded,
+                selectedMin: minAchievedScoreRounded,
+                selectedMax: maxAchievedScoreRounded,
+                step: maxAchievedScoreRounded <= SCORE_THRESHOLD_TO_INCREASE_STEP ? SMALL_SCORE_STEP : SCORE_STEP,
+            },
+        },
+    };
+}
+
+/**
+ * @param exerciseFilters that might already be defined for the course sidebar
+ * @param sidebarData that contains the exercises of a course and their information
+ *
+ * @returns already defined achievable points and achieved score filter options if they exist, otherwise the achievable points and achieved score filter options based on the sidebar data
+ */
+export function getAchievablePointsAndAchievedScoreFilterOptions(
+    sidebarData?: SidebarData,
+    exerciseFilters?: ExerciseFilterOptions,
+): {
+    achievablePoints?: RangeFilter;
+    achievedScore?: RangeFilter;
+} {
+    if (!sidebarData?.ungroupedData) {
+        return { achievablePoints: undefined, achievedScore: undefined };
+    }
+
+    const isPointsFilterApplied = isRangeFilterApplied(exerciseFilters?.achievablePoints);
+    const isScoreFilterApplied = isRangeFilterApplied(exerciseFilters?.achievedScore);
+
+    const isRecalculatingFilterOptionsRequired = isPointsFilterApplied || isScoreFilterApplied || !exerciseFilters?.achievablePoints || !exerciseFilters?.achievedScore;
+    if (!isRecalculatingFilterOptionsRequired) {
+        // the scores might change when we work on exercises, so we re-calculate the filter options (but only if the filter is actually applied)
+        return { achievablePoints: exerciseFilters?.achievablePoints, achievedScore: exerciseFilters?.achievedScore };
+    }
+
+    return calculateAchievablePointsFilterOptions(sidebarData);
+}
diff --git a/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html b/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html
index 531278576856..961dc2547a02 100644
--- a/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html
+++ b/src/main/webapp/app/shared/statistics-graph/statistics-average-score-graph.component.html
@@ -1,6 +1,6 @@
 <div class="row mb-3 d-flex justify-content-center">
     <div class="col-xl-1 d-flex flex-column">
-        <h3>{{ 'artemisApp.course.averageScore' | artemisTranslate }}</h3>
+        <h3 jhiTranslate="artemisApp.course.averageScore"></h3>
         <h4>{{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ courseAverage }}%</h4>
     </div>
     <div class="row col-xl-11 chart-row">
@@ -58,15 +58,15 @@ <h4>{{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou
                         id="filter-dropdown-button"
                     >
                         <fa-icon [icon]="faFilter" />
-                        <span>{{
-                            'artemisApp.courseOverview.exerciseList.filter'
-                                | artemisTranslate: { num: exerciseTypeFilter.numberOfActiveFilters + chartCategoryFilter.numberOfActiveFilters }
-                        }}</span>
+                        <span
+                            jhiTranslate="artemisApp.courseOverview.exerciseList.filter"
+                            [translateValues]="{ num: exerciseTypeFilter.numberOfActiveFilters + chartCategoryFilter.numberOfActiveFilters }"
+                        ></span>
                     </button>
                     <ul ngbDropdownMenu class="checkbox-menu text-nowrap pe-2" aria-labelledby="filter-dropdown-button">
                         @if (exerciseTypeFilter.typeSet.size) {
                             <li>
-                                <b class="ms-2">{{ 'artemisApp.exercise-scores-chart.includeType' | artemisTranslate }}</b>
+                                <b class="ms-2" jhiTranslate="artemisApp.exercise-scores-chart.includeType"></b>
                             </li>
                         }
                         @for (type of exerciseTypeFilter.typeSet; track type) {
@@ -83,12 +83,12 @@ <h4>{{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou
                             </li>
                         }
                         <li class="mt-1 mb-1">
-                            <b class="ms-2">{{ 'artemisApp.courseOverview.statistics.includeIndividualCategories' | artemisTranslate }}</b>
+                            <b class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.includeIndividualCategories"></b>
                         </li>
                         <li>
                             <label class="mb-1">
                                 <input class="ms-2 form-check-input" (change)="toggleAllCategories()" [checked]="chartCategoryFilter.allCategoriesSelected" type="checkbox" />
-                                <b class="ms-2">{{ 'artemisApp.courseOverview.statistics.includeAllCategories' | artemisTranslate }}</b>
+                                <b class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.includeAllCategories"></b>
                             </label>
                         </li>
                         @if (chartCategoryFilter.exercisesWithoutCategoriesPresent) {
@@ -100,7 +100,7 @@ <h4>{{ 'artemisApp.courseStatistics.courseAverage' | artemisTranslate }}: {{ cou
                                         [checked]="chartCategoryFilter.includeExercisesWithNoCategory"
                                         type="checkbox"
                                     />
-                                    <span class="ms-2">{{ 'artemisApp.courseOverview.statistics.exercisesWithNoCategories' | artemisTranslate }}</span>
+                                    <span class="ms-2" jhiTranslate="artemisApp.courseOverview.statistics.exercisesWithNoCategories"></span>
                                 </label>
                             </li>
                         }
diff --git a/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html b/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html
index 2f15e2d4e415..88e1222da5fe 100644
--- a/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html
+++ b/src/main/webapp/app/shared/statistics-graph/statistics-score-distribution-graph.component.html
@@ -1,6 +1,6 @@
 <div class="row mb-3">
     <div class="col-xl-2">
-        <h3>{{ 'statistics.score_distribution' | artemisTranslate }}</h3>
+        <h3 jhiTranslate="statistics.score_distribution"></h3>
     </div>
     <div #containerRef class="col-xl-9">
         <ngx-charts-bar-vertical
diff --git a/src/main/webapp/app/shared/statistics-graph/statistics.service.ts b/src/main/webapp/app/shared/statistics-graph/statistics.service.ts
index 27b83a0eac33..233a10bfd8d8 100644
--- a/src/main/webapp/app/shared/statistics-graph/statistics.service.ts
+++ b/src/main/webapp/app/shared/statistics-graph/statistics.service.ts
@@ -48,7 +48,7 @@ export class StatisticsService {
         const params = new HttpParams().set('courseId', '' + courseId);
         return this.http.get<CourseManagementStatisticsDTO>(`${this.resourceUrl}course-statistics`, { params }).pipe(
             map((res: CourseManagementStatisticsDTO) => {
-                StatisticsService.convertExerciseCategoriesOfrCourseManagementStatisticsFromServer(res);
+                StatisticsService.convertExerciseCategoriesOfCourseManagementStatisticsFromServer(res);
                 return StatisticsService.convertCourseManagementStatisticDatesFromServer(res);
             }),
         );
@@ -78,9 +78,9 @@ export class StatisticsService {
         return dto;
     }
 
-    private static convertExerciseCategoriesOfrCourseManagementStatisticsFromServer(res: CourseManagementStatisticsDTO): CourseManagementStatisticsDTO {
+    private static convertExerciseCategoriesOfCourseManagementStatisticsFromServer(res: CourseManagementStatisticsDTO): CourseManagementStatisticsDTO {
         res.averageScoresOfExercises.forEach((avgScoresOfExercise) => {
-            avgScoresOfExercise.categories = avgScoresOfExercise.categories?.map((category) => JSON.parse(category as string) as ExerciseCategory);
+            avgScoresOfExercise.categories = avgScoresOfExercise.categories?.map((category) => new ExerciseCategory(category.category, category.color));
         });
         return res;
     }
diff --git a/src/main/webapp/app/shared/type-ahead-search-field/type-ahead-user-search-field.component.html b/src/main/webapp/app/shared/type-ahead-search-field/type-ahead-user-search-field.component.html
index 7dbc4fc19bd5..7b0bcf687577 100644
--- a/src/main/webapp/app/shared/type-ahead-search-field/type-ahead-user-search-field.component.html
+++ b/src/main/webapp/app/shared/type-ahead-search-field/type-ahead-user-search-field.component.html
@@ -1,4 +1,4 @@
-<label class="mb-1 form-check-label" for="typeahead-user-login">{{ 'artemisApp.dataExport.loginOrName' | artemisTranslate }}</label>
+<label class="mb-1 form-check-label" for="typeahead-user-login" jhiTranslate="artemisApp.dataExport.loginOrName"></label>
 <div class="search-container">
     <input
         id="typeahead-user-login"
diff --git a/src/main/webapp/app/shared/user-import/users-import-button.component.ts b/src/main/webapp/app/shared/user-import/users-import-button.component.ts
index 8056a4dbf2d1..88cd5df1b505 100644
--- a/src/main/webapp/app/shared/user-import/users-import-button.component.ts
+++ b/src/main/webapp/app/shared/user-import/users-import-button.component.ts
@@ -3,7 +3,7 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
 import { UsersImportDialogComponent } from 'app/shared/user-import/users-import-dialog.component';
 import { CourseGroup } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { faFileImport } from '@fortawesome/free-solid-svg-icons';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 
diff --git a/src/main/webapp/app/shared/user-import/users-import-dialog.component.html b/src/main/webapp/app/shared/user-import/users-import-dialog.component.html
index 325865a635d8..8c9e6b6fd7a1 100644
--- a/src/main/webapp/app/shared/user-import/users-import-dialog.component.html
+++ b/src/main/webapp/app/shared/user-import/users-import-dialog.component.html
@@ -175,16 +175,16 @@ <h4 class="modal-title">
             <div class="flex-shrink-0 me-2 d-flex">
                 @if (!hasImported) {
                     <div>
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsers' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsers"></strong>
                         <span>&nbsp;{{ usersToImport.length }}</span>
                     </div>
                 } @else {
                     <div>
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsersImported' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsersImported"></strong>
                         <span>{{ numberOfUsersImported }}</span>
                     </div>
                     <div class="ms-2">
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsersNotImported"></strong>
                         <span
                             ><b style="color: red">{{ numberOfUsersNotImported }}</b></span
                         >
@@ -196,16 +196,16 @@ <h4 class="modal-title">
             <div class="flex-shrink-0 me-2 d-flex">
                 @if (!hasImported) {
                     <div>
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsers' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsers"></strong>
                         <span>&nbsp;{{ examUsersToImport.length }}</span>
                     </div>
                 } @else {
                     <div>
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsersImported' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsersImported"></strong>
                         <span>{{ numberOfUsersImported }}</span>
                     </div>
                     <div class="ms-2">
-                        <strong>{{ 'artemisApp.importUsers.numberOfUsersNotImported' | artemisTranslate }}</strong>
+                        <strong jhiTranslate="artemisApp.importUsers.numberOfUsersNotImported"></strong>
                         <span
                             ><b style="color: red">{{ numberOfUsersNotImported }}</b></span
                         >
diff --git a/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts b/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts
index cb8287d7b74d..147cf3a2e661 100644
--- a/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts
+++ b/src/main/webapp/app/shared/user-import/users-import-dialog.component.ts
@@ -3,12 +3,12 @@ import { NgForm } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
 import { HttpResponse } from '@angular/common/http';
-import { ExamUserDTO } from 'app/entities/exam-user-dto.model';
+import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model';
 import { cleanString } from 'app/shared/util/utils';
 import { Subject } from 'rxjs';
 import { ActionType } from 'app/shared/delete-dialog/delete-dialog.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { StudentDTO } from 'app/entities/student-dto.model';
 import { parse } from 'papaparse';
diff --git a/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html b/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html
index 42462ba6efce..3839e7313a50 100644
--- a/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html
+++ b/src/main/webapp/app/shared/user-settings/account-information/account-information.component.html
@@ -1,51 +1,33 @@
-<h1>
-    <!--Account Information-->
-    {{ 'artemisApp.userSettings.accountInformation' | artemisTranslate }}
-</h1>
+<h1 jhiTranslate="artemisApp.userSettings.accountInformation"></h1>
 @if (currentUser) {
     <div class="list-group d-block">
         @if (currentUser.name) {
             <div class="list-group-item">
-                <dt>
-                    <!--Full Name-->
-                    {{ 'artemisApp.userSettings.accountInformationPage.fullName' | artemisTranslate }}
-                </dt>
+                <dt jhiTranslate="artemisApp.userSettings.accountInformationPage.fullName"></dt>
                 <dd>{{ currentUser.name }}</dd>
             </div>
         }
         @if (currentUser.login) {
             <div class="list-group-item">
-                <dt>
-                    <!--Login-->
-                    {{ 'artemisApp.userSettings.accountInformationPage.login' | artemisTranslate }}
-                </dt>
+                <dt jhiTranslate="artemisApp.userSettings.accountInformationPage.login"></dt>
                 <dd>{{ currentUser.login }}</dd>
             </div>
         }
         @if (currentUser.email) {
             <div class="list-group-item">
-                <dt>
-                    <!--Email-->
-                    {{ 'artemisApp.userSettings.accountInformationPage.email' | artemisTranslate }}
-                </dt>
+                <dt jhiTranslate="artemisApp.userSettings.accountInformationPage.email"></dt>
                 <dd>{{ currentUser.email }}</dd>
             </div>
         }
         @if (currentUser.visibleRegistrationNumber) {
             <div class="list-group-item">
-                <dt>
-                    <!--Registration Number-->
-                    {{ 'artemisApp.userSettings.accountInformationPage.registrationNumber' | artemisTranslate }}
-                </dt>
+                <dt jhiTranslate="artemisApp.userSettings.accountInformationPage.registrationNumber"></dt>
                 <dd>{{ currentUser.visibleRegistrationNumber }}</dd>
             </div>
         }
         @if (currentUser.createdDate) {
             <div class="list-group-item">
-                <dt>
-                    <!--Joined Artemis on-->
-                    {{ 'artemisApp.userSettings.accountInformationPage.joinedArtemis' | artemisTranslate }}
-                </dt>
+                <dt jhiTranslate="artemisApp.userSettings.accountInformationPage.joinedArtemis"></dt>
                 <dd>{{ currentUser.createdDate | artemisDate }}</dd>
             </div>
         }
diff --git a/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html b/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html
index 269661531970..acacf8e53e74 100644
--- a/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html
+++ b/src/main/webapp/app/shared/user-settings/notification-settings/notification-settings.component.html
@@ -6,10 +6,7 @@ <h1>
         </h1>
         <div class="d-inline-flex userSettings-info">
             <fa-icon class="ng-fa-icon" [icon]="faInfoCircle" />
-            <span class="ps-1">
-                <!-- Info text explaining that these settings also filter the notification sidebar -->
-                {{ 'artemisApp.userSettings.notificationSettingsFilterInfo' | artemisTranslate }}
-            </span>
+            <span class="ps-1" jhiTranslate="artemisApp.userSettings.notificationSettingsFilterInfo"></span>
         </div>
     </div>
     @if (settingsChanged) {
diff --git a/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html b/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html
index 785898d7944e..5630d96781d8 100644
--- a/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html
+++ b/src/main/webapp/app/shared/user-settings/science-settings/science-settings.component.html
@@ -6,16 +6,12 @@ <h1>
         </h1>
         <div class="d-flex userSettings-info">
             <fa-icon class="ng-fa-icon" [icon]="faInfoCircle" />
-            <span class="ps-1">
-                {{ 'artemisApp.userSettings.scienceSettingsInfo' | artemisTranslate }}
-            </span>
+            <span class="ps-1" jhiTranslate="artemisApp.userSettings.scienceSettingsInfo"></span>
         </div>
         @if (!featureToggleActive) {
             <div class="d-flex mt-2 userSettings-info">
                 <fa-icon class="ng-fa-icon" [icon]="faInfoCircle" />
-                <span class="ps-1">
-                    {{ 'artemisApp.userSettings.scienceSettingsFeatureDisabled' | artemisTranslate }}
-                </span>
+                <span class="ps-1" jhiTranslate="artemisApp.userSettings.scienceSettingsFeatureDisabled"></span>
             </div>
         }
     </div>
diff --git a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html
index 7056c68a6534..6391b4986739 100644
--- a/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html
+++ b/src/main/webapp/app/shared/user-settings/user-settings-container/user-settings-container.component.html
@@ -16,26 +16,23 @@
             </div>
             <!-- links to the different settings -->
             <section id="navigation-bar" class="list-group d-block pt-2">
-                <span class="list-group-item disabled fw-bold">
-                    <!--User Settings Menu Title-->
-                    {{ 'artemisApp.userSettings.userSettings' | artemisTranslate }}
-                </span>
-                <a class="list-group-item btn btn-outline-primary" routerLink="account" routerLinkActive="active">
-                    <!--Account Information-->
-                    {{ 'artemisApp.userSettings.accountInformation' | artemisTranslate }}
-                </a>
-                <a class="list-group-item btn btn-outline-primary" routerLink="notifications" routerLinkActive="active">
-                    <!--Notification Settings-->
-                    {{ 'artemisApp.userSettings.notificationSettings' | artemisTranslate }}
-                </a>
-                <a class="list-group-item btn btn-outline-primary" routerLink="science" routerLinkActive="active">
-                    <!--Science Settings-->
-                    {{ 'artemisApp.userSettings.scienceSettings' | artemisTranslate }}
-                </a>
+                <span class="list-group-item disabled fw-bold" jhiTranslate="artemisApp.userSettings.userSettings"></span>
+                <a class="list-group-item btn btn-outline-primary" routerLink="account" routerLinkActive="active" jhiTranslate="artemisApp.userSettings.accountInformation"></a>
+                <a
+                    class="list-group-item btn btn-outline-primary"
+                    routerLink="notifications"
+                    routerLinkActive="active"
+                    jhiTranslate="artemisApp.userSettings.notificationSettings"
+                ></a>
+                <a class="list-group-item btn btn-outline-primary" routerLink="science" routerLinkActive="active" jhiTranslate="artemisApp.userSettings.scienceSettings"></a>
                 @if (localVCEnabled) {
-                    <a class="list-group-item btn btn-outline-primary" routerLink="sshSettings" routerLinkActive="active">
-                        <!--Account Information-->
-                        {{ 'artemisApp.userSettings.sshSettings' | artemisTranslate }}
+                    <a class="list-group-item btn btn-outline-primary" routerLink="ssh" routerLinkActive="active" jhiTranslate="artemisApp.userSettings.sshSettings"></a>
+                    <a
+                        class="list-group-item btn btn-outline-primary"
+                        routerLink="vcs-token"
+                        routerLinkActive="active"
+                        jhiTranslate="artemisApp.userSettings.vcsAccessTokenSettings"
+                    >
                     </a>
                 }
             </section>
diff --git a/src/main/webapp/app/shared/user-settings/user-settings.module.ts b/src/main/webapp/app/shared/user-settings/user-settings.module.ts
index 98f82ef20bef..c006c7f5e904 100644
--- a/src/main/webapp/app/shared/user-settings/user-settings.module.ts
+++ b/src/main/webapp/app/shared/user-settings/user-settings.module.ts
@@ -8,9 +8,19 @@ import { userSettingsState } from 'app/shared/user-settings/user-settings.route'
 import { ScienceSettingsComponent } from 'app/shared/user-settings/science-settings/science-settings.component';
 import { SshUserSettingsComponent } from 'app/shared/user-settings/ssh-settings/ssh-user-settings.component';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { VcsAccessTokensSettingsComponent } from 'app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component';
+import { ClipboardModule } from '@angular/cdk/clipboard';
+import { FormDateTimePickerModule } from 'app/shared/date-time-picker/date-time-picker.module';
 
 @NgModule({
-    imports: [RouterModule.forChild(userSettingsState), ArtemisSharedModule, ArtemisSharedComponentModule],
-    declarations: [UserSettingsContainerComponent, AccountInformationComponent, NotificationSettingsComponent, ScienceSettingsComponent, SshUserSettingsComponent],
+    imports: [RouterModule.forChild(userSettingsState), ArtemisSharedModule, ArtemisSharedComponentModule, ClipboardModule, FormDateTimePickerModule],
+    declarations: [
+        UserSettingsContainerComponent,
+        AccountInformationComponent,
+        NotificationSettingsComponent,
+        ScienceSettingsComponent,
+        SshUserSettingsComponent,
+        VcsAccessTokensSettingsComponent,
+    ],
 })
 export class UserSettingsModule {}
diff --git a/src/main/webapp/app/shared/user-settings/user-settings.route.ts b/src/main/webapp/app/shared/user-settings/user-settings.route.ts
index 1e60f8d264c0..f27183c487cf 100644
--- a/src/main/webapp/app/shared/user-settings/user-settings.route.ts
+++ b/src/main/webapp/app/shared/user-settings/user-settings.route.ts
@@ -6,6 +6,7 @@ import { UserRouteAccessService } from 'app/core/auth/user-route-access-service'
 import { Authority } from 'app/shared/constants/authority.constants';
 import { ScienceSettingsComponent } from 'app/shared/user-settings/science-settings/science-settings.component';
 import { SshUserSettingsComponent } from 'app/shared/user-settings/ssh-settings/ssh-user-settings.component';
+import { VcsAccessTokensSettingsComponent } from 'app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component';
 
 export const userSettingsState: Routes = [
     {
@@ -44,12 +45,19 @@ export const userSettingsState: Routes = [
                 },
             },
             {
-                path: 'sshSettings',
+                path: 'ssh',
                 component: SshUserSettingsComponent,
                 data: {
                     pageTitle: 'artemisApp.userSettings.categories.SSH_SETTINGS',
                 },
             },
+            {
+                path: 'vcs-token',
+                component: VcsAccessTokensSettingsComponent,
+                data: {
+                    pageTitle: 'artemisApp.userSettings.categories.VCS_TOKEN_SETTINGS',
+                },
+            },
         ],
     },
 ];
diff --git a/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.html b/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.html
new file mode 100644
index 000000000000..5dc7ee5c55a7
--- /dev/null
+++ b/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.html
@@ -0,0 +1,130 @@
+<h1 jhiTranslate="artemisApp.userSettings.vcsAccessTokenSettings">
+    <!--VCS access token Settings-->
+</h1>
+@if (currentUser) {
+    <div class="list-group d-block">
+        <div class="list-group-item">
+            <dt>
+                <span jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.infoText"></span>
+            </dt>
+        </div>
+        @if (!edit) {
+            <div class="list-group-item">
+                <dt>
+                    @if (this.currentUser?.vcsAccessToken) {
+                        <table class="table table-striped flex">
+                            <thead class="thead-dark">
+                                <tr>
+                                    <th class="col-2">
+                                        <span jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.vcsAccessToken"></span>
+                                    </th>
+                                    <th class="col-1"></th>
+                                    <th class="col-4">
+                                        <span jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.expiryDate"></span>
+                                    </th>
+                                    <th class="col-4">
+                                        <span jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.actions"></span>
+                                    </th>
+                                </tr>
+                            </thead>
+
+                            <tbody>
+                                <tr>
+                                    <td>***************</td>
+                                    <td>
+                                        <button
+                                            [cdkCopyToClipboard]="currentUser!.vcsAccessToken || ''"
+                                            (cdkCopyToClipboardCopied)="onCopyFinished($event)"
+                                            [class.btn-success]="wasCopied"
+                                            class="btn btn-secondary btn-sm me-2"
+                                            id="copy-token-button"
+                                            type="button"
+                                        >
+                                            <fa-icon [icon]="faCopy"></fa-icon>
+                                        </button>
+                                    </td>
+                                    <td>{{ this.currentUser?.vcsAccessTokenExpiryDate | artemisDate }}</td>
+                                    <td>
+                                        <button
+                                            class="btn btn-md flex-grow-1 d-flex align-items-center"
+                                            id="delete-vcs-token-button"
+                                            jhiDeleteButton
+                                            [renderButtonText]="false"
+                                            (delete)="deleteVcsAccessToken()"
+                                            deleteQuestion="artemisApp.userSettings.vcsAccessTokensSettingsPage.deleteVcsAccessTokenQuestion"
+                                            [dialogError]="dialogError$"
+                                        >
+                                            <fa-icon [icon]="faTrash" />
+                                            <div jhiTranslate="entity.action.delete" class="ms-2"></div>
+                                        </button>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    } @else {
+                        <div jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.noTokenSet"></div>
+                    }
+                </dt>
+            </div>
+            @if (!this.currentUser?.vcsAccessToken) {
+                <div class="list-group-item">
+                    <dt>
+                        <div class="btn-group" role="group" aria-label="Actions">
+                            <jhi-button
+                                class="d-flex"
+                                id="add-new-token-button"
+                                [btnType]="ButtonType.PRIMARY"
+                                [btnSize]="ButtonSize.SMALL"
+                                [icon]="faEdit"
+                                [title]="'artemisApp.userSettings.vcsAccessTokensSettingsPage.addToken'"
+                                (onClick)="addNewVcsAccessToken()"
+                            />
+                        </div>
+                    </dt>
+                </div>
+            }
+        }
+        @if (edit) {
+            <div class="list-group-item">
+                <dt>
+                    <h4 jhiTranslate="artemisApp.userSettings.vcsAccessTokensSettingsPage.addTokenTitle"></h4>
+
+                    <div class="row mb-3">
+                        <div class="col-sm-6">
+                            <jhi-date-time-picker
+                                [shouldDisplayTimeZoneWarning]="false"
+                                labelName="{{ 'artemisApp.userSettings.vcsAccessTokensSettingsPage.expiryDate' | artemisTranslate }}"
+                                [(ngModel)]="expiryDate"
+                                (valueChange)="validateDate()"
+                                [error]="!!expiryDate && !validExpiryDate"
+                                name="expiryDate"
+                                id="expiryDate"
+                            />
+                        </div>
+                    </div>
+
+                    <div class="btn-group" role="group" aria-label="Actions">
+                        <jhi-button
+                            class="me-1"
+                            id="create-vcs-token-button"
+                            [btnType]="ButtonType.PRIMARY"
+                            [btnSize]="ButtonSize.SMALL"
+                            [disabled]="!validExpiryDate"
+                            [icon]="faSave"
+                            [title]="'artemisApp.userSettings.vcsAccessTokensSettingsPage.createAccessToken'"
+                            (onClick)="sendTokenCreationRequest()"
+                        />
+                        <jhi-button
+                            id="cancel-vcs-token-creation-button"
+                            [btnType]="ButtonType.SECONDARY"
+                            [btnSize]="ButtonSize.SMALL"
+                            [icon]="faBan"
+                            [title]="'entity.action.cancel'"
+                            (onClick)="cancelTokenCreation()"
+                        />
+                    </div>
+                </dt>
+            </div>
+        }
+    </div>
+}
diff --git a/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.ts b/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.ts
new file mode 100644
index 000000000000..9214784ea8f6
--- /dev/null
+++ b/src/main/webapp/app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component.ts
@@ -0,0 +1,125 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { User } from 'app/core/user/user.model';
+import { AccountService } from 'app/core/auth/account.service';
+import { Subject, Subscription, tap } from 'rxjs';
+import dayjs from 'dayjs/esm';
+import { faBan, faCopy, faEdit, faSave, faTrash } from '@fortawesome/free-solid-svg-icons';
+import { ButtonSize, ButtonType } from 'app/shared/components/button.component';
+import { AlertService } from 'app/core/util/alert.service';
+
+@Component({
+    selector: 'jhi-account-information',
+    templateUrl: './vcs-access-tokens-settings.component.html',
+    styleUrls: ['../user-settings.scss'],
+})
+export class VcsAccessTokensSettingsComponent implements OnInit, OnDestroy {
+    currentUser?: User;
+
+    readonly faEdit = faEdit;
+    readonly faSave = faSave;
+    readonly faTrash = faTrash;
+    readonly faCopy = faCopy;
+    readonly faBan = faBan;
+    private authStateSubscription: Subscription;
+    expiryDate?: dayjs.Dayjs;
+    validExpiryDate = false;
+    wasCopied = false;
+    edit = false;
+
+    private dialogErrorSource = new Subject<string>();
+
+    dialogError$ = this.dialogErrorSource.asObservable();
+
+    protected readonly ButtonType = ButtonType;
+    protected readonly ButtonSize = ButtonSize;
+
+    constructor(
+        private accountService: AccountService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit() {
+        this.authStateSubscription = this.accountService
+            .getAuthenticationState()
+            .pipe(
+                tap((user: User) => {
+                    this.currentUser = user;
+                    return this.currentUser;
+                }),
+            )
+            .subscribe();
+    }
+
+    ngOnDestroy(): void {
+        this.authStateSubscription.unsubscribe();
+    }
+
+    deleteVcsAccessToken() {
+        this.accountService.deleteUserVcsAccessToken().subscribe({
+            next: () => {
+                if (this.currentUser) {
+                    this.currentUser.vcsAccessTokenExpiryDate = undefined;
+                    this.currentUser.vcsAccessToken = undefined;
+                }
+                this.alertService.success('artemisApp.userSettings.vcsAccessTokensSettingsPage.deleteSuccess');
+            },
+            error: () => {
+                this.alertService.error('artemisApp.userSettings.vcsAccessTokensSettingsPage.deleteFailure');
+            },
+        });
+        this.dialogErrorSource.next('');
+    }
+
+    addNewVcsAccessToken() {
+        this.edit = true;
+    }
+
+    sendTokenCreationRequest() {
+        if (!this.expiryDate || this.expiryDate.isBefore(dayjs()) || this.expiryDate.isAfter(dayjs().add(1, 'year'))) {
+            this.alertService.error('artemisApp.userSettings.vcsAccessTokensSettingsPage.addFailure');
+            return;
+        }
+        this.accountService.addNewVcsAccessToken(this.expiryDate.toISOString()).subscribe({
+            next: (res) => {
+                if (this.currentUser) {
+                    const user = res.body as User;
+                    this.currentUser.vcsAccessToken = user.vcsAccessToken;
+                    this.currentUser.vcsAccessTokenExpiryDate = user.vcsAccessTokenExpiryDate;
+                    this.edit = false;
+                }
+                this.alertService.success('artemisApp.userSettings.vcsAccessTokensSettingsPage.addSuccess');
+            },
+            error: () => {
+                this.alertService.error('artemisApp.userSettings.vcsAccessTokensSettingsPage.addFailure');
+            },
+        });
+    }
+
+    /**
+     * set wasCopied for 3 seconds on success
+     */
+    onCopyFinished(successful: boolean) {
+        if (successful) {
+            this.wasCopied = true;
+            setTimeout(() => {
+                this.wasCopied = false;
+            }, 3000);
+        }
+    }
+
+    /**
+     * Validates if the expiry date is after current time
+     */
+    validateDate() {
+        this.validExpiryDate = !!this.expiryDate?.isAfter(dayjs()) && !!this.expiryDate?.isBefore(dayjs().add(1, 'year'));
+    }
+
+    /**
+     *  Cancel creation of a new token
+     */
+    cancelTokenCreation() {
+        this.edit = false;
+        this.expiryDate = undefined;
+        this.validExpiryDate = false;
+    }
+}
diff --git a/src/main/webapp/app/shared/util/markdown.util.ts b/src/main/webapp/app/shared/util/markdown.util.ts
index 973a0ad2c66e..69de712ce3f8 100644
--- a/src/main/webapp/app/shared/util/markdown.util.ts
+++ b/src/main/webapp/app/shared/util/markdown.util.ts
@@ -1,46 +1,18 @@
 import { ExerciseHintExplanationInterface } from 'app/entities/quiz/quiz-question.model';
-import { hintCommentIdentifier } from 'app/shared/markdown-editor/domainCommands/hint.command';
-import { explanationCommandIdentifier } from 'app/shared/markdown-editor/domainCommands/explanation.command';
 import { escapeStringForUseInRegex } from 'app/shared/util/global.utils';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
 
-const hintOrExpRegex = new RegExp(escapeStringForUseInRegex(`${explanationCommandIdentifier}`) + '|' + escapeStringForUseInRegex(`${hintCommentIdentifier}`), 'g');
-
-/**
- * adds the passed text into the editor of the passed ace editor component at the current curser by focusing, clearing a selection,
- * moving the cursor to the end of the line, and finally inserting the given text.
- * After that the new test will be selected
- *
- * @param text the text that will be added into the editor of the passed ace editor component
- * @param aceEditor the editor in which the text will be added at the current curser position
- */
-export function addTextAtCursor(text: string, aceEditor: any) {
-    aceEditor.focus();
-    aceEditor.clearSelection();
-    aceEditor.moveCursorTo(aceEditor.getCursorPosition().row, Number.POSITIVE_INFINITY);
-    aceEditor.insert(text);
-    const range = aceEditor.selection.getRange();
-    const commandIdentifier = text.split(']');
-    const offsetRange = commandIdentifier[0].length + 1;
-    range.setStart(range.start.row, offsetRange);
-    aceEditor.selection.setRange(range);
-}
-
-/**
- * Remove the text at the specified range.
- * @param from = col & row from which to start
- * @param to = col & row at which to end
- * @param aceEditor the editor in which text should be removed
- */
-export function removeTextRange(from: { col: number; row: number }, to: { col: number; row: number }, aceEditor: any) {
-    aceEditor.focus();
-    aceEditor.getSession().remove({ startRow: from.row, startColumn: from.col, endRow: to.row, endColumn: to.col });
-}
+const hintOrExpRegex = new RegExp(
+    escapeStringForUseInRegex(`${MonacoQuizExplanationAction.IDENTIFIER}`) + '|' + escapeStringForUseInRegex(`${MonacoQuizHintAction.IDENTIFIER}`),
+    'g',
+);
 
 /**
  * Parse the markdown text and apply the result to the target object's data
  *
- * The markdown text is split at hintCommentIdentifier and explanationCommandIdentifier tags.
- *  => First part is text. Everything after hintCommentIdentifier is Hint, anything after explanationCommandIdentifier is explanation
+ * The markdown text is split at MonacoQuizHintAction.IDENTIFIER and MonacoQuizExplanationAction.IDENTIFIER tags.
+ *  => First part is text. Everything after MonacoQuizHintAction.IDENTIFIER is Hint, anything after MonacoQuizExplanationAction.IDENTIFIER is explanation
  *
  * @param markdownText {string} the markdown text to parse
  * @param targetObject {object} the object that the result will be saved in. Fields modified are 'text', 'hint' and 'explanation'.
@@ -52,18 +24,18 @@ export function parseExerciseHintExplanation(markdownText: string, targetObject:
     // split markdownText into main text, hint and explanation
     const markdownTextParts = markdownText.split(hintOrExpRegex);
     targetObject.text = markdownTextParts[0].trim();
-    if (markdownText.indexOf(hintCommentIdentifier) !== -1 && markdownText.indexOf(explanationCommandIdentifier) !== -1) {
-        if (markdownText.indexOf(hintCommentIdentifier) < markdownText.indexOf(explanationCommandIdentifier)) {
+    if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) !== -1 && markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER) !== -1) {
+        if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) < markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER)) {
             targetObject.hint = markdownTextParts[1].trim();
             targetObject.explanation = markdownTextParts[2].trim();
         } else {
             targetObject.hint = markdownTextParts[2].trim();
             targetObject.explanation = markdownTextParts[1].trim();
         }
-    } else if (markdownText.indexOf(hintCommentIdentifier) !== -1) {
+    } else if (markdownText.indexOf(MonacoQuizHintAction.IDENTIFIER) !== -1) {
         targetObject.hint = markdownTextParts[1].trim();
         targetObject.explanation = undefined;
-    } else if (markdownText.indexOf(explanationCommandIdentifier) !== -1) {
+    } else if (markdownText.indexOf(MonacoQuizExplanationAction.IDENTIFIER) !== -1) {
         targetObject.hint = undefined;
         targetObject.explanation = markdownTextParts[1].trim();
     } else {
@@ -88,6 +60,6 @@ export function generateExerciseHintExplanation(sourceObject: ExerciseHintExplan
     return !sourceObject.text
         ? ''
         : sourceObject.text +
-              (sourceObject.hint ? '\n\t' + hintCommentIdentifier + ' ' + sourceObject.hint : '') +
-              (sourceObject.explanation ? '\n\t' + explanationCommandIdentifier + ' ' + sourceObject.explanation : '');
+              (sourceObject.hint ? '\n\t' + MonacoQuizHintAction.IDENTIFIER + ' ' + sourceObject.hint : '') +
+              (sourceObject.explanation ? '\n\t' + MonacoQuizExplanationAction.IDENTIFIER + ' ' + sourceObject.explanation : '');
 }
diff --git a/src/main/webapp/app/shared/util/navbar.util.ts b/src/main/webapp/app/shared/util/navbar.util.ts
new file mode 100644
index 000000000000..7d5a0067c4a8
--- /dev/null
+++ b/src/main/webapp/app/shared/util/navbar.util.ts
@@ -0,0 +1,16 @@
+/**
+ * Update the header height SCSS variable based on the navbar height.
+ *
+ * The navbar height can change based on the screen size and the content of the navbar
+ * (e.g. long breadcrumbs due to longs exercise names)
+ */
+export function updateHeaderHeight() {
+    setTimeout(() => {
+        const navbar = document.querySelector('jhi-navbar');
+        if (navbar) {
+            // do not use navbar.offsetHeight, this might not be defined in Safari!
+            const headerHeight = navbar.getBoundingClientRect().height;
+            document.documentElement.style.setProperty('--header-height', `${headerHeight}px`);
+        }
+    });
+}
diff --git a/src/main/webapp/app/shared/util/utils.ts b/src/main/webapp/app/shared/util/utils.ts
index a9ecd05f46d7..ed3df211540a 100644
--- a/src/main/webapp/app/shared/util/utils.ts
+++ b/src/main/webapp/app/shared/util/utils.ts
@@ -156,3 +156,18 @@ export function scrollToTopOfPage() {
 export function isExamExercise(exercise: Exercise) {
     return exercise.course === undefined;
 }
+
+/**
+ * Rounds a value up to the nearest multiple
+ *
+ * @param value    that shall be rounded
+ * @param multiple to which we round up
+ * @param roundUp  if true, we round up, otherwise we round down
+ */
+export function roundToNextMultiple(value: number, multiple: number, roundUp: boolean) {
+    if (roundUp) {
+        return Math.ceil(value / multiple) * multiple;
+    }
+
+    return Math.floor(value / multiple) * multiple;
+}
diff --git a/src/main/webapp/app/shared/virtual-scroll/virtual-scroll.component.ts b/src/main/webapp/app/shared/virtual-scroll/virtual-scroll.component.ts
index 48b52e4c9376..89ce35fb3766 100644
--- a/src/main/webapp/app/shared/virtual-scroll/virtual-scroll.component.ts
+++ b/src/main/webapp/app/shared/virtual-scroll/virtual-scroll.component.ts
@@ -114,7 +114,7 @@ export class VirtualScrollComponent<T extends { id?: number }> implements OnInit
     }
 
     /**
-     * start listening to focusin events on initialization to prevent unintentional scrolling when the user focuses into the text area of ace editor component
+     * start listening to focusin events on initialization to prevent unintentional scrolling when the user focuses into the text area of code editor component
      * start listening to scroll events on initialization to perform virtual scrolling when the user scrolls through the item container
      * start listening to navigationStart events of router and enable forceReloadChange to scroll to the top of the updated item list
      */
@@ -172,7 +172,7 @@ export class VirtualScrollComponent<T extends { id?: number }> implements OnInit
     }
 
     /**
-     * prevents automatic scrolling to other items when user clicks the text area of ace editor component
+     * prevents automatic scrolling to other items when user clicks the text area of code editor component
      */
     onFocusIn() {
         window.scrollTo(0, this.windowScrollTop);
diff --git a/src/main/webapp/app/types/exercise-filter.ts b/src/main/webapp/app/types/exercise-filter.ts
new file mode 100644
index 000000000000..053dbb8d089c
--- /dev/null
+++ b/src/main/webapp/app/types/exercise-filter.ts
@@ -0,0 +1,43 @@
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { DifficultyLevel, ExerciseType } from 'app/entities/exercise.model';
+import { SidebarData } from 'app/types/sidebar';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+
+/**
+ * isDisplayed - whether the filter is in the filter modal (e.g. for no sidebar element the difficulty is defined, so the difficulty filter is not displayed)
+ */
+export type FilterOption<T> = { isDisplayed: boolean; options: T[] };
+export type ExerciseCategoryFilterOption = { category: ExerciseCategory; searched: boolean };
+export type ExerciseTypeFilterOption = { name: string; value: ExerciseType; checked: boolean; icon: IconProp };
+export type DifficultyFilterOption = { name: string; value: DifficultyLevel; checked: boolean };
+
+export type RangeFilter = {
+    isDisplayed: boolean;
+    filter: {
+        generalMin: number;
+        generalMax: number;
+        selectedMin: number;
+        selectedMax: number;
+        step: number;
+    };
+};
+
+export type ExerciseFilterOptions = {
+    categoryFilter?: FilterOption<ExerciseCategoryFilterOption>;
+    exerciseTypesFilter?: FilterOption<ExerciseTypeFilterOption>;
+    difficultyFilter?: FilterOption<DifficultyFilterOption>;
+    achievedScore?: RangeFilter;
+    achievablePoints?: RangeFilter;
+};
+
+export type ExerciseFilterResults = { filteredSidebarData?: SidebarData; appliedExerciseFilters?: ExerciseFilterOptions; isFilterActive: boolean };
+
+export type FilterDetails = {
+    searchedTypes?: ExerciseType[];
+    selectedCategories: ExerciseCategory[];
+    searchedDifficulties?: DifficultyLevel[];
+    isScoreFilterApplied: boolean;
+    isPointsFilterApplied: boolean;
+    achievedScore?: RangeFilter;
+    achievablePoints?: RangeFilter;
+};
diff --git a/src/main/webapp/content/scss/themes/_dark-variables.scss b/src/main/webapp/content/scss/themes/_dark-variables.scss
index fe7182454138..b972c760771a 100644
--- a/src/main/webapp/content/scss/themes/_dark-variables.scss
+++ b/src/main/webapp/content/scss/themes/_dark-variables.scss
@@ -317,6 +317,12 @@ $stat-av-sc-legend-critical: rgba(204, 0, 0, 1);
 $stat-av-sc-legend-median: rgba(127, 127, 127, 255);
 $stat-av-sc-legend-best: rgba(40, 164, 40, 1);
 
+// Component: pdf-preview.component.scss
+$pdf-preview-pdf-container-shadow: scale-color($black, $alpha: -90%);
+$pdf-preview-canvas-shadow: scale-color($white, $alpha: -40%);
+$pdf-preview-container-overlay: scale-color($black, $alpha: -60%);
+$pdf-preview-enlarged-container-overlay: scale-color($black, $alpha: -20%);
+
 // Programming Exercise Update
 $update-programming-exercise-plan-preview-box-background: transparentize(#fff, 0.95);
 
diff --git a/src/main/webapp/content/scss/themes/_default-variables.scss b/src/main/webapp/content/scss/themes/_default-variables.scss
index a0c05c0c757f..4490f3ad7ac4 100644
--- a/src/main/webapp/content/scss/themes/_default-variables.scss
+++ b/src/main/webapp/content/scss/themes/_default-variables.scss
@@ -242,6 +242,12 @@ $stat-av-sc-legend-critical: rgba(204, 0, 0, 1);
 $stat-av-sc-legend-median: rgba(127, 127, 127, 255);
 $stat-av-sc-legend-best: rgba(40, 164, 40, 1);
 
+// Component: pdf-preview.component.scss
+$pdf-preview-pdf-container-shadow: scale-color($black, $alpha: -90%);
+$pdf-preview-canvas-shadow: scale-color($black, $alpha: -90%);
+$pdf-preview-container-overlay: scale-color($black, $alpha: -60%);
+$pdf-preview-enlarged-container-overlay: scale-color($black, $alpha: -80%);
+
 // Programming Exercise Update
 $update-programming-exercise-plan-preview-box-background: transparentize(black, 0.95);
 
diff --git a/src/main/webapp/i18n/de/competency.json b/src/main/webapp/i18n/de/competency.json
index d6bdd4167ef2..f8c8630389e2 100644
--- a/src/main/webapp/i18n/de/competency.json
+++ b/src/main/webapp/i18n/de/competency.json
@@ -75,7 +75,7 @@
                 "saveModalTitle": "Speichern bestätigen",
                 "saveModalText": "Du hast nicht alle Empfehlungen angesehen, möchtest du trotzdem fortfahren?",
                 "errorWarning": "Speichern nicht möglich, weil fehlerhafte Kompetenzen vorliegen",
-                "loading": "Generiere Kompetenzvorschläge... Das kann eine Weile dauern.",
+                "loading": "Generiere Kompetenzvorschläge...",
                 "courseDescription": {
                     "title": "Kursbeschreibung eingeben",
                     "placeholder": "Bitte gib eine Kursbeschreibung ein",
@@ -86,7 +86,7 @@
                     "regenerateTooltip": "Zusätzliche Kompetenzvorschläge generieren",
                     "infoTooltip": "Gib eine Beschreibung ein, die sich auf den theoretischen/praktischen Inhalt und Lernziele des Kurses fokussiert. Iris generiert daraus Vorschläge für Kompetenzen, die du in deinen Kurs einfügen könntest.",
                     "success": "{{ noOfCompetencies }} Kompetenzvorschläge generiert.",
-                    "warning": "Keine Kompetenzvorschläge generiert. Versuche, eine ausführlichere Kursbeschreibung zu verwenden. Wenn das Problem weiterhin besteht, wende dich an die Administratoren."
+                    "warning": "Keine Kompetenzvorschläge generiert. Wenn das Problem weiterhin besteht, wende dich an die Administratoren."
                 }
             },
             "importAll": {
diff --git a/src/main/webapp/i18n/de/dataExport.json b/src/main/webapp/i18n/de/dataExport.json
index 3e9b2ed36c56..bb82eb2604da 100644
--- a/src/main/webapp/i18n/de/dataExport.json
+++ b/src/main/webapp/i18n/de/dataExport.json
@@ -3,7 +3,7 @@
         "dataExport": {
             "title": "Datenexport",
             "titleDownload": "Datenexport herunterladen",
-            "description": "Hier kannst du einen Datenexport gemäß Art.15 DSGVO Auskunftsrecht der betroffenen Person anfordern. Sobald der Export erstellt wurde, erhältst du eine Email mit einem Link um diesen herunterzuladen. Du kannst den Export sieben Tage lang herunterladen, danach wird er gelöscht. ",
+            "description": "Hier kannst du einen Datenexport gemäß Art.15 DSGVO Auskunftsrecht der betroffenen Person anfordern. Sobald der Export erstellt wurde, erhältst du eine E-Mail mit einem Link um diesen herunterzuladen. Du kannst den Export sieben Tage lang herunterladen, danach wird er gelöscht. ",
             "descriptionDownload": "Hier kannst du deinen angeforderten Datenexport herunterladen.",
             "request": "Datenexport anfordern",
             "download": "Datenexport herunterladen",
diff --git a/src/main/webapp/i18n/de/dragAndDropQuestion.json b/src/main/webapp/i18n/de/dragAndDropQuestion.json
index 78fd8dd3f720..a2e7c947fb34 100644
--- a/src/main/webapp/i18n/de/dragAndDropQuestion.json
+++ b/src/main/webapp/i18n/de/dragAndDropQuestion.json
@@ -30,6 +30,8 @@
             "addMappingsInstructions": "Ziehe Drag Items auf Drop Locations, um korrekte Zuordnungen zu definieren.",
             "addDragItemPicture": "Drag Item mit Bild Hinzufügen",
             "addDragItemText": "Drag Item mit Text Hinzufügen",
+            "cutImagesFromDropLocation": "Bilder aus Drop Locations ausschneiden",
+            "cutImagesFromDropLocationTip": "Das Hintergrundbild wird verändert. Dies kann nicht rückgängig gemacht werden.",
             "studentInstructions": "Drag & Drop: Platziere die passenden Elemente auf die zugehörigen Flächen.",
             "showingYourAnswer": "Deine Abgabe:",
             "showingSampleSolution": "Musterlösung:",
diff --git a/src/main/webapp/i18n/de/exercise-actions.json b/src/main/webapp/i18n/de/exercise-actions.json
index f45e3097bf3e..928496b308b8 100644
--- a/src/main/webapp/i18n/de/exercise-actions.json
+++ b/src/main/webapp/i18n/de/exercise-actions.json
@@ -69,6 +69,8 @@
             "uploadFile": "Datei hochladen",
             "viewTeam": "Team",
             "sshKeyTip": "Um SSH zu nutzen, musst du {link:hier} einen SSH Schlüssel zu deinem Konto hinzufügen.",
+            "vcsTokenTip": "Um mit einem VCS-Zugriffstoken auf das Repository zuzugreifen, musst du {link:hier} ein neues hinzufügen.",
+            "vcsTokenExpiredTip": "Dein VCS-Zugriffstoken ist abgelaufen. Erneuere es {link:hier}.",
             "startExerciseBeforeStartDate": "Du kannst vor dem Startdatum nicht an der Aufgabe teilnehmen.",
             "deleteMultipleExercisesQuestion": "Sollen die ausgewählten Aufgaben wirklich dauerhaft gelöscht werden?"
         }
diff --git a/src/main/webapp/i18n/de/exercise.json b/src/main/webapp/i18n/de/exercise.json
index e198497deaa9..332f39024ff4 100644
--- a/src/main/webapp/i18n/de/exercise.json
+++ b/src/main/webapp/i18n/de/exercise.json
@@ -140,6 +140,7 @@
             },
             "categories": "Kategorien",
             "noCategory": "Keine Kategorie",
+            "selectCategories": "Kategorien auswählen",
             "participation": "Teilnahme",
             "participations": "Teilnahmen",
             "submissions": "Einreichungen",
diff --git a/src/main/webapp/i18n/de/global.json b/src/main/webapp/i18n/de/global.json
index e687aaaf72fb..9db7bb972f26 100644
--- a/src/main/webapp/i18n/de/global.json
+++ b/src/main/webapp/i18n/de/global.json
@@ -122,12 +122,13 @@
             "continueTutorial": "Tutorial fortsetzen"
         },
         "form": {
-            "username": "Login",
+            "username": "Login oder E-Mail",
             "firstname": "Vorname",
             "firstname.placeholder": "Vorname",
             "lastname": "Nachname",
             "lastname.placeholder": "Nachname",
-            "username.placeholder": "Login",
+            "username.placeholder": "Login oder E-Mail",
+            "username.tumPlaceholder": "z.B. go42tum / example@tum.de",
             "currentpassword": "Aktuelles Passwort",
             "currentpassword.placeholder": "Aktuelles Passwort",
             "newpassword": "Neues Passwort",
diff --git a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json
index 8baa5f33ad99..8cfd6706e6b3 100644
--- a/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json
+++ b/src/main/webapp/i18n/de/guidedTourProgrammingExercise.json
@@ -10,7 +10,7 @@
                     "headline": "Klassendatei",
                     "content": "Klick hier auf die Klassendatei, damit sie sich im Programmiereditor öffnet."
                 },
-                "aceEditor": {
+                "monacoEditor": {
                     "headline": "Programmiereditor",
                     "content": "Nun wird dir der Quellcode im Programmiereditor angezeigt. Du kannst dir das <tt>TODO</tt> durchlesen und bereits versuchen, dieses zu lösen. Alternativ kannst du auch in dieser Demo schon beliebigen Code einfügen. Wenn du damit fertig bist, dann klicke auf weiter."
                 },
diff --git a/src/main/webapp/i18n/de/home.json b/src/main/webapp/i18n/de/home.json
index 0a1246af1b82..0dab67a168fa 100644
--- a/src/main/webapp/i18n/de/home.json
+++ b/src/main/webapp/i18n/de/home.json
@@ -4,8 +4,8 @@
         "subtitle": "Interaktives Lernen mit Individuellem Feedback",
         "login": {
             "traditional": {
-                "pleaseSignInAccount": "Bitte melde dich mit deinen {{account}} Zugangsdaten an.",
-                "pleaseSignIn": "Bitte melde dich mit deinen Zugangsdaten an."
+                "pleaseSignInAccount": "Melde dich mit deinen {{account}} Zugangsdaten an",
+                "pleaseSignIn": "Melde dich mit deinen Zugangsdaten an"
             },
             "saml2": {
                 "pleaseSignInProvider": "Bitte melde dich via {{provider}} an.",
@@ -13,12 +13,13 @@
             }
         },
         "logged": {
-            "message": "Du bist als Nutzer:in \"{{username}}\" angemeldet."
+            "message": "Du bist als \"{{username}}\" angemeldet."
         },
         "errors": {
             "failedToLogin": "<span class='bold'>Fehler bei der Anmeldung!</span> Bitte überprüfe deinen Login und dein Passwort und versuche es erneut.",
             "usernameIncorrect": "<p class='text-primary small'>Ungültiger Login</p>",
-            "tumWarning": "<p class='text-primary small'>Wenn du Studierende:r an der TUM bist, sollte deine Kennung das Format <b>ab12xyz</b> haben.<br />Füge <b>weder</b> '<b>@mytum.de</b>' noch '<b>@tum.de</b>' hinzu.</p>",
+            "passwordIncorrect": "Das Passwort muss zwischen 8 und 50 Zeichen lang sein.",
+            "tumWarning": "An der TUM nutze z.B. <b>go42tum</b> oder <b>example@tum.de</b>",
             "loginWarning": "Scheint so, als hättest du Probleme bei der Anmeldung :-(<br />Bitte besuche <a href='{{ url }}'>{{ name }}</a> und versuche dich dort anzumelden.<br />Danach versuche es hier noch einmal.",
             "sessionExpired": "Du wurdest ausgeloggt, da die Sitzung abgelaufen ist. Bitte logge dich erneut ein, um zur vorherigen Seite zurückzukehren."
         }
diff --git a/src/main/webapp/i18n/de/lecture.json b/src/main/webapp/i18n/de/lecture.json
index 61e68defd8e9..c5d76e7c292d 100644
--- a/src/main/webapp/i18n/de/lecture.json
+++ b/src/main/webapp/i18n/de/lecture.json
@@ -96,7 +96,12 @@
             "deleteQuestion": "Soll der Anhang wirklich gelöscht werden?",
             "created": "Anhang erstellt mit ID {{ param }}",
             "updated": "Anhang aktualisiert mit ID {{ param }}",
-            "deleted": "Anhang gelöscht mit ID {{ param }}"
+            "deleted": "Anhang gelöscht mit ID {{ param }}",
+            "pdfPreview": {
+                "title": "Anhang",
+                "attachmentIDError": "Ungültiger Anhang oder ungültige Anhangs-ID.",
+                "attachmentUnitIDError": "Ungültige Dateieinheit oder ungültige Dateieinheits-ID."
+            }
         }
     }
 }
diff --git a/src/main/webapp/i18n/de/login.json b/src/main/webapp/i18n/de/login.json
index 60210204b6f8..ce66283a2cdf 100644
--- a/src/main/webapp/i18n/de/login.json
+++ b/src/main/webapp/i18n/de/login.json
@@ -15,7 +15,7 @@
             }
         },
         "password": {
-            "forgot": "Du hast dein Passwort vergessen?"
+            "forgot": "Passwort vergessen?"
         },
         "ide": {
             "confirmation": "Wills du deinen Login und dein Passwort in deiner IDE speichern?\nDas wird das Importieren deiner Programmieraufgaben sehr vereinfachen!",
diff --git a/src/main/webapp/i18n/de/metis.json b/src/main/webapp/i18n/de/metis.json
index 5f6c9b228098..5eabc98efd9e 100644
--- a/src/main/webapp/i18n/de/metis.json
+++ b/src/main/webapp/i18n/de/metis.json
@@ -99,7 +99,7 @@
                 "courseWideContext": "Kursweite Themen",
                 "exercises": "Übungen",
                 "lectures": "Vorlesungen",
-                "announcementHint": "Alle Teilnehmenden des Kurses, die dies nicht explizit abgestellt haben, erhalten automatisch eine Benachrichtigungs-Email mit dem Inhalt der Ankündigung. Ankündigungen können nur durch die Übungsleitung erstellt werden. Mögliche Antworten können nicht als klärend markiert werden.",
+                "announcementHint": "Alle Teilnehmenden des Kurses, die dies nicht explizit abgestellt haben, erhalten automatisch eine Benachrichtigungs-E-Mail mit dem Inhalt der Ankündigung. Ankündigungen können nur durch die Übungsleitung erstellt werden. Mögliche Antworten können nicht als klärend markiert werden.",
                 "title": "Titel",
                 "postMarkedAsResolvedTooltip": "Nachricht wurde als geklärt markiert",
                 "postMarkedAsAnnouncementTooltip": "Ankündigung",
diff --git a/src/main/webapp/i18n/de/operatorInfo.json b/src/main/webapp/i18n/de/operatorInfo.json
new file mode 100644
index 000000000000..769631e8a7b4
--- /dev/null
+++ b/src/main/webapp/i18n/de/operatorInfo.json
@@ -0,0 +1,10 @@
+{
+    "artemisApp": {
+        "operatorInfo": {
+            "title": "Betreiber",
+            "name": "Name",
+            "admin": "Administrator:in",
+            "adminEmail": "Kontakt-E-Mail"
+        }
+    }
+}
diff --git a/src/main/webapp/i18n/de/organizationManagement.json b/src/main/webapp/i18n/de/organizationManagement.json
index faf2f5079640..a4ea52a18802 100644
--- a/src/main/webapp/i18n/de/organizationManagement.json
+++ b/src/main/webapp/i18n/de/organizationManagement.json
@@ -9,7 +9,7 @@
             "logoUrl": "Logo URL",
             "Nutzer:innens": "Nutzer:innen",
             "courses": "Kurse",
-            "emailPattern": "Email-Muster",
+            "emailPattern": "E-Mail-Muster",
             "delete": {
                 "question": "Soll die Organisation <strong>{{ title }}</strong> wirklich gelöscht werden?"
             },
@@ -31,7 +31,7 @@
                 "select": "Auswählen",
                 "title": "Organisationen"
             },
-            "patternChangeWarning": "Beim Ändern des Email-Musters wird eine Neuzuweisung der Nutzer:innen zu dieser Organisation ausgeführt"
+            "patternChangeWarning": "Beim Ändern des E-Mail-Musters wird eine Neuzuweisung der Nutzer:innen zu dieser Organisation ausgeführt"
         },
         "organization": {
             "updated": "Organization updated!",
diff --git a/src/main/webapp/i18n/de/programmingExercise.json b/src/main/webapp/i18n/de/programmingExercise.json
index ae25116ddc7a..4e493f7d4daf 100644
--- a/src/main/webapp/i18n/de/programmingExercise.json
+++ b/src/main/webapp/i18n/de/programmingExercise.json
@@ -118,14 +118,22 @@
             "workdir": "Verzeichnis",
             "allowOnlineEditor": {
                 "title": "Online-Editor erlauben",
-                "alert": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein"
+                "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein",
+                "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein"
             },
             "onlineEditor": "Online",
             "allowOfflineIde": {
                 "title": "Offline-IDE erlauben",
-                "alert": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein"
+                "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein",
+                "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein"
             },
             "offlineIde": "IDE",
+            "allowOnlineIde": {
+                "title": "Online-IDE erlauben",
+                "alert": "Es muss mindestens eine Option (Offline-IDE, Online-Editor oder Online-IDE) ausgewählt sein.",
+                "alertNoTheia": "Es muss mindestens eine Option (Offline-IDE oder Online-Editor) ausgewählt sein"
+            },
+            "onlineIde": "Online IDE",
             "showTestNamesToStudents": "Zeige die Test Namen den Studierenden",
             "showTestNamesToStudentsTooltip": "Durch Aktivierung dieser Option werden die Namen der automatischen Tests den Studierenden angezeigt. Lasse die Option deaktiviert, um keine visuelle Unterscheidung zwischen manuellem und automatischem Feedback für die Studierenden vorzunehmen.",
             "participationMode": "Teilnahmemodus",
@@ -170,6 +178,11 @@
             "projectType": "Projekttyp",
             "testRepositoryProjectType": "Projekttyp des Test-Repository",
             "packageName": "Package-Name",
+            "theiaImage": {
+                "title": "Konfiguration für Online IDE",
+                "noImageAvailable": "Die Online IDE ist für diese Programmiersprache noch nicht verfügbar.",
+                "alert": "Es muss eine gültige Konfiguration für die Online IDE ausgewählt werden."
+            },
             "appName": "App-Name",
             "templateResult": "Ergebnis der Vorlage",
             "solutionResult": "Ergebnis der Musterlösung",
@@ -260,7 +273,8 @@
                     "settingNegative": "Der Testfall {{testCase}} darf keine Einstellungen mit negativen Werten haben."
                 },
                 "categories": {
-                    "title": "Code-Analyse-Kategorien",
+                    "titleHeader": "Quelltext-Analyse",
+                    "title": "Quelltext-Analyse-Kategorien",
                     "notGraded": "Nicht bewertet.",
                     "noFeedback": "Ohne sichtbares Feedback.",
                     "updated": "Die Kategorien wurden erfolgreich gespeichert.",
@@ -306,6 +320,17 @@
                     "testType": "Type",
                     "passedPercent": "Bestanden %"
                 },
+                "feedbackAnalysis": {
+                    "titleHeader": "Feedback Analyse",
+                    "title": "Fehleranalyse für {{exerciseTitle}}",
+                    "occurrence": "Häufigkeit",
+                    "feedback": "Feedback",
+                    "task": "Aufgabe",
+                    "testcase": "Testfall",
+                    "errorCategory": "Fehlerkategorie",
+                    "totalItems": "Insgesamt {{count}} Elemente",
+                    "error": "Beim Laden des Feedback ist ein Fehler aufgetreten."
+                },
                 "help": {
                     "name": "Aufgabennamen werden fett geschrieben, während Testnamen normal sind. Ob es ein Aufgabenname oder Testname ist hängt davon ab, ob die Reihe eine Aufgabe oder einen Test darstellt.",
                     "state": "Gibt an, ob Issues in dieser Kategorie den Studierenden angezeigt und bewertet werden sollen.",
diff --git a/src/main/webapp/i18n/de/reset.json b/src/main/webapp/i18n/de/reset.json
index 3529d750a4b1..572a8f89811c 100644
--- a/src/main/webapp/i18n/de/reset.json
+++ b/src/main/webapp/i18n/de/reset.json
@@ -4,10 +4,10 @@
             "title": "Passwort zurücksetzen",
             "form": {
                 "button": "Passwort zurücksetzen",
-                "emailUsername": "E-Mail/Benutzername"
+                "emailUsername": "E-Mail / Login"
             },
             "messages": {
-                "info": "Gib die E-Mail-Adresse ein, die du bei der Registrierung verwendest hast oder deinen Benutzernamen.",
+                "info": "Gib die E-Mail-Adresse ein, die du bei der Registrierung verwendest hast oder deinen Login.",
                 "success": "Eine E-Mail mit weiteren Instruktionen für das Zurücksetzen des Passworts wurde gesendet. Aus Sicherheitsgründen erscheint dieser Hinweis auch wenn der angegebene Account nicht existiert. Überprüfe deine Eingabe, wenn du keine E-Mail erhältst."
             },
             "external": {
diff --git a/src/main/webapp/i18n/de/student-dashboard.json b/src/main/webapp/i18n/de/student-dashboard.json
index 38820f89e17b..89729023ff10 100644
--- a/src/main/webapp/i18n/de/student-dashboard.json
+++ b/src/main/webapp/i18n/de/student-dashboard.json
@@ -33,7 +33,8 @@
             "manage": "Verwalten",
             "studentView": "Studentenansicht",
             "general": {
-                "noDataFound": "Keine Einträge gefunden."
+                "noDataFound": "Keine Einträge gefunden.",
+                "noElementFoundWithAppliedFilter": "Keine Einträge für die angewendeten Filtereinstellungen gefunden."
             },
             "sidebar": {
                 "past": "Vorangegangen",
@@ -89,6 +90,17 @@
                 "plagiarismCases": "Plagiatsfälle",
                 "gradingSystem": "Notenschlüssel"
             },
+            "exerciseFilter": {
+                "filter": "Filter",
+                "modalTitle": "Aufgaben Filtern",
+                "dueDateRange": "Zeitraum der Einreichungsfrist",
+                "achievedScore": "Erreichtes Ergebnis",
+                "achievablePoints": "Erreichbare Punktzahl",
+                "applyFilter": "Filter anwenden",
+                "resetFilter": "Filter zurücksetzen",
+                "noFilterAvailable": "Für die bisherigen Aufgaben gibt es keine unterscheidenden Filteroptionen",
+                "noMoreOptions": "Keine weiteren Auswahlmöglichkeiten"
+            },
             "exerciseList": {
                 "filter": "Filter ({{ num }})",
                 "releaseDate": "Veröffentlichungsdatum",
diff --git a/src/main/webapp/i18n/de/userSettings.json b/src/main/webapp/i18n/de/userSettings.json
index 4898166be418..ac23773e91f3 100644
--- a/src/main/webapp/i18n/de/userSettings.json
+++ b/src/main/webapp/i18n/de/userSettings.json
@@ -5,7 +5,8 @@
             "saveChanges": "Änderungen speichern",
             "saveSettingsSuccessAlert": "Die Einstellungen wurden erfolgreich gespeichert.",
             "userSettings": "Benutzereinstellungen",
-            "sshSettings": "SSH Einstellungen",
+            "sshSettings": "SSH",
+            "vcsAccessTokenSettings": "VCS Token",
             "accountInformation": "Account Informationen",
             "notificationSettings": "Benachrichtigungen",
             "notificationSettingsFilterInfo": "Diese Einstellungen filtern auch die Seitenleiste für Mitteilungen",
@@ -27,18 +28,34 @@
                 "sshKeyDisplayedInformation": "Das ist dein aktuell konfigurierter SSH-Schlüssel:",
                 "key": "SSH Schlüssel"
             },
+            "vcsAccessTokensSettingsPage": {
+                "addTokenTitle": "Neues Zugriffstoken erzeugen",
+                "infoText": "Du kannst ein persönliches Zugriffstoken generieren, um mit dem Artemis Local Version Control System zu interagieren. Verwende es um dich über HTTP bei Git zu authentifizieren.",
+                "deleteVcsAccessTokenQuestion": "Möchtest du dein Zugriffstoken für das Versionskontrollsystem wirklich löschen? Du kannst dich nicht mehr bei lokalen Repositories authentifizieren, die mit diesem Token geklont wurden.",
+                "createAccessToken": "Neues VCS Zugriffstoken generieren",
+                "noTokenSet": "Du hast kein Zugriffstoken",
+                "addToken": "Neues Token hinzufügen",
+                "deleteFailure": "Das Löschen des VCS-Zugriffstokens ist fehlgeschlagen",
+                "deleteSuccess": "Das VCS-Zugriffstoken wurde erfolgreich gelöscht",
+                "addFailure": "Neues VCS-Zugriffstoken konnte nicht gespeichert werden",
+                "addSuccess": "Neues VCS-Zugriffstoken erfolgreich erstellt",
+                "vcsAccessToken": "VCS-Zugriffstoken",
+                "expiryDate": "Ablaufdatum",
+                "actions": "Aktionen"
+            },
             "accountInformationPage": {
                 "registrationNumber": "Matrikelnummer",
                 "fullName": "Vollständiger Name",
                 "login": "Login",
-                "email": "Email",
+                "email": "E-Mail",
                 "joinedArtemis": "Artemis beigetreten am",
                 "sshKey": "Öffentlicher SSH Schlüssel"
             },
             "categories": {
                 "NOTIFICATION_SETTINGS": "Benachrichtigungseinstellungen",
                 "SCIENCE_SETTINGS": "Forschungseinstellungen",
-                "SSH_SETTINGS": "SSH"
+                "SSH_SETTINGS": "SSH Einstellungen",
+                "VCS_TOKEN_SETTINGS": "VCS Tokeneinstellungen"
             },
             "settingGroupNames": {
                 "weeklySummary": "Wöchentliche Zusammenfassung",
diff --git a/src/main/webapp/i18n/en/competency.json b/src/main/webapp/i18n/en/competency.json
index 908b59d271dd..54e4cd928076 100644
--- a/src/main/webapp/i18n/en/competency.json
+++ b/src/main/webapp/i18n/en/competency.json
@@ -75,7 +75,7 @@
                 "saveModalTitle": "Confirm Save",
                 "saveModalText": "You have not viewed all recommendations, do you still want to continue?",
                 "errorWarning": "You may not save because some competencies are invalid",
-                "loading": "Generating competency recommendations... This might take a while.",
+                "loading": "Generating competency recommendations...",
                 "courseDescription": {
                     "title": "Enter a Course Description",
                     "placeholder": "Please enter a course description",
@@ -86,7 +86,7 @@
                     "regenerateTooltip": "Generate additional Competency Recommendations",
                     "infoTooltip": "Enter a course description, focusing on the theoretical/practical content and learning objectives. Iris will then use it to generate recommendations for competencies you could add to your course.",
                     "success": "Generated {{ noOfCompetencies }} competency recommendations.",
-                    "warning": "No competency recommendations could be generated. Try using a more detailed course description. If the issue persists, contact the administrators."
+                    "warning": "No competency recommendations could be generated. If the issue persists, contact the administrators."
                 }
             },
             "importAll": {
diff --git a/src/main/webapp/i18n/en/dragAndDropQuestion.json b/src/main/webapp/i18n/en/dragAndDropQuestion.json
index 6e7131fc734f..533cbcad634b 100644
--- a/src/main/webapp/i18n/en/dragAndDropQuestion.json
+++ b/src/main/webapp/i18n/en/dragAndDropQuestion.json
@@ -30,6 +30,8 @@
             "addMappingsInstructions": "Drag items onto drop locations to define correct solutions.",
             "addDragItemPicture": "Add Picture Drag Item",
             "addDragItemText": "Add Text Drag Item",
+            "cutImagesFromDropLocation": "Cut Images from Drop Locations",
+            "cutImagesFromDropLocationTip": "The background image will be modified. This cannot be undone.",
             "studentInstructions": "Drag & Drop: Place the suitable items on the correct areas.",
             "showingYourAnswer": "Your Submission:",
             "showingSampleSolution": "Sample Solution:",
diff --git a/src/main/webapp/i18n/en/exercise-actions.json b/src/main/webapp/i18n/en/exercise-actions.json
index b32d1e5be4d1..ba4ac935244d 100644
--- a/src/main/webapp/i18n/en/exercise-actions.json
+++ b/src/main/webapp/i18n/en/exercise-actions.json
@@ -70,6 +70,8 @@
             "uploadFile": "Upload a file",
             "viewTeam": "Team",
             "sshKeyTip": "To use ssh, you need to add an ssh key to your account {link:here}.",
+            "vcsTokenTip": "To access the repository with a VCS access token, you need to add a new one to your account {link:here}.",
+            "vcsTokenExpiredTip": "Your VCS access token has expired. Renew it {link:here}.",
             "startExerciseBeforeStartDate": "You cannot participate before the start date of the exercise.",
             "deleteMultipleExercisesQuestion": "Are you sure you want to delete the selected exercises?"
         }
diff --git a/src/main/webapp/i18n/en/exercise.json b/src/main/webapp/i18n/en/exercise.json
index fbc47e4093dc..ca2f0fdde23c 100644
--- a/src/main/webapp/i18n/en/exercise.json
+++ b/src/main/webapp/i18n/en/exercise.json
@@ -140,6 +140,7 @@
             },
             "categories": "Categories",
             "noCategory": "No Category",
+            "selectCategories": "Select categories",
             "participation": "Participation",
             "participations": "Participations",
             "submissions": "Submissions",
diff --git a/src/main/webapp/i18n/en/global.json b/src/main/webapp/i18n/en/global.json
index 7e59d4c46f22..8760c0192b62 100644
--- a/src/main/webapp/i18n/en/global.json
+++ b/src/main/webapp/i18n/en/global.json
@@ -123,12 +123,13 @@
             "continueTutorial": "Continue tutorial"
         },
         "form": {
-            "username": "Username",
+            "username": "Login or email",
             "firstname": "First name",
-            "firstname.placeholder": "Your first name",
+            "firstname.placeholder": "First name",
             "lastname": "Last name",
-            "lastname.placeholder": "Your last name",
-            "username.placeholder": "Your Username",
+            "lastname.placeholder": "Last name",
+            "username.placeholder": "Login or email",
+            "username.tumPlaceholder": "e.g. go42tum / example@tum.de",
             "currentpassword": "Current password",
             "currentpassword.placeholder": "Current password",
             "newpassword": "New password",
diff --git a/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json b/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json
index 645864117bf9..9e23b5f35836 100644
--- a/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json
+++ b/src/main/webapp/i18n/en/guidedTourProgrammingExercise.json
@@ -10,7 +10,7 @@
                     "headline": "Class file",
                     "content": "Click on the class file to display its source code in the editor."
                 },
-                "aceEditor": {
+                "monacoEditor": {
                     "headline": "Code editor",
                     "content": "The source code is now displayed in the code editor. You can read through the <tt>TODO</tt> and try to solve it. Alternatively, you can enter any code for this test round. If you are done with your implementation, just click on the <tt>Next</tt> button to proceed."
                 },
diff --git a/src/main/webapp/i18n/en/home.json b/src/main/webapp/i18n/en/home.json
index 3a5cdd0a0596..81e5cf7c6da4 100644
--- a/src/main/webapp/i18n/en/home.json
+++ b/src/main/webapp/i18n/en/home.json
@@ -4,8 +4,8 @@
         "subtitle": "Interactive Learning with Individual Feedback",
         "login": {
             "traditional": {
-                "pleaseSignInAccount": "Please sign in with your {{account}} account.",
-                "pleaseSignIn": "Please sign in with your account."
+                "pleaseSignInAccount": "Sign in with your {{account}} account",
+                "pleaseSignIn": "Sign in with your account"
             },
             "saml2": {
                 "pleaseSignInProvider": "Please sign in with {{provider}}.",
@@ -13,12 +13,13 @@
             }
         },
         "logged": {
-            "message": "You are logged in as user \"{{username}}\"."
+            "message": "You are logged in as \"{{username}}\"."
         },
         "errors": {
-            "failedToLogin": "<span class='bold'>Failed to sign in!</span> Please check your username and password and try again.",
-            "usernameIncorrect": "<p class='text-primary small'>Invalid username</p>",
-            "tumWarning": "<p class='text-primary small'>If you are a TUM student, your username<br />should have the format <b>ab12xyz</b>.<br />Do <b>not</b> include '<b>@mytum.de</b>' or '<b>@tum.de</b>'.</p>",
+            "failedToLogin": "<span class='bold'>Failed to sign in!</span> Please check your login and password and try again.",
+            "usernameIncorrect": "<p class='text-primary small'>Invalid login</p>",
+            "passwordIncorrect": "The password must be between 8 and 50 characters long.",
+            "tumWarning": "If you are at TUM, use e.g. <b>go42tum</b> or <b>example@tum.de</b>",
             "loginWarning": "Seems like you are having issues signing in :-(<br />Please go to <a href='{{ url }}'>{{ name }}</a> and try to sign in there.<br />After that, try again here.",
             "sessionExpired": "You have been logged out, because your session has expired. Please log in again to return to the previous page."
         }
diff --git a/src/main/webapp/i18n/en/lecture.json b/src/main/webapp/i18n/en/lecture.json
index bb8ddb7ad737..b03b840b400f 100644
--- a/src/main/webapp/i18n/en/lecture.json
+++ b/src/main/webapp/i18n/en/lecture.json
@@ -96,7 +96,12 @@
             "deleteQuestion": "Do you really want to delete the attachment?",
             "created": "Created new attachment with identifier {{ param }}",
             "updated": "Updated attachment with identifier {{ param }}",
-            "deleted": "Deleted attachment with identifier {{ param }}"
+            "deleted": "Deleted attachment with identifier {{ param }}",
+            "pdfPreview": {
+                "title": "Attachment",
+                "attachmentIDError": "Invalid Attachment or Attachment ID.",
+                "attachmentUnitIDError": "Invalid Attachment Unit or Attachment Unit ID."
+            }
         }
     }
 }
diff --git a/src/main/webapp/i18n/en/login.json b/src/main/webapp/i18n/en/login.json
index 46ad1c16400d..7f49b5270a27 100644
--- a/src/main/webapp/i18n/en/login.json
+++ b/src/main/webapp/i18n/en/login.json
@@ -4,7 +4,7 @@
         "divider": "or",
         "form": {
             "password": "Password",
-            "password.placeholder": "Your password",
+            "password.placeholder": "Password",
             "rememberme": "Remember me",
             "acceptTerms": "Accept terms",
             "button": "Sign in"
@@ -15,7 +15,7 @@
             }
         },
         "password": {
-            "forgot": "Did you forget your password?"
+            "forgot": "Forgot password?"
         },
         "ide": {
             "confirmation": "Do you want to store your credentials in your IDE?\nThis will make importing your exercises a lot easier!",
diff --git a/src/main/webapp/i18n/en/operatorInfo.json b/src/main/webapp/i18n/en/operatorInfo.json
new file mode 100644
index 000000000000..a6e174a9b9fd
--- /dev/null
+++ b/src/main/webapp/i18n/en/operatorInfo.json
@@ -0,0 +1,10 @@
+{
+    "artemisApp": {
+        "operatorInfo": {
+            "title": "Operator",
+            "name": "Name",
+            "admin": "Administrator",
+            "adminEmail": "Contact Email"
+        }
+    }
+}
diff --git a/src/main/webapp/i18n/en/programmingExercise.json b/src/main/webapp/i18n/en/programmingExercise.json
index e199355c4a82..1883d8294abc 100644
--- a/src/main/webapp/i18n/en/programmingExercise.json
+++ b/src/main/webapp/i18n/en/programmingExercise.json
@@ -130,14 +130,22 @@
             "customizeDockerImage": "You can customize the Docker image. Make sure to provide it in amd64 and arm64 and include all build dependencies to guarantee a short build duration.",
             "allowOnlineEditor": {
                 "title": "Allow Online Editor",
-                "alert": "At least one option (Offline IDE or Online Editor) must be selected"
+                "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected",
+                "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected"
             },
             "onlineEditor": "Online",
             "allowOfflineIde": {
                 "title": "Allow Offline IDE",
-                "alert": "At least one option (Offline IDE or Online Editor) must be selected"
+                "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected",
+                "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected"
             },
             "offlineIde": "IDE",
+            "allowOnlineIde": {
+                "title": "Allow Online IDE",
+                "alert": "At least one option (Offline IDE, Online Editor, or Online IDE) must be selected.",
+                "alertNoTheia": "At least one option (Offline IDE or Online Editor) must be selected"
+            },
+            "onlineIde": "Online IDE",
             "showTestNamesToStudents": "Show Test Names to Students",
             "showTestNamesToStudentsTooltip": "Activate this option to show the names of the automated test cases to the students. Leave the option disabled to make no visual distinction between manual and automated feedback for the students.",
             "participationMode": "Participation Mode",
@@ -172,6 +180,11 @@
             "projectType": "Project Type",
             "testRepositoryProjectType": "Test Repository Project Type",
             "packageName": "Package Name",
+            "theiaImage": {
+                "title": "Configuration for Online IDE",
+                "noImageAvailable": "The Online IDE is not yet available for this programming language.",
+                "alert": "A valid configuration for the Online IDE must be selected."
+            },
             "appName": "App Name",
             "templateResult": "Template Result",
             "solutionResult": "Solution Result",
@@ -262,6 +275,7 @@
                     "settingNegative": "Test case {{testCase}} must not have settings set to negative values."
                 },
                 "categories": {
+                    "titleHeader": "Code Analysis",
                     "title": "Code Analysis Categories",
                     "notGraded": "Not graded.",
                     "noFeedback": "No visible feedback.",
@@ -308,6 +322,17 @@
                     "testType": "Type",
                     "passedPercent": "Passed %"
                 },
+                "feedbackAnalysis": {
+                    "titleHeader": "Feedback Analysis",
+                    "title": "Feedback Analysis for {{exerciseTitle}}",
+                    "occurrence": "Occurrence",
+                    "feedback": "Feedback",
+                    "task": "Task",
+                    "testcase": "Test Case",
+                    "errorCategory": "Error Category",
+                    "totalItems": "In total {{count}} items",
+                    "error": "An error occurred while loading the feedback."
+                },
                 "help": {
                     "name": "Task names are written in bold whereas Test names are normal. Task or test name depending on whether the row is a task or test.",
                     "state": "Determines whether issues in this category should be shown to the students and used for grading.",
diff --git a/src/main/webapp/i18n/en/reset.json b/src/main/webapp/i18n/en/reset.json
index 3b1401352991..22b919a79791 100644
--- a/src/main/webapp/i18n/en/reset.json
+++ b/src/main/webapp/i18n/en/reset.json
@@ -4,10 +4,10 @@
             "title": "Reset your password",
             "form": {
                 "button": "Reset password",
-                "emailUsername": "Email/Username"
+                "emailUsername": "Email / Login"
             },
             "messages": {
-                "info": "Enter the email address you used to register or your username.",
+                "info": "Enter the email address you used to register or your login.",
                 "success": "Check your email for details on how to reset your password. For security reasons, this hint is visible even if the account doesn't exist. Recheck your input if you don't receive an email."
             },
             "external": {
diff --git a/src/main/webapp/i18n/en/student-dashboard.json b/src/main/webapp/i18n/en/student-dashboard.json
index 586cdf840ce1..ae6d54800cd6 100644
--- a/src/main/webapp/i18n/en/student-dashboard.json
+++ b/src/main/webapp/i18n/en/student-dashboard.json
@@ -33,7 +33,8 @@
             "manage": "Manage",
             "studentView": "Student view",
             "general": {
-                "noDataFound": "No data found."
+                "noDataFound": "No data found.",
+                "noElementFoundWithAppliedFilter": "No element matches the applied filter."
             },
             "sidebar": {
                 "past": "Past",
@@ -89,6 +90,17 @@
                 "plagiarismCases": "Plagiarism Cases",
                 "gradingSystem": "Grading System"
             },
+            "exerciseFilter": {
+                "filter": "Filter",
+                "modalTitle": "Filter Exercises",
+                "dueDateRange": "Due Date Range",
+                "achievedScore": "Achieved Score",
+                "achievablePoints": "Achievable Points",
+                "applyFilter": "Apply filter",
+                "clearFilter": "Clear filter",
+                "noFilterAvailable": "There are no distinguishing filter options for the existing exercises",
+                "noMoreOptions": "No more options"
+            },
             "exerciseList": {
                 "filter": "Filter ({{ num }})",
                 "releaseDate": "Release Date",
diff --git a/src/main/webapp/i18n/en/userSettings.json b/src/main/webapp/i18n/en/userSettings.json
index 839dd249b260..4230ddab9506 100644
--- a/src/main/webapp/i18n/en/userSettings.json
+++ b/src/main/webapp/i18n/en/userSettings.json
@@ -5,7 +5,8 @@
             "saveChanges": "Save Changes",
             "saveSettingsSuccessAlert": "Your Settings have been successfully saved.",
             "userSettings": "User Settings",
-            "sshSettings": "SSH Settings",
+            "sshSettings": "SSH",
+            "vcsAccessTokenSettings": "VCS Token",
             "accountInformation": "Account Information",
             "notificationSettings": "Notifications",
             "notificationSettingsFilterInfo": "These settings also filter the notification sidebar",
@@ -27,6 +28,21 @@
                 "sshKeyDisplayedInformation": "This is your currently configured SSH key:",
                 "key": "SSH Key"
             },
+            "vcsAccessTokensSettingsPage": {
+                "addTokenTitle": "Add personal access token",
+                "infoText": "You can generate a personal access token to interact with the Artemis Local Version Control System. You can use it to authenticate to Git over HTTP.",
+                "deleteVcsAccessTokenQuestion": "Do you really want to delete your version control system access token? You will not be able to authenticate to local repositories cloned with this token any more.",
+                "createAccessToken": "Create new VCS access token",
+                "noTokenSet": "You do not have any user tokens",
+                "addToken": "Add new token",
+                "deleteFailure": "Deleting the VCS access token failed",
+                "deleteSuccess": "Successfully deleted the VCS access token",
+                "addFailure": "Failed to set new VCS access token",
+                "addSuccess": "Successfully created a new VCS access token",
+                "vcsAccessToken": "VCS Access Token",
+                "expiryDate": "Expiry Date",
+                "actions": "Actions"
+            },
             "accountInformationPage": {
                 "registrationNumber": "Registration Number",
                 "fullName": "Full Name",
@@ -38,7 +54,8 @@
             "categories": {
                 "NOTIFICATION_SETTINGS": "Notification Settings",
                 "SCIENCE_SETTINGS": "Science Settings",
-                "SSH_SETTINGS": "SSH"
+                "SSH_SETTINGS": "SSH Settings",
+                "VCS_TOKEN_SETTINGS": "VCS Token Settings"
             },
             "settingGroupNames": {
                 "weeklySummary": "Weekly Summary",
diff --git a/src/test/cypress/README.md b/src/test/cypress/README.md
deleted file mode 100644
index b59bc697c404..000000000000
--- a/src/test/cypress/README.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Artemis Cypress test suite
-This folder contains the End-to-End test suite for Artemis.
-The test suite only contains End-to-End tests. Therefore it cannot be run out of the box and has some requirements. Those will be listed in the following.
-
-# Requirements
-1. Running (and reachable) test environment: The Artemis Server and Client have to be deployed somewhere, where the tests can access them. This can be a local setup or a remote one (the Artemis test servers for example)
-2. Prepared user accounts on the test environment: See the [corresponding section](#prepared-users) below
-3. Node and Chrome installed on the machine, which executes the test suite
-
-## Prepared users
-Currently the test suite does not automatically create the required users with their roles, but expects existing ones. There are several user accounts the test suite requires:
-|        ROLE        |     ID(s)     | AMOUNT |
-|:------------------:|:-------------:|:------:|
-|        `ADMIN`       |       -       |    1   |
-|        `USER`        | 100, 102, 104 |    3   |
-| `TEACHING ASSISTANT` |      101      |    1   |
-|     `INSTRUCTOR`     |      103      |    1   |
-
-The test suite expects two templates (one for usernames and one for passwords) in its configuration (see the [general configuration section](#general-configuration)), which contain the text `USERID`. When authenticating as one of the non-admin users a test will substitute the `USERID` text in the username and password templates with the required ID (seen in the table) of the user.
-
-For example, a basic template for a username and password could be `user_USERID` and `password_USERID`. Hence, a test which requires the authentication of an `INSTRUCTOR` would then use `user_103`:`password_103` as credentials.
-
-An `ADMIN` user is required to create and delete courses. The credentials for an `ADMIN` user are not generated by the templates. Therefore no `ID` is specified in the table above. The `ADMIN` credentials are configured separately. See the [General configuration section](#general-configuration) for details.
-
-:warning: **The guided tour should be disabled for every user required by the test suite. Otherwise some/all tests in the suite will fail!**
-
-## Test suite configuration
-### General configuration
-Once the test environment is running and the required users are added in the test environment the test suite needs to be configured. The configuration is done via two files:
-1. `cypress.json`: Contains general settings for Cypress
-2. `cypress.env.json`: Contains settings specific for Artemis
-
-Both configuration files can be found in the cypress subfolder (`src/test/cypress`).
-
-In the following we will explain what setting in the configuration files has to be adjusted to be able to execute the test suite. Example configurations are shown in the [Example configuration section](#example-configurations) below.
-
-For `cypress.json`:
-* `baseUrl`: The url pointing to the test environment here (make sure that there is no trailing slash)
-
-For `cypress.env.json`:
-* `username`: The username template (as described in the [prepared users section](#prepared-users))
-* `password`: The password template
-* `adminUsername`: The admin username (no template)
-* `adminPassword`: The admin password (no template)
-
-### Example configurations
-In the following we show example configurations of the test suite for imaginary Artemis setups. For readability we will leave out settings in the configuration files, which do not require the user to adjust them in order to run the tests.
-#### Test environment using Gitlab + Jenkins
-`cypress.json`:
-```json
-{
-    "baseUrl": "https://imaginary-artemis-server.com"
-}
-```
-`cypress.env.json`:
-```json
-{
-    "username": "username_USERID",
-    "password": "password_USERID",
-    "adminUsername": "admin_username",
-    "adminPassword": "admin_password"
-}
-
-```
-
-# Executing the test suite
-Before executing the test suite Cypress with all of its dependencies has to be installed via `npm`. Make sure that the command is executed in the Cypress subfolder of Artemis (`src/test/cypress`).
-```bash
-npm install
-
-```
-The test suite can be executed with via the predefined commands in the `package.json`:
-1. `npm run cypress:open`: This opens a Cypress Dashboard from where all or individual tests can be executed
-2. `npm run cypress:run`: This executes the complete test suite in headless mode
-
-Individual test specs in the test suite can be executed by passing the `--spec` parameter like so:
-```bash
-npm run cypress:run -- --spec integration/path/to/spec/file.spec.ts 
-
-```
-
-For more information about Cypress and its configuration see the [Cypress documentation](https://docs.cypress.io/guides/getting-started/installing-cypress)
-
diff --git a/src/test/cypress/certs/artemis-nginx+4-key.pem b/src/test/cypress/certs/artemis-nginx+4-key.pem
deleted file mode 100644
index eb2d95da1e9c..000000000000
--- a/src/test/cypress/certs/artemis-nginx+4-key.pem
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQCuCJSHStSQd02f
-j+IlQFes7pVUcYv2r0qm5qicGwPcKQf1/nmsy6k4WhE9HQV9VO9LQ4doSNp9NuYX
-P/JQqdYLZYYQvxHS+fR7ofIPjirsrbQYAkG5F6imM8H7MkkueG3HGqaKD54PBmC4
-BgBJDFWiF8jSNSYNKOE2L5SaYG/g3LLIkWBlhBQHgrprkio4pv5Y44+nf+hGWkSj
-bkRo2+PmIsNmQrpDB2o0O7uoyswa71HE967n9K17SWZ7Hi4kP6BGUWn65P5JB10a
-6kz0y8183Uzz99bx8hzxLPg6VNiJZQ+dH4M1Jn6kysKiyV4x24JsM9s6t+Vhln9E
-KX5ktosdAgMBAAECggEBAJs3ddkwqWLrtOSR/H2C5G+NHsyAtPdgIfG3mTwZcBjk
-03/X5gdyYUusMOHTx3ifzwjOgq9FAvFYjGDCHMlKoGfrtWWsNCZ53k6CApVTE/+h
-cRVUte9yJW2Ojf0PPWvf5vEEWPKbuTnnU03ttEVyZdG66tZoprZn9m1QhHYnesEO
-PMPvYMd3Oyko8MD/Rr1A/KS/rmc0yfUvgLsqF6PLxq3NKxyVD/8Tp4u9aXbPMnd2
-vugVxjjvt5ubscF1Owi8EjqjVkXlw94JzLcy70XfBzsS2EvUtX/hmHgBEsViXUOQ
-KGVyeFTvuReq0RvLQi1LA8vs2q6UC0ZYX75wGDfWWnUCgYEAyP6FY6xdP+N83qEM
-TzAf2a33bBCcD5zbrfsvYwHwdzcAz9HBdf3TN1ZcbgfIzIWvuo+hFdjZd32E2+b7
-tSGpcs21iZ3dn1aWxngNs/h94h6cNak/02iCbOsmMX9rHfKZd1ODnQyA8q0s9PQY
-uWWWMUfqPse7mSYbgU0aYOVFraMCgYEA3ak3N2mTgTVsUqhNyZCJlmtafp0tsT6b
-/7GKSqkl741wokM6un3wx1eo6Q95mngxOlY2xxq9OChnNSEa9ZQnzdUDtQ0YE4QD
-09awTIMHNCeSqpV2n3Yv2fT3C5Ya5/WEtYGpVAtqgxwWPij8+VMOa8MVzy+/v6Hg
-N1Tpww+Y8D8CgYEAhbEGeK4FuKFQRaVJ0sJn7RrSIIdLxvbHCIqzkl+P2zwyxgj3
-bcxP2dcP1ABJiADESouO0kFTJS/QV5TkiC7DzyEVR1xCNeIamBjyxGrdELLbpLXX
-Rn+VgW1IElR2o4zil4RtXuEaRFD8PlK+v1La/ByhqvCfz9aRJQhsK1dVaZECgYEA
-jRYR0TFf89P/OLVrnapkCNwX45ND7Bc/0AY/UbpMLSfH02AbV2yl/xvqpT12Vz29
-h7Ysc5qvabk9x/FkaX99vmOhUnIdKv7SONnjqS+VPDsb/XvY3zKozoA/Zp6KTa5W
-Y/k9wALsLruH5NTOABw/h5PKo+9uixkLz+w6Ri/9Vp0CgYEAqfkZJe7vCOIwtIwj
-Mq5knkJgR+Vq30i4jRoFU0yxIcWA1hODVBnK39+mtA++/3+r5DY5fGRTc9mMyXU/
-y2N2nfSnvPMAUaRmisB7NhmvinEgymlrX+WE+7S9/+nOQADxzWSc6Hxg/ub6mTYV
-k2/hv9uG1gbm2+OBP/EBOr48jz0=
------END PRIVATE KEY-----
diff --git a/src/test/cypress/certs/artemis-nginx+4.pem b/src/test/cypress/certs/artemis-nginx+4.pem
deleted file mode 100644
index 6492786845eb..000000000000
--- a/src/test/cypress/certs/artemis-nginx+4.pem
+++ /dev/null
@@ -1,25 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIERjCCAq6gAwIBAgIQSQ2vfdquHAQcrzbEKx46mzANBgkqhkiG9w0BAQsFADBf
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RA
-MWY0ZmQzNzYzNmMyMSEwHwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIw
-HhcNMjIxMjA1MDk0NTEzWhcNMjUwMzA1MDk0NTEzWjBFMScwJQYDVQQKEx5ta2Nl
-cnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxGjAYBgNVBAsMEXJvb3RAMWY0ZmQz
-NzYzNmMyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArgiUh0rUkHdN
-n4/iJUBXrO6VVHGL9q9KpuaonBsD3CkH9f55rMupOFoRPR0FfVTvS0OHaEjafTbm
-Fz/yUKnWC2WGEL8R0vn0e6HyD44q7K20GAJBuReopjPB+zJJLnhtxxqmig+eDwZg
-uAYASQxVohfI0jUmDSjhNi+UmmBv4NyyyJFgZYQUB4K6a5IqOKb+WOOPp3/oRlpE
-o25EaNvj5iLDZkK6QwdqNDu7qMrMGu9RxPeu5/Ste0lmex4uJD+gRlFp+uT+SQdd
-GupM9MvNfN1M8/fW8fIc8Sz4OlTYiWUPnR+DNSZ+pMrCosleMduCbDPbOrflYZZ/
-RCl+ZLaLHQIDAQABo4GXMIGUMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr
-BgEFBQcDATAfBgNVHSMEGDAWgBSpuKALkiwfLnQmm7+JNG2bxGAIgzBMBgNVHREE
-RTBDgg1hcnRlbWlzLW5naW54gg9hcnRlbWlzLmV4YW1wbGWCCWxvY2FsaG9zdIcE
-fwAAAYcQAAAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAYEApG8ZADQe
-SsH/nqH9WpR3ZkYg0rm8pw+YquBNUdDFG2/4IQtaaxrgsvNPrEEMXfCO4vvnC0cH
-6Tgay8LzFZxU9D1F06VZ9S1C7KNnYSsjgwhW7wxem1JXgauoutA8D0uHLr/2bVnz
-rTShQT7gRp9SRunqDylaSkgpXlfZQRlEANrYT8Jh6LIHRjkxLh/etw7VdFA6Tywh
-iQGBE/EbQcGpmqHBoMytblku0D8H+pcFHZ03AZq0FTMbByM9GekQ8HJV88epqvqJ
-7pWyQPX9lr7yC6n121dPoA0ylP8D7jIBCmlFeF+QWCiRAgdeb1w+JONHMgI97IR+
-9HBm6gGE+Da/TRq82w02tUN/F7NHdzqwKGx/GKLrEsdNlfP6D9iiVtfBGBoAUm+C
-2t3jbQEgqYHA+mzadS75RGJsRnVdY24IHvNjEnESW6KCaSfQyMmp3trRH6JeOttU
-2JeqRPjmOzNvzIcB76w1/hB2ljhimyfoxB8Gbrts+GFPRZE+AXg1mvCn
------END CERTIFICATE-----
diff --git a/src/test/cypress/certs/rootCA.pem b/src/test/cypress/certs/rootCA.pem
deleted file mode 100644
index df27e7384ca9..000000000000
--- a/src/test/cypress/certs/rootCA.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEjTCCAvWgAwIBAgIQU1RC58hYfDrlnkOa5hWT9TANBgkqhkiG9w0BAQsFADBf
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RA
-MWY0ZmQzNzYzNmMyMSEwHwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIw
-HhcNMjIxMjA1MDk0NTEzWhcNMzIxMjA1MDk0NTEzWjBfMR4wHAYDVQQKExVta2Nl
-cnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RAMWY0ZmQzNzYzNmMyMSEw
-HwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIwggGiMA0GCSqGSIb3DQEB
-AQUAA4IBjwAwggGKAoIBgQC6XajL1Rz5RQW0D+TxZ16msa5xAcKt5hEclOUB+oK+
-ychkUiDDSeh4EpkA2txu823n8BLqdNrIZ2A/TW3OVRXcD/hYFTbODI+FZ4DFEHoP
-b8QnMlbZfo1AVNOR5ZFAVuneytaauhznnd1+Y49ieeX2v81hmBUKTuwDGVwp69rS
-WUqANAKuGim7yOyBX6oRaUPg42xIBVHdDXkWr06zcFC6Z1O5zUYmFYHyn/sP2ZRN
-BzMM+lVHCbZlw9Yi5TGLDC4wUAmMS9rColE5E76UNuOvfUERZffdLCzkmbS+VqOI
-28fWvO/C8qEB10lcjxxplah4JZSyveH3Q5aFzLK2FbnXfLa/ypr3Mn9rBm06CtaL
-Moy6h5gxNFDDB4RTpP7kjz32RRbl5xxqgkTEEAGDr/bk/C3DT6pyvGX5k6cj0zWd
-o2bAO42Uk4ehMEHEUhnmvJ1yeOLSabgzfTJ3dM1NkdPI3Ss7dJGfraPx0sGet4SB
-KMKw3mqJIizd1vV19TA/oRECAwEAAaNFMEMwDgYDVR0PAQH/BAQDAgIEMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFKm4oAuSLB8udCabv4k0bZvEYAiDMA0G
-CSqGSIb3DQEBCwUAA4IBgQBSPmSTP6Twe1T5UNqxfLSG/aKtT9yR1gAOW1zmM8KN
-IZEwa1k6AH+y+dBT1MdFtSORVRagKNBwNsqqUMgPlXp9INpo+a5GFT4oAv73CrWu
-bmXq7oiKkfk9UcdBNp3n8J+h+urXm4jEcUzTdNt8R631+seKOjYZz1SKOzpV5iz5
-20Mjk36RkiaiH3sxYvVo9ayXATz4Yq+0jWOHuQpYmFe2mH6wlle8hT/bRQb6/2z0
-wG/kKZl/CYbgRhc39np06mQ7FmAyXTtQORfjfhAUEu568JzPl/r2jYX1YgtEP4IL
-GZXOdSYdtVC1vfpoWIo1YY+xqg3WRA/qgPFW33pZBk/qTaWE4ISMr0ewv613JDdK
-ZOttGRDm2EDmh/FoeRoO5niydjb9DP915xObGMrYXKkPBpoIsQCfcmmFNQBAN4e4
-OQwSP9r/hh1cS8Usk6Ch0/iRhq7lv2Z5irLl/nQ4tPUZDVbBOhJ936t0gySVHbCl
-GVOog28PQ8wI3fRZ2FZg6IM=
------END CERTIFICATE-----
diff --git a/src/test/cypress/currents.config.js b/src/test/cypress/currents.config.js
deleted file mode 100644
index c5cadf96dc1c..000000000000
--- a/src/test/cypress/currents.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    projectId: process.env.SORRY_CYPRESS_PROJECT_ID,
-    recordKey: process.env.SORRY_CYPRESS_KEY,
-    cloudServiceUrl: process.env.SORRY_CYPRESS_URL,
-};
diff --git a/src/test/cypress/cypress.config.ts b/src/test/cypress/cypress.config.ts
deleted file mode 100644
index fa5c941d1de5..000000000000
--- a/src/test/cypress/cypress.config.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { defineConfig } from 'cypress';
-import { cloudPlugin } from 'cypress-cloud/plugin';
-import fs from 'fs';
-
-export default defineConfig({
-    clientCertificates: [
-        {
-            url: 'https://artemis-nginx',
-            ca: ['certs/rootCA.pem'],
-            certs: [
-                {
-                    cert: 'certs/artemis-nginx+4.pem',
-                    key: 'certs/artemis-nginx+4-key.pem',
-                },
-            ],
-        },
-        {
-            url: 'https://artemis.example',
-            ca: ['certs/rootCA.pem'],
-            certs: [
-                {
-                    cert: 'certs/artemis-nginx+4.pem',
-                    key: 'certs/artemis-nginx+4-key.pem',
-                },
-            ],
-        },
-        {
-            url: 'https://localhost',
-            ca: ['certs/rootCA.pem'],
-            certs: [
-                {
-                    cert: 'certs/artemis-nginx+4.pem',
-                    key: 'certs/artemis-nginx+4-key.pem',
-                },
-            ],
-        },
-    ],
-    fixturesFolder: 'fixtures',
-    screenshotsFolder: 'screenshots',
-    videosFolder: 'videos',
-    video: true,
-    screenshotOnRunFailure: true,
-    viewportWidth: 1920,
-    viewportHeight: 1080,
-    defaultCommandTimeout: 20000,
-    responseTimeout: 120000,
-    reporter: 'junit',
-    reporterOptions: {
-        mochaFile: 'build/cypress/test-reports/test-results.[hash].xml',
-        toConsole: true,
-    },
-    e2e: {
-        setupNodeEvents(on, config) {
-            on('task', {
-                error(message: string) {
-                    console.error('\x1b[31m', 'ERROR: ', message, '\x1b[0m');
-                    return null;
-                },
-                warn(message: string) {
-                    console.error('\x1b[33m', 'WARNING: ', message, '\x1b[0m');
-                    return null;
-                },
-                log(message: string) {
-                    console.log('\x1b[37m', 'LOG: ', message, '\x1b[0m');
-                    return null;
-                },
-            });
-            on('after:spec', (spec: Cypress.Spec, results: CypressCommandLine.RunResult) => {
-                if (results && results.video) {
-                    const failures = results.tests.some((test) => test.attempts.some((attempt) => attempt.state === 'failed'));
-                    if (!failures) {
-                        fs.unlinkSync(results.video);
-                    }
-                }
-            });
-            on('before:browser:launch', (browser, launchOptions) => {
-                launchOptions.args.push('--lang=en');
-                return launchOptions;
-            });
-            return cloudPlugin(on, config);
-        },
-        specPattern: ['init/ImportUsers.cy.ts', 'e2e/**/*.cy.ts'],
-        supportFile: 'support/index.ts',
-        baseUrl: 'http://localhost:8080',
-        testIsolation: false,
-    },
-});
diff --git a/src/test/cypress/cypress.env.json b/src/test/cypress/cypress.env.json
deleted file mode 100644
index 0904cff1191c..000000000000
--- a/src/test/cypress/cypress.env.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "username": "<Insert the student username of the testing environment>",
-    "password": "<Insert the student password of the testing environment>",
-    "adminUsername": "<Insert the admin username of the testing environment>",
-    "adminPassword": "<Insert the admin password of the testing environment>",
-    "allowGroupCustomization": false,
-    "studentGroupName": null,
-    "tutorGroupName": null,
-    "editorGroupName": null,
-    "instructorGroupName": null,
-    "createUsers": false
-}
diff --git a/src/test/cypress/e2e/Login.cy.ts b/src/test/cypress/e2e/Login.cy.ts
deleted file mode 100644
index c34e9cb687f8..000000000000
--- a/src/test/cypress/e2e/Login.cy.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { loginPage, navigationBar } from '../support/artemis';
-import { studentOne } from '../support/users';
-
-describe.skip('Login page tests', () => {
-    it('Logs in via the UI', () => {
-        cy.visit('/');
-        loginPage.login(studentOne);
-        cy.url().should('include', '/courses');
-        cy.getCookie('jwt').should('exist');
-        cy.getCookie('jwt').should('have.property', 'value');
-        cy.getCookie('jwt').should('have.property', 'httpOnly', true);
-        cy.getCookie('jwt').should('have.property', 'sameSite', 'lax');
-        // TODO: Uncomment once cypress is using https - cy.getCookie('jwt').should('have.property', 'secure', true);
-    });
-
-    it('Logs in programmatically and logs out via the UI', () => {
-        cy.login(studentOne, '/courses');
-        cy.url().should('include', '/courses');
-        navigationBar.logout();
-        cy.url().should('equal', Cypress.config().baseUrl + '/');
-        cy.getCookie('jwt').should('not.exist');
-    });
-
-    it('Displays error messages on wrong password', () => {
-        cy.visit('/');
-        loginPage.login({ username: 'some_user_name', password: 'lorem-ipsum' });
-        cy.location('pathname').should('eq', '/');
-        cy.get('.alert').should('exist').and('have.text', 'Failed to sign in! Please check your username and password and try again.');
-        cy.get('#login-button').click();
-        cy.get('#login-button').click();
-    });
-
-    it('Fails to access protected resource without login', () => {
-        cy.visit('/course-management');
-        cy.location('pathname').should('eq', '/');
-    });
-
-    it('Verify footer content', () => {
-        cy.visit('/');
-        loginPage.shouldShowFooter();
-        loginPage.shouldShowAboutUsInFooter();
-        loginPage.shouldShowRequestChangeInFooter();
-        loginPage.shouldShowReleaseNotesInFooter();
-        loginPage.shouldShowPrivacyStatementInFooter();
-        loginPage.shouldShowImprintInFooter();
-    });
-});
diff --git a/src/test/cypress/e2e/Logout.cy.ts b/src/test/cypress/e2e/Logout.cy.ts
deleted file mode 100644
index d9c988f2b449..000000000000
--- a/src/test/cypress/e2e/Logout.cy.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest, modelingExerciseEditor, navigationBar } from '../support/artemis';
-import { admin, studentOne, studentTwo } from '../support/users';
-import { convertModelAfterMultiPart } from '../support/utils';
-
-describe.skip('Logout tests', () => {
-    let course: Course;
-    let modelingExercise: ModelingExercise;
-
-    before('Login as admin and create a course with a modeling exercise', () => {
-        cy.login(admin);
-
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addStudentToCourse(course, studentTwo);
-            exerciseAPIRequest.createModelingExercise({ course }).then((resp: Cypress.Response<ModelingExercise>) => {
-                modelingExercise = resp.body;
-            });
-        });
-    });
-
-    it('Logs out by pressing OK when unsaved changes on exercise mode', () => {
-        cy.login(studentOne);
-
-        const exerciseID = modelingExercise.id!;
-        cy.visit(`/courses/${course.id}/exercises`);
-        courseOverview.startExercise(exerciseID);
-        courseOverview.openRunningExercise(exerciseID);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 1);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 2);
-        navigationBar.logout();
-
-        cy.on('window:confirm', (text) => {
-            expect(text).to.contains('You have unsaved changes');
-            return true;
-        });
-        cy.url().should('equal', Cypress.config().baseUrl + '/');
-    });
-
-    it('Stays logged in by pressing cancel when trying to logout during unsaved changes on exercise mode', () => {
-        cy.login(studentTwo);
-
-        const exerciseID = modelingExercise.id!;
-        cy.visit(`/courses/${course.id}/exercises`);
-        courseOverview.startExercise(exerciseID);
-        courseOverview.openRunningExercise(exerciseID);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 1);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 2);
-        navigationBar.logout();
-
-        cy.on('window:confirm', (text) => {
-            expect(text).to.contains('You have unsaved changes');
-            return false;
-        });
-        cy.url().should('not.equal', Cypress.config().baseUrl + '/');
-    });
-
-    after(() => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/SystemHealth.cy.ts b/src/test/cypress/e2e/SystemHealth.cy.ts
deleted file mode 100644
index 21a8d1b46943..000000000000
--- a/src/test/cypress/e2e/SystemHealth.cy.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { admin } from '../support/users';
-
-describe.skip('Check artemis system health', () => {
-    beforeEach('Login as admin and visit system health page', () => {
-        cy.login(admin, '/admin/health');
-    });
-
-    it('Checks continuous integration health', () => {
-        cy.get('#healthCheck #continuousIntegrationServer .status').contains('UP');
-    });
-
-    it('Checks version control health', () => {
-        cy.get('#healthCheck #versionControlServer .status').contains('UP');
-    });
-
-    it('Checks user management health', () => {
-        cy.get('#healthCheck #userManagement .status').contains('UP');
-    });
-
-    it('Checks database health', () => {
-        cy.get('#healthCheck #db .status').contains('UP');
-    });
-
-    it('Checks hazelcast health', () => {
-        cy.get('#healthCheck #hazelcast .status').contains('UP');
-    });
-
-    it('Checks ping health', () => {
-        cy.get('#healthCheck #ping .status').contains('UP');
-    });
-
-    it('Checks readiness health', () => {
-        cy.get('#healthCheck #readinessState .status').contains('UP');
-    });
-
-    it('Checks websocket broker health', () => {
-        cy.get('#healthCheck #websocketBroker .status').contains('UP');
-    });
-
-    it('Checks websocket connection health', () => {
-        cy.get('#healthCheck #websocketConnection .status').contains('Connected');
-    });
-});
diff --git a/src/test/cypress/e2e/course/CourseExercise.cy.ts b/src/test/cypress/e2e/course/CourseExercise.cy.ts
deleted file mode 100644
index f07bb65a0551..000000000000
--- a/src/test/cypress/e2e/course/CourseExercise.cy.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-
-import multipleChoiceQuizTemplate from '../../fixtures/exercise/quiz/multiple_choice/template.json';
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest } from '../../support/artemis';
-import { admin } from '../../support/users';
-import { convertModelAfterMultiPart } from '../../support/utils';
-
-describe.skip('Course Exercise', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    describe('Search Exercise', () => {
-        let exercise1: QuizExercise;
-        let exercise2: QuizExercise;
-        let exercise3: QuizExercise;
-
-        before('Create Exercises', () => {
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate], 'Course Exercise Quiz 1').then((response) => {
-                exercise1 = convertModelAfterMultiPart(response);
-            });
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate], 'Course Exercise Quiz 2').then((response) => {
-                exercise2 = convertModelAfterMultiPart(response);
-            });
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate], 'Course Exercise 3').then((response) => {
-                exercise3 = convertModelAfterMultiPart(response);
-            });
-        });
-
-        it('should filter exercises based on title', () => {
-            cy.visit(`/courses/${course.id}/exercises`);
-            courseOverview.getExercise(exercise1.title!).should('be.visible');
-            courseOverview.getExercise(exercise2.title!).should('be.visible');
-            courseOverview.getExercise(exercise3.title!).should('be.visible');
-            courseOverview.search('Course Exercise Quiz');
-            courseOverview.getExercise(exercise1.title!).should('be.visible');
-            courseOverview.getExercise(exercise2.title!).should('be.visible');
-            courseOverview.getExercise(exercise3.title!).should('not.exist');
-        });
-
-        after('Delete Exercises', () => {
-            exerciseAPIRequest.deleteQuizExercise(exercise1.id!);
-            exerciseAPIRequest.deleteQuizExercise(exercise2.id!);
-            exerciseAPIRequest.deleteQuizExercise(exercise3.id!);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/course/CourseManagement.cy.ts b/src/test/cypress/e2e/course/CourseManagement.cy.ts
deleted file mode 100644
index 9c565a66a275..000000000000
--- a/src/test/cypress/e2e/course/CourseManagement.cy.ts
+++ /dev/null
@@ -1,308 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-
-import { courseCreation, courseManagement, courseManagementAPIRequest, navigationBar } from '../../support/artemis';
-import { admin, studentOne } from '../../support/users';
-import { convertBooleanToCheckIconClass, convertModelAfterMultiPart, dayjsToString, generateUUID, trimDate } from '../../support/utils';
-
-// Common primitives
-const courseData = {
-    title: '',
-    shortName: '',
-    description: 'Lore Impsum',
-    startDate: dayjs(),
-    endDate: dayjs().add(1, 'day'),
-    testCourse: true,
-    semester: 'SS23',
-    maxPoints: 40,
-    programmingLanguage: 'JAVA',
-    customizeGroupNames: false,
-    studentGroupName: Cypress.env('studentGroupName'),
-    tutorGroupName: Cypress.env('tutorGroupName'),
-    editorGroupName: Cypress.env('editorGroupName'),
-    instructorGroupName: Cypress.env('instructorGroupName'),
-    enableComplaints: true,
-    maxComplaints: 5,
-    maxTeamComplaints: 3,
-    maxComplaintTimeDays: 6,
-    enableMoreFeedback: true,
-    maxRequestMoreFeedbackTimeDays: 4,
-    presentationScoreEnabled: true,
-    presentationScore: 10,
-};
-
-const editedCourseData = {
-    title: '',
-    testCourse: false,
-};
-
-const allowGroupCustomization: boolean = Cypress.env('allowGroupCustomization');
-const dateFormat = 'MMM D, YYYY HH:mm';
-
-describe.skip('Course management', () => {
-    describe('Manual student selection', () => {
-        let course: Course;
-
-        before('Create course', () => {
-            cy.login(admin, '/');
-            const uid = generateUUID();
-            courseData.title = 'Course ' + uid;
-            courseData.shortName = 'cypress' + uid;
-            courseManagementAPIRequest.createCourse({ courseName: courseData.title, courseShortName: courseData.shortName }).then((response) => {
-                course = convertModelAfterMultiPart(response);
-            });
-        });
-
-        it('Manually adds and removes a student', () => {
-            const username = studentOne.username;
-            navigationBar.openCourseManagement();
-            courseManagement.openCourse(course.id!);
-            courseManagement.addStudentToCourse(studentOne);
-            courseManagement.getRegisteredStudents().contains(username).should('be.visible');
-            navigationBar.openCourseManagement();
-            courseManagement.openCourse(course.id!);
-            courseManagement.getCourseStudentGroupName().contains(`artemis-${course.shortName}-students (1)`);
-
-            navigationBar.openCourseManagement();
-            courseManagement.openStudentOverviewOfCourse(course.id!);
-            courseManagement.removeFirstUser();
-            courseManagement.getRegisteredStudents().contains(username).should('not.exist');
-            navigationBar.openCourseManagement();
-            courseManagement.openCourse(course.id!);
-            courseManagement.getCourseStudentGroupName().contains(`artemis-${course.shortName}-students (0)`);
-        });
-
-        after('Delete course', () => {
-            courseManagementAPIRequest.deleteCourse(course, admin);
-        });
-    });
-
-    describe('Course creation', () => {
-        let course: Course;
-        let course2: Course;
-
-        beforeEach('Set course title and shortname', () => {
-            cy.login(admin, '/');
-            const uid = generateUUID();
-            courseData.title = 'Course ' + uid;
-            courseData.shortName = 'cypress' + uid;
-        });
-
-        it('Creates a new course', () => {
-            navigationBar.openCourseManagement();
-            courseManagement.openCourseCreation();
-            courseCreation.setTitle(courseData.title);
-            courseCreation.setShortName(courseData.shortName);
-            courseCreation.setDescription(courseData.description);
-            courseCreation.setStartDate(courseData.startDate);
-            courseCreation.setEndDate(courseData.endDate);
-            courseCreation.setTestCourse(courseData.testCourse);
-            courseCreation.setSemester(courseData.semester);
-            courseCreation.setCourseMaxPoints(courseData.maxPoints);
-            courseCreation.setProgrammingLanguage(courseData.programmingLanguage);
-            courseCreation.setCustomizeGroupNames(courseData.customizeGroupNames);
-            courseCreation.setEnableComplaints(courseData.enableComplaints);
-            courseCreation.setMaxComplaints(courseData.maxComplaints);
-            courseCreation.setMaxTeamComplaints(courseData.maxTeamComplaints);
-            courseCreation.setMaxComplaintsTimeDays(courseData.maxComplaintTimeDays);
-            courseCreation.setEnableMoreFeedback(courseData.enableMoreFeedback);
-            courseCreation.setMaxRequestMoreFeedbackTimeDays(courseData.maxRequestMoreFeedbackTimeDays);
-            courseCreation.submit().then((request: Interception) => {
-                const courseBody = request.response!.body;
-                course = courseBody;
-                expect(courseBody.title).to.eq(courseData.title);
-                expect(courseBody.shortName).to.eq(courseData.shortName);
-                expect(courseBody.description).to.eq(courseData.description);
-                expect(courseBody.testCourse).to.eq(courseData.testCourse);
-                expect(trimDate(courseBody.startDate)).to.eq(trimDate(dayjsToString(courseData.startDate)));
-                expect(trimDate(courseBody.endDate)).to.eq(trimDate(dayjsToString(courseData.endDate)));
-                expect(courseBody.semester).to.eq(courseData.semester);
-                expect(courseBody.maxPoints).to.eq(courseData.maxPoints);
-                expect(courseBody.defaultProgrammingLanguage).to.eq(courseData.programmingLanguage);
-                expect(courseBody.complaintsEnabled).to.eq(courseData.enableComplaints);
-                expect(courseBody.maxComplaints).to.eq(courseData.maxComplaints);
-                expect(courseBody.maxTeamComplaints).to.eq(courseData.maxTeamComplaints);
-                expect(courseBody.maxComplaintTimeDays).to.eq(courseData.maxComplaintTimeDays);
-                expect(courseBody.requestMoreFeedbackEnabled).to.eq(courseData.enableMoreFeedback);
-                expect(courseBody.studentGroupName).to.eq(`artemis-${courseData.shortName}-students`);
-                expect(courseBody.editorGroupName).to.eq(`artemis-${courseData.shortName}-editors`);
-                expect(courseBody.instructorGroupName).to.eq(`artemis-${courseData.shortName}-instructors`);
-                expect(courseBody.teachingAssistantGroupName).to.eq(`artemis-${courseData.shortName}-tutors`);
-            });
-            courseManagement.getCourseHeaderTitle().scrollIntoView();
-            courseManagement.getCourseHeaderTitle().contains(courseData.title).should('be.visible');
-            courseManagement.getCourseHeaderDescription().contains(courseData.description);
-            courseManagement.getCourseTitle().contains(courseData.title);
-            courseManagement.getCourseShortName().contains(courseData.shortName);
-            courseManagement.getCourseStudentGroupName().contains(`artemis-${courseData.shortName}-students (0)`);
-            courseManagement.getCourseTutorGroupName().contains(`artemis-${courseData.shortName}-tutors (0)`);
-            courseManagement.getCourseEditorGroupName().contains(`artemis-${courseData.shortName}-editors (0)`);
-            courseManagement.getCourseInstructorGroupName().contains(`artemis-${courseData.shortName}-instructors (0)`);
-            courseManagement.getCourseStartDate().contains(courseData.startDate.format(dateFormat));
-            courseManagement.getCourseEndDate().contains(courseData.endDate.format(dateFormat));
-            courseManagement.getCourseSemester().contains(courseData.semester);
-            courseManagement.getCourseProgrammingLanguage().contains(courseData.programmingLanguage);
-            courseManagement.getCourseTestCourse().find(convertBooleanToCheckIconClass(courseData.testCourse)).should('exist');
-            courseManagement.getCourseMaxComplaints().contains(courseData.maxComplaints);
-            courseManagement.getCourseMaxTeamComplaints().contains(courseData.maxTeamComplaints);
-            courseManagement.getMaxComplaintTimeDays().contains(courseData.maxComplaintTimeDays);
-            courseManagement.getMaxRequestMoreFeedbackTimeDays().contains(courseData.maxRequestMoreFeedbackTimeDays);
-        });
-
-        if (allowGroupCustomization) {
-            it('Creates a new course with custom groups', () => {
-                navigationBar.openCourseManagement();
-                courseManagement.openCourseCreation();
-                courseCreation.setTitle(courseData.title);
-                courseCreation.setShortName(courseData.shortName);
-                courseCreation.setTestCourse(courseData.testCourse);
-                courseCreation.setCustomizeGroupNames(true);
-                courseCreation.setStudentGroup(courseData.studentGroupName);
-                courseCreation.setTutorGroup(courseData.tutorGroupName);
-                courseCreation.setEditorGroup(courseData.editorGroupName);
-                courseCreation.setInstructorGroup(courseData.instructorGroupName);
-                courseCreation.submit().then((request: Interception) => {
-                    const courseBody = request.response!.body;
-                    course2 = courseBody;
-                    expect(courseBody.title).to.eq(courseData.title);
-                    expect(courseBody.shortName).to.eq(courseData.shortName);
-                    expect(courseBody.testCourse).to.eq(courseData.testCourse);
-                    expect(courseBody.studentGroupName).to.eq(courseData.studentGroupName);
-                    expect(courseBody.teachingAssistantGroupName).to.eq(courseData.tutorGroupName);
-                    expect(courseBody.editorGroupName).to.eq(courseData.editorGroupName);
-                    expect(courseBody.instructorGroupName).to.eq(courseData.instructorGroupName);
-                });
-                courseManagement.getCourseHeaderTitle().scrollIntoView();
-                courseManagement.getCourseHeaderTitle().contains(courseData.title).should('be.visible');
-                courseManagement.getCourseTitle().contains(courseData.title);
-                courseManagement.getCourseShortName().contains(courseData.shortName);
-                courseManagement.getCourseTestCourse().find(convertBooleanToCheckIconClass(courseData.testCourse)).should('exist');
-                courseManagement.getCourseStudentGroupName().contains(courseData.studentGroupName);
-                courseManagement.getCourseTutorGroupName().contains(courseData.tutorGroupName);
-                courseManagement.getCourseEditorGroupName().contains(courseData.editorGroupName);
-                courseManagement.getCourseInstructorGroupName().contains(courseData.instructorGroupName);
-            });
-        }
-
-        after('Delete courses', () => {
-            courseManagementAPIRequest.deleteCourse(course, admin);
-            courseManagementAPIRequest.deleteCourse(course2, admin);
-        });
-    });
-
-    describe('Course edit', () => {
-        let course: Course;
-
-        before('Create course', () => {
-            cy.login(admin, '/');
-            const uid = generateUUID();
-            courseData.title = 'Course ' + uid;
-            courseData.shortName = 'cypress' + uid;
-            courseManagementAPIRequest.createCourse({ courseName: courseData.title, courseShortName: courseData.shortName }).then((response) => {
-                course = convertModelAfterMultiPart(response);
-            });
-        });
-
-        it('Edits a existing course', () => {
-            const uid = generateUUID();
-            editedCourseData.title = 'Course ' + uid;
-
-            navigationBar.openCourseManagement();
-            courseManagement.openCourse(course.id!);
-            courseManagement.openCourseEdit();
-
-            courseCreation.setTitle(editedCourseData.title);
-            courseCreation.setTestCourse(editedCourseData.testCourse);
-
-            courseCreation.update().then((request: Interception) => {
-                course = request.response!.body;
-                expect(course.title).to.eq(editedCourseData.title);
-                expect(course.shortName).to.eq(courseData.shortName);
-                expect(course.testCourse).to.eq(editedCourseData.testCourse);
-            });
-            courseManagement.getCourseHeaderTitle().scrollIntoView();
-            courseManagement.getCourseHeaderTitle().contains(editedCourseData.title).should('be.visible');
-            courseManagement.getCourseTitle().contains(editedCourseData.title);
-            courseManagement.getCourseShortName().contains(courseData.shortName);
-            courseManagement.getCourseTestCourse().find(convertBooleanToCheckIconClass(editedCourseData.testCourse)).should('exist');
-        });
-
-        after('Delete course', () => {
-            courseManagementAPIRequest.deleteCourse(course, admin);
-        });
-    });
-
-    describe('Course deletion', () => {
-        let course: Course;
-
-        before('Create course', () => {
-            cy.login(admin, '/');
-            courseManagementAPIRequest.createCourse().then((response) => {
-                course = convertModelAfterMultiPart(response);
-            });
-        });
-
-        it('Deletes an existing course', () => {
-            navigationBar.openCourseManagement();
-            courseManagement.openCourse(course.id!);
-            courseManagement.deleteCourse(course);
-            courseManagement.getCourse(course.id!).should('not.exist');
-        });
-    });
-
-    describe.only('Course icon deletion', () => {
-        describe('Course within icon', () => {
-            let course: Course;
-
-            before('Creates course with icon', () => {
-                cy.login(admin, '/');
-                cy.fixture('course/icon.png', 'base64')
-                    .then(Cypress.Blob.base64StringToBlob)
-                    .then((blob) => {
-                        courseManagementAPIRequest.createCourse({ iconFileName: 'icon.png', iconFile: blob }).then((response) => {
-                            course = convertModelAfterMultiPart(response);
-                        });
-                    });
-            });
-
-            it('Deletes an existing course icon', () => {
-                navigationBar.openCourseManagement();
-                courseManagement.openCourse(course.id!);
-                courseManagement.clickEditCourse();
-                courseManagement.removeIconFromCourse();
-                courseManagement.updateCourse(course).then(() => {
-                    courseManagement.clickEditCourse();
-                    courseManagement.checkCourseHasNoIcon();
-                });
-            });
-
-            after('Delete course', () => {
-                courseManagementAPIRequest.deleteCourse(course, admin);
-            });
-        });
-
-        describe('Course without icon', () => {
-            let course: Course;
-
-            before('Creates course without icon', () => {
-                cy.login(admin, '/');
-                courseManagementAPIRequest.createCourse().then((response) => {
-                    course = convertModelAfterMultiPart(response);
-                });
-            });
-
-            it('Deletes not existing course icon', () => {
-                navigationBar.openCourseManagement();
-                courseManagement.openCourse(course.id!);
-                courseManagement.clickEditCourse();
-                courseManagement.checkCourseHasNoIcon();
-            });
-
-            after('Delete courses', () => {
-                courseManagementAPIRequest.deleteCourse(course, admin);
-            });
-        });
-    });
-});
diff --git a/src/test/cypress/e2e/course/CourseMessages.cy.ts b/src/test/cypress/e2e/course/CourseMessages.cy.ts
deleted file mode 100644
index 3c156e961df5..000000000000
--- a/src/test/cypress/e2e/course/CourseMessages.cy.ts
+++ /dev/null
@@ -1,428 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { Channel } from 'app/entities/metis/conversation/channel.model';
-import { GroupChat } from 'app/entities/metis/conversation/group-chat.model';
-
-import { communicationAPIRequest, courseManagementAPIRequest, courseMessages, examAPIRequests, exerciseAPIRequest } from '../../support/artemis';
-import { admin, instructor, studentOne, studentTwo, tutor, users } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID, titleLowercase } from '../../support/utils';
-
-describe.skip('Course messages', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addStudentToCourse(course, studentTwo);
-        });
-    });
-
-    it('accepts code of conduct', () => {
-        cy.login(instructor, `/courses/${course.id}/messages`);
-        courseMessages.acceptCodeOfConductButton();
-        cy.login(studentOne, `/courses/${course.id}/messages`);
-        courseMessages.acceptCodeOfConductButton();
-        cy.login(studentTwo, `/courses/${course.id}/messages`);
-        courseMessages.acceptCodeOfConductButton();
-        cy.login(tutor, `/courses/${course.id}/messages`);
-        courseMessages.acceptCodeOfConductButton();
-    });
-
-    describe('Channel messages', () => {
-        describe('Create channel', () => {
-            it('check for pre-created channels', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                courseMessages.browseChannelsButton();
-                courseMessages.checkChannelsExists('tech-support');
-                courseMessages.checkChannelsExists('organization');
-                courseMessages.checkChannelsExists('random');
-                courseMessages.checkChannelsExists('announcement');
-            });
-
-            it('instructors should be able to create public announcement channel', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'public-ancmnt-ch';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.setDescription('A public announcement channel');
-                courseMessages.setPublic();
-                courseMessages.setAnnouncementChannel();
-                courseMessages.createChannel(true, true);
-                courseMessages.getName().contains(name);
-            });
-
-            it('instructors should be able to create private announcement channel', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'private-ancmnt-ch';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.setDescription('A private announcement channel');
-                courseMessages.setPrivate();
-                courseMessages.setAnnouncementChannel();
-                courseMessages.createChannel(true, false);
-                courseMessages.getName().contains(name);
-            });
-
-            it('instructors should be able to create public unrestricted channel', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'public-unrstct-ch';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.setDescription('A public unrestricted channel');
-                courseMessages.setPublic();
-                courseMessages.setUnrestrictedChannel();
-                courseMessages.createChannel(false, true);
-                courseMessages.getName().contains(name);
-            });
-
-            it('instructors should be able to create private unrestricted channel', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'private-unrstct-ch';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.setDescription('A public unrestricted channel');
-                courseMessages.setPrivate();
-                courseMessages.setUnrestrictedChannel();
-                courseMessages.createChannel(false, false);
-                courseMessages.getName().contains(name);
-            });
-
-            it('instructors should not be able to create channel with uppercase name', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'Forbidden Name';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.getError().contains('Names can only contain lowercase letters');
-            });
-
-            it('instructors should not be able to create channel with name longer than 30 chars', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                const name = 'way-way-way-too-long-channel-title';
-                courseMessages.createChannelButton();
-                courseMessages.setName(name);
-                courseMessages.getError().contains('Name can be max 30 characters long!');
-            });
-
-            it('check that channel is created, when a lecture is created', () => {
-                cy.login(admin);
-                courseManagementAPIRequest.createLecture(course, 'Test Lecture');
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                courseMessages.browseLectureChannelsButton();
-                courseMessages.checkChannelsExists('lecture-test-lecture');
-            });
-
-            it('check that channel is created, when an exercise is created', () => {
-                cy.login(admin);
-                exerciseAPIRequest.createTextExercise({ course }, 'Test Exercise');
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                courseMessages.browseExerciseChannelsButton();
-                courseMessages.checkChannelsExists('exercise-test-exercise');
-            });
-
-            it('check that channel is created, when an exam is created', () => {
-                cy.login(admin);
-                const examTitle = 'exam' + generateUUID();
-                examAPIRequests.createExam({ course, title: examTitle });
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                courseMessages.browseExamChannelsButton();
-                courseMessages.checkChannelsExists(titleLowercase(examTitle));
-            });
-        });
-
-        describe('Edit channel', () => {
-            let channel: Channel;
-            before('create channel', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageChannel(course, 'test-channel', 'Test Channel', true, true).then((response) => {
-                    channel = response.body;
-                    communicationAPIRequest.joinUserIntoChannel(course, channel.id!, instructor);
-                });
-            });
-
-            it('instructors should be able to edit a channel', () => {
-                cy.login(instructor, `/courses/${course.id}/messages?conversationId=${channel.id}`);
-                const newName = 'new-test-name';
-                const topic = 'test-topic';
-                courseMessages.getName().click();
-                courseMessages.editName(newName);
-                courseMessages.editTopic(topic);
-                courseMessages.editDescription('New Description');
-                courseMessages.closeEditPanel();
-                cy.reload();
-                courseMessages.getName().contains(newName);
-                courseMessages.getTopic().contains(topic);
-            });
-        });
-
-        describe('Join channel', () => {
-            let channel: Channel;
-            before('create channel', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageChannel(course, 'join-test-channel', 'Join Test Channel', true, true).then((response) => {
-                    channel = response.body;
-                });
-            });
-
-            it('student should be joined into pre-created channels automatically', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages`);
-                courseMessages.browseChannelsButton();
-                courseMessages.getChannelIdByName('tech-support').then((response) => {
-                    const techSupportChannelId = Number(response!);
-                    courseMessages.checkBadgeJoined(techSupportChannelId).should('exist').contains('Joined');
-                });
-                courseMessages.getChannelIdByName('random').then((response) => {
-                    const techSupportChannelId = Number(response!);
-                    courseMessages.checkBadgeJoined(techSupportChannelId).should('exist').contains('Joined');
-                });
-                courseMessages.getChannelIdByName('announcement').then((response) => {
-                    const techSupportChannelId = Number(response!);
-                    courseMessages.checkBadgeJoined(techSupportChannelId).should('exist').contains('Joined');
-                });
-                courseMessages.getChannelIdByName('organization').then((response) => {
-                    const techSupportChannelId = Number(response!);
-                    courseMessages.checkBadgeJoined(techSupportChannelId).should('exist').contains('Joined');
-                });
-            });
-
-            it('student should be able to join a public channel', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages`);
-                courseMessages.browseChannelsButton();
-                courseMessages.joinChannel(channel.id!);
-                courseMessages.checkBadgeJoined(channel.id!).should('exist').contains('Joined');
-            });
-
-            it('student should be able to leave a public channel', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages`);
-                courseMessages.browseChannelsButton();
-                courseMessages.leaveChannel(channel.id!);
-                courseMessages.checkBadgeJoined(channel.id!).should('not.exist');
-            });
-        });
-
-        describe('Write/edit/delete message in channel', () => {
-            let channel: Channel;
-            before('create channel', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageChannel(course, 'write-test-channel', 'Write Test Channel', false, true).then((response) => {
-                    channel = response.body;
-                    communicationAPIRequest.joinUserIntoChannel(course, channel.id!, studentOne);
-                });
-            });
-
-            it('student should be able to write message in channel', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${channel.id}`);
-                const messageText = 'Student Test Message';
-                courseMessages.writeMessage(messageText);
-                courseMessages.save().then((interception) => {
-                    const message = interception.response!.body;
-                    courseMessages.checkMessage(message.id, messageText);
-                });
-            });
-
-            it('student should be able to edit message in channel', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${channel.id}`);
-                const messageText = 'Student Edit Test Message';
-                communicationAPIRequest.createCourseMessage(course, channel.id!, 'channel', messageText).then((response) => {
-                    const message = response.body;
-                    const newMessage = 'Edited Text';
-                    courseMessages.editMessage(message.id, newMessage);
-                    courseMessages.checkMessage(message.id, newMessage);
-                    courseMessages.getSinglePost(message.id).find('.edited-text').should('exist');
-                });
-            });
-
-            it('student should be able to delete message in channel', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${channel.id}`);
-                const messageText = 'Student Edit Test Message';
-                communicationAPIRequest.createCourseMessage(course, channel.id!, 'channel', messageText).then((response) => {
-                    const message = response.body;
-                    courseMessages.checkMessage(message.id, messageText);
-                    courseMessages.deleteMessage(message.id);
-                    courseMessages.getSinglePost(message.id).should('not.exist');
-                });
-            });
-        });
-    });
-
-    describe('Group chats', () => {
-        let instructorName: string;
-        let tutorName: string;
-        let studentOneName: string;
-        let studentTwoName: string;
-
-        before('Get usernames', () => {
-            cy.login(admin);
-            users.getUserInfo(instructor.username, (userInfo) => {
-                instructorName = userInfo.name;
-            });
-            users.getUserInfo(tutor.username, (userInfo) => {
-                tutorName = userInfo.name;
-            });
-            users.getUserInfo(studentOne.username, (userInfo) => {
-                studentOneName = userInfo.name;
-            });
-            users.getUserInfo(studentTwo.username, (userInfo) => {
-                studentTwoName = userInfo.name;
-            });
-        });
-
-        describe('Create group chat', () => {
-            it('instructors should be able to create group chat', () => {
-                cy.login(instructor, `/courses/${course.id}/messages`);
-                courseMessages.createGroupChatButton();
-                courseMessages.addUserToGroupChat(studentOne.username);
-                courseMessages.addUserToGroupChat(studentTwo.username);
-                courseMessages.createGroupChat().then((interception) => {
-                    const group = interception.response!.body;
-                    courseMessages.listMembersButton(course.id!, group.id);
-                    courseMessages.checkMemberList(studentOneName);
-                    courseMessages.checkMemberList(studentTwoName);
-                    courseMessages.closeEditPanel();
-                });
-            });
-
-            it('tutor should be able to create group chat', () => {
-                cy.login(tutor, `/courses/${course.id}/messages`);
-                courseMessages.createGroupChatButton();
-                courseMessages.addUserToGroupChat(studentOne.username);
-                courseMessages.addUserToGroupChat(instructor.username);
-                courseMessages.createGroupChat().then((interception) => {
-                    const group = interception.response!.body;
-                    courseMessages.listMembersButton(course.id!, group.id);
-                    courseMessages.checkMemberList(studentOneName);
-                    courseMessages.checkMemberList(instructorName);
-                    courseMessages.closeEditPanel();
-                });
-            });
-
-            it('student should be able to create group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages`);
-                courseMessages.createGroupChatButton();
-                courseMessages.addUserToGroupChat(studentTwo.username);
-                courseMessages.addUserToGroupChat(tutor.username);
-                courseMessages.createGroupChat().then((interception) => {
-                    const group = interception.response!.body;
-                    courseMessages.listMembersButton(course.id!, group.id);
-                    courseMessages.checkMemberList(studentTwoName);
-                    courseMessages.checkMemberList(tutorName);
-                    courseMessages.closeEditPanel();
-                });
-            });
-        });
-
-        describe('Add to group chat', () => {
-            let groupChat: GroupChat;
-            before('create group chat', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageGroupChat(course, [studentOne.username, tutor.username]).then((response) => {
-                    groupChat = response.body;
-                });
-            });
-
-            it('tutor should be able to add user to group chat', () => {
-                cy.login(tutor, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                courseMessages.addUserToGroupChatButton();
-                courseMessages.addUserToGroupChat(instructor.username);
-                courseMessages.updateGroupChat();
-
-                courseMessages.listMembersButton(course.id!, groupChat.id!);
-                courseMessages.checkMemberList(instructorName);
-                courseMessages.closeEditPanel();
-            });
-
-            it('student should be able to add user to group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                courseMessages.addUserToGroupChatButton();
-                courseMessages.addUserToGroupChat(studentTwo.username);
-                courseMessages.updateGroupChat();
-
-                courseMessages.listMembersButton(course.id!, groupChat.id!);
-                courseMessages.checkMemberList(studentTwoName);
-                courseMessages.closeEditPanel();
-            });
-        });
-
-        describe('Leave group chat', () => {
-            let groupChat: GroupChat;
-            const groupChatName = 'leave-test';
-
-            before('create group chat', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageGroupChat(course, [studentOne.username, tutor.username]).then((response) => {
-                    groupChat = response.body;
-                    communicationAPIRequest.updateCourseMessageGroupChatName(course, groupChat, groupChatName);
-                });
-            });
-
-            it('tutor should be able to leave group chat', () => {
-                cy.login(tutor, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                courseMessages.checkGroupChatExists(groupChatName, true);
-                courseMessages.listMembersButton(course.id!, groupChat.id!);
-                courseMessages.openSettingsTab();
-                courseMessages.leaveGroupChat();
-                cy.visit(`/courses/${course.id}/messages`);
-                courseMessages.checkGroupChatExists(groupChatName, false);
-            });
-
-            it('student should be able to leave group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                courseMessages.checkGroupChatExists(groupChatName, true);
-                courseMessages.listMembersButton(course.id!, groupChat.id!);
-                courseMessages.openSettingsTab();
-                courseMessages.leaveGroupChat();
-                cy.visit(`/courses/${course.id}/messages`);
-                courseMessages.checkGroupChatExists(groupChatName, false);
-            });
-        });
-
-        describe('Write/edit/delete message in group chat', () => {
-            let groupChat: GroupChat;
-            before('create group chat', () => {
-                cy.login(admin);
-                communicationAPIRequest.createCourseMessageGroupChat(course, [studentOne.username, tutor.username]).then((response) => {
-                    groupChat = response.body;
-                });
-            });
-
-            it('student should be able to write message in group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                const messageText = 'Student Test Message';
-                courseMessages.writeMessage(messageText);
-                courseMessages.save(true).then((interception) => {
-                    const message = interception.response!.body;
-                    courseMessages.checkMessage(message.id, messageText);
-                });
-            });
-
-            it('student should be able to edit message in group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                const messageText = 'Student Edit Test Message';
-                communicationAPIRequest.createCourseMessage(course, groupChat.id!, 'groupChat', messageText).then((response) => {
-                    const message = response.body;
-                    const newMessage = 'Edited Text';
-                    courseMessages.editMessage(message.id, newMessage);
-                    courseMessages.checkMessage(message.id, newMessage);
-                    courseMessages.getSinglePost(message.id).find('.edited-text').should('exist');
-                });
-            });
-
-            it('student should be able to delete message in group chat', () => {
-                cy.login(studentOne, `/courses/${course.id}/messages?conversationId=${groupChat.id}`);
-                const messageText = 'Student Edit Test Message';
-                communicationAPIRequest.createCourseMessage(course, groupChat.id!, 'groupChat', messageText).then((response) => {
-                    const message = response.body;
-                    courseMessages.checkMessage(message.id, messageText);
-                    courseMessages.deleteMessage(message.id);
-                    courseMessages.getSinglePost(message.id).should('not.exist');
-                });
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/ExamAssessment.cy.ts b/src/test/cypress/e2e/exam/ExamAssessment.cy.ts
deleted file mode 100644
index 37c6a20822bc..000000000000
--- a/src/test/cypress/e2e/exam/ExamAssessment.cy.ts
+++ /dev/null
@@ -1,255 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs, { Dayjs } from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import javaPartiallySuccessful from '../../fixtures/exercise/programming/java/partially_successful/submission.json';
-import {
-    courseAssessment,
-    courseManagementAPIRequest,
-    examAPIRequests,
-    examAssessment,
-    examExerciseGroupCreation,
-    examManagement,
-    examNavigation,
-    examParticipation,
-    examStartEnd,
-    exerciseAssessment,
-    modelingExerciseAssessment,
-    studentAssessment,
-} from '../../support/artemis';
-import { Exercise, ExerciseType, ProgrammingExerciseAssessmentType } from '../../support/constants';
-import { admin, instructor, studentOne, tutor, users } from '../../support/users';
-import { convertModelAfterMultiPart } from '../../support/utils';
-
-let exam: Exam;
-
-describe('Exam assessment', () => {
-    let course: Course;
-    let examEnd: Dayjs;
-    let programmingAssessmentSuccessful = false;
-    let modelingAssessmentSuccessful = false;
-    let textAssessmentSuccessful = false;
-    let studentOneName: string;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-        });
-        users.getUserInfo(studentOne.username, (userInfo) => {
-            studentOneName = userInfo.name;
-        });
-    });
-
-    // For some reason the typing of cypress gets slower the longer the test runs, so we test the programming exercise first
-    describe('Programming exercise assessment', () => {
-        before('Prepare exam', () => {
-            examEnd = dayjs().add(2, 'minutes');
-            prepareExam(course, examEnd, ExerciseType.PROGRAMMING);
-        });
-
-        it('Assess a programming exercise submission (MANUAL)', () => {
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentOneName);
-            cy.login(tutor);
-            startAssessing(course.id!, exam.id!, 175000);
-            examAssessment.addNewFeedback(2, 'Good job');
-            examAssessment.submit();
-            cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-            examParticipation.getResultScore().should('contain.text', '66.2%').and('be.visible');
-            programmingAssessmentSuccessful = true;
-        });
-
-        it('Complaints about programming exercises assessment', () => {
-            if (programmingAssessmentSuccessful) {
-                handleComplaint(course, exam, false, ExerciseType.PROGRAMMING);
-            }
-        });
-    });
-
-    describe('Modeling exercise assessment', () => {
-        before('Prepare exam', () => {
-            examEnd = dayjs().add(45, 'seconds');
-            prepareExam(course, examEnd, ExerciseType.MODELING);
-        });
-
-        it('Assess a modeling exercise submission', () => {
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentOneName);
-            cy.login(tutor);
-            startAssessing(course.id!, exam.id!, 60000);
-            modelingExerciseAssessment.addNewFeedback(5, 'Good');
-            modelingExerciseAssessment.openAssessmentForComponent(1);
-            modelingExerciseAssessment.assessComponent(-1, 'Wrong');
-            modelingExerciseAssessment.clickNextAssessment();
-            modelingExerciseAssessment.assessComponent(0, 'Neutral');
-            modelingExerciseAssessment.clickNextAssessment();
-            examAssessment.submitModelingAssessment().then((assessmentResponse: Interception) => {
-                expect(assessmentResponse.response?.statusCode).to.equal(200);
-            });
-            cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-            examParticipation.getResultScore().should('contain.text', '40%').and('be.visible');
-            modelingAssessmentSuccessful = true;
-        });
-
-        it('Complaints about modeling exercises assessment', () => {
-            if (modelingAssessmentSuccessful) {
-                handleComplaint(course, exam, true, ExerciseType.MODELING);
-            }
-        });
-    });
-
-    describe('Text exercise assessment', () => {
-        before('Prepare exam', () => {
-            examEnd = dayjs().add(40, 'seconds');
-            prepareExam(course, examEnd, ExerciseType.TEXT);
-        });
-
-        it('Assess a text exercise submission', () => {
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentOneName);
-            cy.login(tutor);
-            startAssessing(course.id!, exam.id!, 60000);
-            examAssessment.addNewFeedback(7, 'Good job');
-            examAssessment.submitTextAssessment().then((assessmentResponse: Interception) => {
-                expect(assessmentResponse.response!.statusCode).to.equal(200);
-            });
-            cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-            examParticipation.getResultScore().should('contain.text', '70%').and('be.visible');
-            textAssessmentSuccessful = true;
-        });
-
-        it('Complaints about text exercises assessment', () => {
-            if (textAssessmentSuccessful) {
-                handleComplaint(course, exam, false, ExerciseType.TEXT);
-            }
-        });
-    });
-
-    describe.only('Quiz exercise assessment', () => {
-        let resultDate: Dayjs;
-
-        before('Prepare exam', () => {
-            examEnd = dayjs().add(30, 'seconds');
-            resultDate = examEnd.add(5, 'seconds');
-            prepareExam(course, examEnd, ExerciseType.QUIZ);
-        });
-
-        it.skip('Assesses quiz automatically', () => {
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentOneName);
-            if (dayjs().isBefore(examEnd)) {
-                cy.wait(examEnd.diff(dayjs(), 'ms') + 1000);
-            }
-            examManagement.openAssessmentDashboard(course.id!, exam.id!, 60000);
-            cy.visit(`/course-management/${course.id}/exams/${exam.id}/assessment-dashboard`);
-            courseAssessment.clickEvaluateQuizzes().its('response.statusCode').should('eq', 200);
-            if (dayjs().isBefore(resultDate)) {
-                cy.wait(resultDate.diff(dayjs(), 'ms') + 1000);
-            }
-            examManagement.checkQuizSubmission(course.id!, exam.id!, studentOneName, '50%');
-            cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-            examParticipation.getResultScore().should('contain.text', '50%').and('be.visible');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
-
-function prepareExam(course: Course, end: dayjs.Dayjs, exerciseType: ExerciseType) {
-    cy.login(admin);
-    const resultDate = end.add(1, 'second');
-    const examConfig: Exam = {
-        course,
-        startDate: dayjs(),
-        endDate: end,
-        numberOfCorrectionRoundsInExam: 1,
-        examStudentReviewStart: resultDate,
-        examStudentReviewEnd: resultDate.add(1, 'minute'),
-        publishResultsDate: resultDate,
-        gracePeriod: 10,
-    };
-    examAPIRequests.createExam(examConfig).then((examResponse) => {
-        exam = examResponse.body;
-        examAPIRequests.registerStudentForExam(exam, studentOne);
-        let additionalData = {};
-        switch (exerciseType) {
-            case ExerciseType.PROGRAMMING:
-                additionalData = { submission: javaPartiallySuccessful, progExerciseAssessmentType: ProgrammingExerciseAssessmentType.SEMI_AUTOMATIC };
-                break;
-            case ExerciseType.TEXT:
-                additionalData = { textFixture: 'loremIpsum-short.txt' };
-                break;
-            case ExerciseType.QUIZ:
-                additionalData = { quizExerciseID: 0 };
-                break;
-        }
-
-        examExerciseGroupCreation.addGroupWithExercise(exam, exerciseType, additionalData).then((response) => {
-            examAPIRequests.generateMissingIndividualExams(exam);
-            examAPIRequests.prepareExerciseStartForExam(exam);
-            makeExamSubmission(course, exam, response);
-        });
-    });
-}
-
-function makeExamSubmission(course: Course, exam: Exam, exercise: Exercise) {
-    examParticipation.startParticipation(studentOne, course, exam);
-    examNavigation.openExerciseAtIndex(0);
-    examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-    cy.wait(2000);
-    examNavigation.handInEarly();
-    examStartEnd.finishExam();
-}
-
-function startAssessing(courseID: number, examID: number, timeout: number) {
-    examManagement.openAssessmentDashboard(courseID, examID, timeout);
-    courseAssessment.clickExerciseDashboardButton();
-    exerciseAssessment.clickHaveReadInstructionsButton();
-    exerciseAssessment.clickStartNewAssessment();
-    exerciseAssessment.getLockedMessage();
-}
-
-function handleComplaint(course: Course, exam: Exam, reject: boolean, exerciseType: ExerciseType) {
-    const complaintText = 'Lorem ipsum dolor sit amet';
-    const complaintResponseText = ' consetetur sadipscing elitr';
-
-    cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-    studentAssessment.startComplaint();
-    studentAssessment.enterComplaint(complaintText);
-    studentAssessment.submitComplaint();
-    cy.get('.message').should('contain.text', 'Your complaint has been submitted');
-
-    cy.login(instructor, '/course-management/' + course.id + '/exams');
-    examManagement.openAssessmentDashboard(course.id!, exam.id!);
-    courseAssessment.clickExerciseDashboardButton();
-    exerciseAssessment.clickHaveReadInstructionsButton();
-
-    exerciseAssessment.clickEvaluateComplaint();
-    exerciseAssessment.getComplaintText().should('have.value', complaintText);
-    if (reject) {
-        examAssessment.rejectComplaint(complaintResponseText, true, exerciseType);
-    } else {
-        examAssessment.acceptComplaint(complaintResponseText, true, exerciseType);
-    }
-    if (exerciseType == ExerciseType.MODELING) {
-        cy.get('.message').should('contain.text', 'Response to complaint has been submitted');
-    } else {
-        cy.get('.message').should('contain.text', 'The assessment was updated successfully.');
-    }
-
-    cy.login(studentOne, '/courses/' + course.id + '/exams/' + exam.id);
-    if (reject) {
-        studentAssessment.getComplaintBadge().should('contain.text', 'Complaint was rejected');
-    } else {
-        studentAssessment.getComplaintBadge().should('contain.text', 'Complaint was accepted');
-    }
-    studentAssessment.getComplaintResponse().should('have.value', complaintResponseText);
-}
diff --git a/src/test/cypress/e2e/exam/ExamCreationDeletion.cy.ts b/src/test/cypress/e2e/exam/ExamCreationDeletion.cy.ts
deleted file mode 100644
index 9622cfd6fce4..000000000000
--- a/src/test/cypress/e2e/exam/ExamCreationDeletion.cy.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import { courseManagement, courseManagementAPIRequest, examAPIRequests, examCreation, examDetails, examManagement, navigationBar } from '../../support/artemis';
-import { admin } from '../../support/users';
-import { convertModelAfterMultiPart, dayjsToString, generateUUID, trimDate } from '../../support/utils';
-
-// Common primitives
-const examData = {
-    title: 'exam' + generateUUID(),
-    visibleDate: dayjs(),
-    startDate: dayjs().add(1, 'day'),
-    endDate: dayjs().add(2, 'day'),
-    numberOfExercisesInExam: 4,
-    examMaxPoints: 40,
-    startText: 'Exam start text',
-    endText: 'Exam end text',
-    confirmationStartText: 'Exam confirmation start text',
-    confirmationEndText: 'Exam confirmation end text',
-};
-
-const editedExamData = {
-    title: 'exam' + generateUUID(),
-    visibleDate: dayjs(),
-    startDate: dayjs().add(2, 'day'),
-    endDate: dayjs().add(4, 'day'),
-    numberOfExercisesInExam: 3,
-    examMaxPoints: 30,
-    startText: 'Edited exam start text',
-    endText: 'Edited exam end text',
-    confirmationStartText: 'Edited exam confirmation start text',
-    confirmationEndText: 'Edited exam confirmation end text',
-};
-
-const dateFormat = 'MMM D, YYYY HH:mm';
-
-describe.skip('Exam creation/deletion', () => {
-    let course: Course;
-    let examId: number;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    beforeEach(() => {
-        cy.login(admin, '/');
-    });
-
-    it('Creates an exam', () => {
-        navigationBar.openCourseManagement();
-        courseManagement.openExamsOfCourse(course.id!);
-
-        examManagement.createNewExam();
-        examCreation.setTitle(examData.title);
-        examCreation.setVisibleDate(examData.visibleDate);
-        examCreation.setStartDate(examData.startDate);
-        examCreation.setEndDate(examData.endDate);
-        examCreation.setNumberOfExercises(examData.numberOfExercisesInExam);
-        examCreation.setExamMaxPoints(examData.examMaxPoints);
-
-        examCreation.setStartText(examData.startText);
-        examCreation.setEndText(examData.endText);
-        examCreation.setConfirmationStartText(examData.confirmationStartText);
-        examCreation.setConfirmationEndText(examData.confirmationEndText);
-        examCreation.submit().then((examResponse: Interception) => {
-            const examBody = examResponse.response!.body;
-            examId = examBody.id;
-            expect(examResponse.response!.statusCode).to.eq(201);
-            expect(examBody.testExam).to.be.false;
-            expect(trimDate(examBody.visibleDate)).to.eq(trimDate(dayjsToString(examData.visibleDate)));
-            expect(trimDate(examBody.startDate)).to.eq(trimDate(dayjsToString(examData.startDate)));
-            expect(trimDate(examBody.endDate)).to.eq(trimDate(dayjsToString(examData.endDate)));
-            expect(examBody.numberOfExercisesInExam).to.eq(examData.numberOfExercisesInExam);
-            expect(examBody.examMaxPoints).to.eq(examData.examMaxPoints);
-            expect(examBody.startText).to.eq(examData.startText);
-            expect(examBody.endText).to.eq(examData.endText);
-            expect(examBody.confirmationStartText).to.eq(examData.confirmationStartText);
-            expect(examBody.confirmationEndText).to.eq(examData.confirmationEndText);
-            cy.url().should('contain', `/exams/${examId}`);
-        });
-        examManagement.getExamTitle().contains(examData.title);
-        examManagement.getExamVisibleDate().contains(examData.visibleDate.format(dateFormat));
-        examManagement.getExamStartDate().contains(examData.startDate.format(dateFormat));
-        examManagement.getExamEndDate().contains(examData.endDate.format(dateFormat));
-        examManagement.getExamNumberOfExercises().contains(examData.numberOfExercisesInExam);
-        examManagement.getExamMaxPoints().contains(examData.examMaxPoints);
-        examManagement.getExamStartText().contains(examData.startText);
-        examManagement.getExamEndText().contains(examData.endText);
-        examManagement.getExamConfirmationStartText().contains(examData.confirmationStartText);
-        examManagement.getExamConfirmationEndText().contains(examData.confirmationEndText);
-        examManagement.getExamWorkingTime().contains('1d 0h');
-    });
-
-    describe('Exam deletion', () => {
-        before('Create exam', () => {
-            examData.title = 'exam' + generateUUID();
-            const examConfig: Exam = {
-                course,
-                title: examData.title,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                examId = examResponse.body.id!;
-            });
-        });
-
-        it('Deletes an existing exam', () => {
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExam(examId);
-            examDetails.deleteExam(examData.title);
-            examManagement.getExamSelector(examData.title).should('not.exist');
-        });
-    });
-
-    describe('Edits an exam', () => {
-        before('Create exam', () => {
-            examData.title = 'exam' + generateUUID();
-            const examConfig: Exam = {
-                course,
-                title: examData.title,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                examId = examResponse.body.id!;
-            });
-        });
-
-        it('Edits an existing exam', () => {
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExam(examId);
-            examManagement.getExamTitle().contains(examData.title);
-            examManagement.clickEdit();
-
-            examCreation.setTitle(editedExamData.title);
-            examCreation.setVisibleDate(editedExamData.visibleDate);
-            examCreation.setStartDate(editedExamData.startDate);
-            examCreation.setEndDate(editedExamData.endDate);
-            examCreation.setNumberOfExercises(editedExamData.numberOfExercisesInExam);
-            examCreation.setExamMaxPoints(editedExamData.examMaxPoints);
-
-            examCreation.setStartText(editedExamData.startText);
-            examCreation.setEndText(editedExamData.endText);
-            examCreation.setConfirmationStartText(editedExamData.confirmationStartText);
-            examCreation.setConfirmationEndText(editedExamData.confirmationEndText);
-            examCreation.update().then((examResponse: Interception) => {
-                const examBody = examResponse.response!.body;
-                examId = examBody.id;
-                expect(examResponse.response!.statusCode).to.eq(200);
-                expect(examBody.testExam).to.be.false;
-                expect(trimDate(examBody.visibleDate)).to.eq(trimDate(dayjsToString(editedExamData.visibleDate)));
-                expect(trimDate(examBody.startDate)).to.eq(trimDate(dayjsToString(editedExamData.startDate)));
-                expect(trimDate(examBody.endDate)).to.eq(trimDate(dayjsToString(editedExamData.endDate)));
-                expect(examBody.numberOfExercisesInExam).to.eq(editedExamData.numberOfExercisesInExam);
-                expect(examBody.examMaxPoints).to.eq(editedExamData.examMaxPoints);
-                expect(examBody.startText).to.eq(editedExamData.startText);
-                expect(examBody.endText).to.eq(editedExamData.endText);
-                expect(examBody.confirmationStartText).to.eq(editedExamData.confirmationStartText);
-                expect(examBody.confirmationEndText).to.eq(editedExamData.confirmationEndText);
-                cy.url().should('contain', `/exams/${examId}`);
-            });
-            examManagement.getExamTitle().contains(editedExamData.title);
-            examManagement.getExamVisibleDate().contains(editedExamData.visibleDate.format(dateFormat));
-            examManagement.getExamStartDate().contains(editedExamData.startDate.format(dateFormat));
-            examManagement.getExamEndDate().contains(editedExamData.endDate.format(dateFormat));
-            examManagement.getExamNumberOfExercises().contains(editedExamData.numberOfExercisesInExam);
-            examManagement.getExamMaxPoints().contains(editedExamData.examMaxPoints);
-            examManagement.getExamStartText().contains(editedExamData.startText);
-            examManagement.getExamEndText().contains(editedExamData.endText);
-            examManagement.getExamConfirmationStartText().contains(editedExamData.confirmationStartText);
-            examManagement.getExamConfirmationEndText().contains(editedExamData.confirmationEndText);
-            examManagement.getExamWorkingTime().contains('2d 0h');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/ExamDateVerification.cy.ts b/src/test/cypress/e2e/exam/ExamDateVerification.cy.ts
deleted file mode 100644
index f6cc2ee0bdea..000000000000
--- a/src/test/cypress/e2e/exam/ExamDateVerification.cy.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-
-import {
-    courseManagementAPIRequest,
-    courseOverview,
-    examAPIRequests,
-    examNavigation,
-    examParticipation,
-    examStartEnd,
-    exerciseAPIRequest,
-    textExerciseEditor,
-} from '../../support/artemis';
-import { admin, studentOne } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-describe.skip('Exam date verification', () => {
-    let course: Course;
-    let examTitle: string;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-        });
-    });
-
-    beforeEach(() => {
-        examTitle = 'exam' + generateUUID();
-        cy.login(admin, '/');
-    });
-
-    describe('Exam timing', () => {
-        let exam: Exam;
-        it('Does not show exam before visible date', () => {
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().add(1, 'day'),
-                startDate: dayjs().add(2, 'days'),
-                endDate: dayjs().add(3, 'days'),
-            };
-            examAPIRequests.createExam(examConfig).then((response) => {
-                exam = response.body;
-            });
-            cy.login(studentOne, `/courses`);
-            cy.contains(examTitle).should('not.exist');
-            cy.visit(`/courses/${course.id}`);
-            cy.url().should('contain', `${course.id}`);
-            cy.contains(examTitle).should('not.exist');
-        });
-
-        it('Shows after visible date', () => {
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(5, 'days'),
-                startDate: dayjs().add(2, 'days'),
-                endDate: dayjs().add(3, 'days'),
-            };
-            examAPIRequests.createExam(examConfig).then((response) => {
-                exam = response.body;
-                examAPIRequests.registerStudentForExam(exam, studentOne);
-                cy.login(studentOne, `/courses/${course.id}`);
-                cy.url().should('contain', `${course.id}`);
-                courseOverview.openExamsTab();
-                courseOverview.openExam(exam.id!);
-                cy.url({ timeout: 40000 }).should('contain', `/exams/${exam.id}`);
-            });
-        });
-
-        it('Student can start after start Date', () => {
-            let exerciseGroup: ExerciseGroup;
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'days'),
-                startDate: dayjs().subtract(2, 'days'),
-                endDate: dayjs().add(3, 'days'),
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examAPIRequests.registerStudentForExam(exam, studentOne);
-                examAPIRequests.addExerciseGroupForExam(exam).then((groupResponse) => {
-                    exerciseGroup = groupResponse.body;
-                    exerciseAPIRequest.createTextExercise({ exerciseGroup }).then((exerciseResponse) => {
-                        const exercise = exerciseResponse.body;
-                        examAPIRequests.generateMissingIndividualExams(exam);
-                        examAPIRequests.prepareExerciseStartForExam(exam);
-                        cy.login(studentOne, `/courses/${course.id}/exams`);
-                        courseOverview.openExam(exam.id!);
-                        cy.url().should('contain', `/exams/${exam.id}`);
-                        cy.contains(exam.title!).should('be.visible');
-                        examStartEnd.startExam();
-                        examNavigation.openExerciseAtIndex(0);
-                        cy.fixture('loremIpsum-short.txt').then((submission) => {
-                            textExerciseEditor.typeSubmission(exercise.id!, submission);
-                        });
-                        examNavigation.clickSave();
-                    });
-                });
-            });
-        });
-
-        it('Exam ends after end time', () => {
-            let exerciseGroup: ExerciseGroup;
-            const examEnd = dayjs().add(30, 'seconds');
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'days'),
-                startDate: dayjs().subtract(2, 'days'),
-                endDate: examEnd,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examAPIRequests.registerStudentForExam(exam, studentOne);
-                examAPIRequests.addExerciseGroupForExam(exam).then((groupResponse) => {
-                    exerciseGroup = groupResponse.body;
-                    exerciseAPIRequest.createTextExercise({ exerciseGroup }).then((exerciseResponse) => {
-                        const exercise = exerciseResponse.body;
-                        examAPIRequests.generateMissingIndividualExams(exam);
-                        examAPIRequests.prepareExerciseStartForExam(exam);
-                        cy.login(studentOne, `/courses/${course.id}/exams`);
-                        courseOverview.openExam(exam.id!);
-                        cy.contains(exam.title!).should('be.visible');
-                        examStartEnd.startExam();
-                        examNavigation.openExerciseAtIndex(0);
-                        cy.fixture('loremIpsum-short.txt').then((submissionText) => {
-                            textExerciseEditor.typeSubmission(exercise.id!, submissionText);
-                        });
-                        examNavigation.clickSave();
-                        if (examEnd.isAfter(dayjs())) {
-                            cy.wait(examEnd.diff(dayjs()));
-                        }
-                        examParticipation.checkExamFinishedTitle(exam.title!);
-                        examStartEnd.finishExam();
-                    });
-                });
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/ExamManagement.cy.ts b/src/test/cypress/e2e/exam/ExamManagement.cy.ts
deleted file mode 100644
index f86fa782374e..000000000000
--- a/src/test/cypress/e2e/exam/ExamManagement.cy.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-
-import {
-    courseManagement,
-    courseManagementAPIRequest,
-    examAPIRequests,
-    examExerciseGroupCreation,
-    examExerciseGroups,
-    examManagement,
-    modelingExerciseCreation,
-    navigationBar,
-    programmingExerciseCreation,
-    quizExerciseCreation,
-    studentExamManagement,
-    textExerciseCreation,
-} from '../../support/artemis';
-import { admin, instructor, studentOne } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-describe.skip('Exam management', () => {
-    let course: Course;
-    let exam: Exam;
-    let createdGroup: ExerciseGroup;
-    let groupCount = 0;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            const examConfig: Exam = {
-                course,
-                title: 'Exam ' + generateUUID(),
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-            });
-        });
-    });
-
-    describe('Manage Group', () => {
-        let exerciseGroup: ExerciseGroup;
-
-        before(() => {
-            cy.login(instructor);
-            examAPIRequests.addExerciseGroupForExam(exam).then((response) => {
-                exerciseGroup = response.body;
-                groupCount++;
-            });
-        });
-
-        beforeEach(() => {
-            cy.login(instructor);
-        });
-
-        it('Create exercise group', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.shouldShowNumberOfExerciseGroups(groupCount);
-            examExerciseGroups.clickAddExerciseGroup();
-            const groupName = 'Group 1';
-            examExerciseGroupCreation.typeTitle(groupName);
-            examExerciseGroupCreation.isMandatoryBoxShouldBeChecked();
-            examExerciseGroupCreation.clickSave().then((interception) => {
-                const group = interception.response!.body;
-                groupCount++;
-                examExerciseGroups.shouldHaveTitle(group.id, groupName);
-                examExerciseGroups.shouldShowNumberOfExerciseGroups(groupCount);
-                createdGroup = group;
-            });
-        });
-
-        it('Adds a text exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddTextExercise(exerciseGroup.id!);
-            const textExerciseTitle = 'Text ' + generateUUID();
-            textExerciseCreation.typeTitle(textExerciseTitle);
-            textExerciseCreation.typeMaxPoints(10);
-            textExerciseCreation.create().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, textExerciseTitle);
-        });
-
-        it('Adds a quiz exercise', () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddQuizExercise(exerciseGroup.id!);
-            const quizExerciseTitle = 'Quiz ' + generateUUID();
-            quizExerciseCreation.setTitle(quizExerciseTitle);
-            quizExerciseCreation.addMultipleChoiceQuestion(quizExerciseTitle, 10);
-            quizExerciseCreation.saveQuiz().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, quizExerciseTitle);
-        });
-
-        it('Adds a modeling exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddModelingExercise(exerciseGroup.id!);
-            const modelingExerciseTitle = 'Modeling ' + generateUUID();
-            modelingExerciseCreation.setTitle(modelingExerciseTitle);
-            modelingExerciseCreation.setPoints(10);
-            modelingExerciseCreation.save().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, modelingExerciseTitle);
-        });
-
-        it('Adds a programming exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddProgrammingExercise(exerciseGroup.id!);
-            const uid = generateUUID();
-            const programmingExerciseTitle = 'Programming ' + uid;
-            const programmingExerciseShortName = 'programming' + uid;
-            programmingExerciseCreation.setTitle(programmingExerciseTitle);
-            programmingExerciseCreation.setShortName(programmingExerciseShortName);
-            programmingExerciseCreation.setPackageName('de.test');
-            programmingExerciseCreation.setPoints(10);
-            programmingExerciseCreation.generate().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, programmingExerciseTitle);
-        });
-
-        it('Edits an exercise group', () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.shouldHaveTitle(exerciseGroup.id!, exerciseGroup.title!);
-            examExerciseGroups.clickEditGroup(exerciseGroup.id!);
-            const newGroupName = 'Group 3';
-            examExerciseGroupCreation.typeTitle(newGroupName);
-            examExerciseGroupCreation.update();
-            examExerciseGroups.shouldHaveTitle(exerciseGroup.id!, newGroupName);
-            exerciseGroup.title = newGroupName;
-        });
-
-        it('Delete an exercise group', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExerciseGroups(exam.id!);
-            // If the group in the "Create group test" was created successfully, we delete it so there is no group with no exercise
-            let group = exerciseGroup;
-            if (createdGroup) {
-                group = createdGroup;
-            }
-            examExerciseGroups.clickDeleteGroup(group.id!, group.title!);
-            examExerciseGroups.shouldNotExist(group.id!);
-        });
-    });
-
-    describe('Manage Students', () => {
-        beforeEach(() => {
-            cy.login(instructor);
-        });
-
-        it('Registers the course students for the exam', () => {
-            // We already verified in the previous test that we can navigate here
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openStudentRegistration(exam.id!);
-            studentExamManagement.clickRegisterCourseStudents().then((request: Interception) => {
-                expect(request.response!.statusCode).to.eq(200);
-            });
-            studentExamManagement.getRegisteredStudents().contains(studentOne.username).should('be.visible');
-        });
-
-        it('Generates student exams', () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openStudentExams(exam.id!);
-            studentExamManagement.clickGenerateStudentExams();
-            studentExamManagement.getGenerateStudentExamsButton().should('be.disabled');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/ExamParticipation.cy.ts b/src/test/cypress/e2e/exam/ExamParticipation.cy.ts
deleted file mode 100644
index a0c047580ada..000000000000
--- a/src/test/cypress/e2e/exam/ExamParticipation.cy.ts
+++ /dev/null
@@ -1,305 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import javaAllSuccessfulSubmission from '../../fixtures/exercise/programming/java/all_successful/submission.json';
-import {
-    courseManagementAPIRequest,
-    examAPIRequests,
-    examExerciseGroupCreation,
-    examManagement,
-    examNavigation,
-    examParticipation,
-    examStartEnd,
-    textExerciseEditor,
-} from '../../support/artemis';
-import { Exercise, ExerciseType } from '../../support/constants';
-import { admin, instructor, studentFour, studentThree, studentTwo, tutor, users } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-// Common primitives
-const textFixture = 'loremIpsum.txt';
-const textFixtureShort = 'loremIpsum-short.txt';
-
-describe.skip('Exam participation', () => {
-    let course: Course;
-    let exerciseArray: Array<Exercise> = [];
-    let studentTwoName: string;
-    let studentThreeName: string;
-    let studentFourName: string;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentTwo);
-            courseManagementAPIRequest.addStudentToCourse(course, studentThree);
-            courseManagementAPIRequest.addStudentToCourse(course, studentFour);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-        });
-        users.getUserInfo(studentTwo.username, (userInfo) => {
-            studentTwoName = userInfo.name;
-        });
-        users.getUserInfo(studentThree.username, (userInfo) => {
-            studentThreeName = userInfo.name;
-        });
-        users.getUserInfo(studentFour.username, (userInfo) => {
-            studentFourName = userInfo.name;
-        });
-    });
-
-    describe('Early Hand-in', () => {
-        let exam: Exam;
-        const examTitle = 'exam' + generateUUID();
-
-        before('Create exam', () => {
-            cy.login(admin);
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'minutes'),
-                startDate: dayjs().subtract(2, 'minutes'),
-                endDate: dayjs().add(1, 'hour'),
-                examMaxPoints: 40,
-                numberOfExercisesInExam: 4,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                Promise.all([
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.PROGRAMMING, { submission: javaAllSuccessfulSubmission }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.QUIZ, { quizExerciseID: 0 }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.MODELING),
-                ]).then((responses) => {
-                    exerciseArray = exerciseArray.concat(responses);
-                });
-
-                examAPIRequests.registerStudentForExam(exam, studentTwo);
-                examAPIRequests.registerStudentForExam(exam, studentThree);
-                examAPIRequests.registerStudentForExam(exam, studentFour);
-                examAPIRequests.generateMissingIndividualExams(exam);
-                examAPIRequests.prepareExerciseStartForExam(exam);
-            });
-        });
-
-        it('Participates as a student in a registered exam', () => {
-            examParticipation.startParticipation(studentTwo, course, exam);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                examNavigation.openExerciseAtIndex(j);
-                examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-            }
-            examParticipation.handInEarly();
-            examStartEnd.pressShowSummary();
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                examParticipation.verifyExerciseTitleOnFinalPage(exercise.id, exercise.exerciseGroup!.title!);
-                if (exercise.type === ExerciseType.TEXT) {
-                    examParticipation.verifyTextExerciseOnFinalPage(exercise.additionalData!.textFixture!);
-                }
-            }
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentTwoName);
-        });
-
-        it('Using save and continue to navigate within exam', () => {
-            examParticipation.startParticipation(studentThree, course, exam);
-            examNavigation.openExerciseAtIndex(0);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                // Skip programming exercise this time to save execution time
-                // (we also need to use the navigation bar here, since programming  exercises do not have a "Save and continue" button)
-                if (exercise.type == ExerciseType.PROGRAMMING) {
-                    examNavigation.openExerciseAtIndex(j + 1);
-                } else {
-                    examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-                    examParticipation.clickSaveAndContinue();
-                }
-            }
-            examParticipation.handInEarly();
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentThreeName);
-        });
-
-        it('Using exercise overview to navigate within exam', () => {
-            examParticipation.startParticipation(studentFour, course, exam);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                // Skip programming exercise this time to save execution time
-                // (we also need to use the navigation bar here, since programming  exercises do not have a "Save and continue" button)
-                if (exercise.type == ExerciseType.PROGRAMMING) {
-                    continue;
-                } else {
-                    examNavigation.openExerciseOverview();
-                    examParticipation.selectExerciseOnOverview(j + 1);
-                    examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-                }
-            }
-            examParticipation.handInEarly();
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentFourName);
-        });
-    });
-
-    describe('Early hand-in with continue and reload page', () => {
-        let exam: Exam;
-        const examTitle = 'exam' + generateUUID();
-
-        before('Create exam', () => {
-            exerciseArray = [];
-
-            cy.login(admin);
-
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'minutes'),
-                startDate: dayjs().subtract(2, 'minutes'),
-                endDate: dayjs().add(1, 'hour'),
-                examMaxPoints: 10,
-                numberOfExercisesInExam: 1,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }).then((response) => {
-                    exerciseArray.push(response);
-                });
-
-                examAPIRequests.registerStudentForExam(exam, studentTwo);
-                examAPIRequests.registerStudentForExam(exam, studentThree);
-                examAPIRequests.registerStudentForExam(exam, studentFour);
-                examAPIRequests.generateMissingIndividualExams(exam);
-                examAPIRequests.prepareExerciseStartForExam(exam);
-            });
-        });
-
-        it('Participates in the exam, hand-in early, but instead continues', () => {
-            examParticipation.startParticipation(studentTwo, course, exam);
-            const textExerciseIndex = 0;
-            const textExercise = exerciseArray[textExerciseIndex];
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            examParticipation.makeTextExerciseSubmission(textExercise.id, textExercise.additionalData!.textFixture!);
-            examParticipation.clickSaveAndContinue();
-            examNavigation.handInEarly();
-
-            examStartEnd.clickContinue();
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            textExerciseEditor.clearSubmission(textExercise.id);
-            examParticipation.makeTextExerciseSubmission(textExercise.id, textFixtureShort);
-            examParticipation.clickSaveAndContinue();
-
-            examParticipation.handInEarly();
-            examStartEnd.pressShowSummary();
-            examParticipation.verifyTextExerciseOnFinalPage(textFixtureShort);
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentTwoName);
-        });
-
-        it('Reloads exam page during participation and ensures that everything is as expected', () => {
-            examParticipation.startParticipation(studentThree, course, exam);
-            const textExerciseIndex = 0;
-            const textExercise = exerciseArray[textExerciseIndex];
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            examParticipation.makeTextExerciseSubmission(textExercise.id, textExercise.additionalData!.textFixture!);
-            examParticipation.clickSaveAndContinue();
-
-            cy.reload();
-            examParticipation.startParticipation(studentThree, course, exam);
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            textExerciseEditor.checkCurrentContent(textExercise.id, textExercise.additionalData!.textFixture!);
-            examParticipation.clickSaveAndContinue();
-            examParticipation.handInEarly();
-            examStartEnd.pressShowSummary();
-            examParticipation.verifyTextExerciseOnFinalPage(textExercise.additionalData!.textFixture!);
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentThreeName);
-        });
-
-        it('Reloads exam result page and ensures that everything is as expected', () => {
-            examParticipation.startParticipation(studentFour, course, exam);
-            const textExerciseIndex = 0;
-            const textExercise = exerciseArray[textExerciseIndex];
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            examParticipation.makeTextExerciseSubmission(textExercise.id, textExercise.additionalData!.textFixture!);
-            examParticipation.clickSaveAndContinue();
-            examParticipation.handInEarly();
-            examStartEnd.pressShowSummary();
-            examParticipation.verifyTextExerciseOnFinalPage(textExercise.additionalData!.textFixture!);
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.reload();
-
-            examParticipation.verifyTextExerciseOnFinalPage(textExercise.additionalData!.textFixture!);
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentFourName);
-        });
-    });
-
-    describe('Normal Hand-in', () => {
-        let exam: Exam;
-        const examTitle = 'exam' + generateUUID();
-
-        before('Create exam', () => {
-            exerciseArray = [];
-
-            cy.login(admin);
-
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'minutes'),
-                startDate: dayjs().subtract(2, 'minutes'),
-                endDate: dayjs().add(30, 'seconds'),
-                examMaxPoints: 10,
-                numberOfExercisesInExam: 1,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }).then((response) => {
-                    exerciseArray.push(response);
-                });
-
-                examAPIRequests.registerStudentForExam(exam, studentFour);
-                examAPIRequests.generateMissingIndividualExams(exam);
-                examAPIRequests.prepareExerciseStartForExam(exam);
-            });
-        });
-
-        it('Participates as a student in a registered exam', () => {
-            examParticipation.startParticipation(studentFour, course, exam);
-            const textExerciseIndex = 0;
-            const textExercise = exerciseArray[textExerciseIndex];
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            examParticipation.makeSubmission(textExercise.id, textExercise.type, textExercise.additionalData);
-            examParticipation.clickSaveAndContinue();
-            examParticipation.checkExamFullnameInputExists();
-            examParticipation.checkYourFullname(studentFourName);
-            examStartEnd.finishExam().then((request: Interception) => {
-                expect(request.response!.statusCode).to.eq(200);
-            });
-            examStartEnd.pressShowSummary();
-            examParticipation.verifyTextExerciseOnFinalPage(textExercise.additionalData!.textFixture!);
-            examParticipation.checkExamTitle(examTitle);
-
-            cy.login(instructor);
-            examManagement.verifySubmitted(course.id!, exam.id!, studentFourName);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/ExamTestRun.cy.ts b/src/test/cypress/e2e/exam/ExamTestRun.cy.ts
deleted file mode 100644
index f835fa27a288..000000000000
--- a/src/test/cypress/e2e/exam/ExamTestRun.cy.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import javaBuildErrorSubmission from '../../fixtures/exercise/programming/java/build_error/submission.json';
-import { courseManagementAPIRequest, examAPIRequests, examExerciseGroupCreation, examManagement, examNavigation, examParticipation, examTestRun } from '../../support/artemis';
-import { Exercise, ExerciseType } from '../../support/constants';
-import { admin, instructor } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-// Common primitives
-const textFixture = 'loremIpsum-short.txt';
-const examTitle = 'exam' + generateUUID();
-
-describe.skip('Exam test run', () => {
-    let course: Course;
-    let exam: Exam;
-    let testRun: any;
-    let exerciseArray: Array<Exercise> = [];
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                visibleDate: dayjs().subtract(3, 'days'),
-                startDate: dayjs().add(1, 'days'),
-                endDate: dayjs().add(3, 'days'),
-                examMaxPoints: 40,
-                numberOfExercisesInExam: 4,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                Promise.all([
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.PROGRAMMING, { submission: javaBuildErrorSubmission, practiceMode: true }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.QUIZ, { quizExerciseID: 0 }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.MODELING),
-                ]).then((responses) => {
-                    exerciseArray = exerciseArray.concat(responses);
-                });
-            });
-        });
-    });
-
-    beforeEach('Create test run instance', () => {
-        cy.login(instructor);
-        // TODO: API call does not work yet, for now we use the UI to create the test run
-        // courseManagementAPIRequests.createExamTestRun(exam, exerciseArray).then((response: any) => {
-        //     testRun = response.body;
-        // });
-        cy.visit(`/course-management/${course.id}/exams/${exam.id}`);
-        examManagement.openTestRun();
-        examTestRun.createTestRun();
-        examTestRun.setWorkingTimeMinutes(2);
-        examTestRun.confirmTestRun().then((testRunResponse: Interception) => {
-            testRun = testRunResponse.response!.body;
-        });
-    });
-
-    it('Create a test run', () => {
-        cy.login(instructor);
-
-        let testRunID: number;
-        const minutes = 40;
-        const seconds = 30;
-
-        cy.visit(`/course-management/${course.id}/exams/${exam.id}`);
-        examManagement.openTestRun();
-        examTestRun.createTestRun();
-        examTestRun.setWorkingTimeMinutes(minutes);
-        examTestRun.setWorkingTimeSeconds(seconds);
-        examTestRun.confirmTestRun().then((testRunResponse: Interception) => {
-            const testRun = testRunResponse.response!.body;
-            testRunID = testRun.id;
-
-            expect(testRunResponse.response!.statusCode).to.eq(200);
-            expect(testRun.testRun).to.be.true;
-            expect(testRun.submitted).to.be.false;
-            expect(testRun.workingTime).to.eq(minutes * 60 + seconds);
-
-            examTestRun.getWorkingTime(testRunID).contains('40min 30s');
-            examTestRun.getStarted(testRunID).contains('No');
-            examTestRun.getSubmitted(testRunID).contains('No');
-        });
-    });
-
-    it('Change test run working time', () => {
-        const hour = 1;
-        const minutes = 20;
-        const seconds = 45;
-
-        cy.login(instructor);
-        examTestRun.openTestRunPage(course, exam);
-        examTestRun.changeWorkingTime(testRun.id);
-        examTestRun.setWorkingTimeHours(hour);
-        examTestRun.setWorkingTimeMinutes(minutes);
-        examTestRun.setWorkingTimeSeconds(seconds);
-        examTestRun.saveTestRun().then((testRunResponse: Interception) => {
-            const testRun = testRunResponse.response!.body;
-
-            expect(testRun.id).to.eq(testRun.id);
-            expect(testRunResponse.response!.statusCode).to.eq(200);
-            expect(testRun.workingTime).to.eq(hour * 3600 + minutes * 60 + seconds);
-
-            examTestRun.openTestRunPage(course, exam);
-            examTestRun.getWorkingTime(testRun.id).contains(`${hour}h ${minutes}min ${seconds}s`);
-            examTestRun.getStarted(testRun.id).contains('No');
-            examTestRun.getSubmitted(testRun.id).contains('No');
-        });
-    });
-
-    it('Conducts a test run', () => {
-        examTestRun.startParticipation(instructor, course, exam, testRun.id);
-        examTestRun.getTestRunRibbon().contains('Test Run');
-
-        for (let j = 0; j < exerciseArray.length; j++) {
-            const exercise = exerciseArray[j];
-            examNavigation.openExerciseAtIndex(j);
-            examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-        }
-        examParticipation.handInEarly();
-        for (let j = 0; j < exerciseArray.length; j++) {
-            const exercise = exerciseArray[j];
-            examParticipation.verifyExerciseTitleOnFinalPage(exercise.id, exercise.exerciseGroup!.title!);
-            if (exercise.type === ExerciseType.TEXT) {
-                examParticipation.verifyTextExerciseOnFinalPage(exercise.additionalData!.textFixture!);
-            }
-        }
-        examParticipation.checkExamTitle(examTitle);
-        examTestRun.openTestRunPage(course, exam);
-        examTestRun.getStarted(testRun.id).contains('Yes');
-        examTestRun.getSubmitted(testRun.id).contains('Yes');
-    });
-
-    it('Deletes a test run', () => {
-        cy.login(instructor);
-        examTestRun.openTestRunPage(course, exam);
-        examTestRun.getTestRunIdElement(testRun.id).should('exist');
-        examTestRun.deleteTestRun(testRun.id);
-        examTestRun.getTestRun(testRun.id).should('not.exist');
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/test-exam/TestExamCreationDeletion.cy.ts b/src/test/cypress/e2e/exam/test-exam/TestExamCreationDeletion.cy.ts
deleted file mode 100644
index 66d49298a858..000000000000
--- a/src/test/cypress/e2e/exam/test-exam/TestExamCreationDeletion.cy.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import { courseManagement, courseManagementAPIRequest, examAPIRequests, examCreation, examDetails, examManagement, navigationBar } from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, dayjsToString, generateUUID, trimDate } from '../../../support/utils';
-
-// Common primitives
-const examData = {
-    title: 'exam' + generateUUID(),
-    visibleDate: dayjs(),
-    startDate: dayjs().add(1, 'day'),
-    endDate: dayjs().add(2, 'day'),
-    workingTime: 5,
-    numberOfExercises: 4,
-    maxPoints: 40,
-    startText: 'Exam start text',
-    endText: 'Exam end text',
-    confirmationStartText: 'Exam confirmation start text',
-    confirmationEndText: 'Exam confirmation end text',
-};
-
-describe.skip('Test Exam creation/deletion', () => {
-    let course: Course;
-    let exam: Exam;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    beforeEach(() => {
-        cy.login(admin, '/');
-    });
-
-    it('Creates a test exam', function () {
-        navigationBar.openCourseManagement();
-        courseManagement.openExamsOfCourse(course.id!);
-
-        examManagement.createNewExam();
-        examCreation.setTitle(examData.title);
-        examCreation.setTestMode();
-        examCreation.setVisibleDate(examData.visibleDate);
-        examCreation.setStartDate(examData.startDate);
-        examCreation.setEndDate(examData.endDate);
-        examCreation.setWorkingTime(examData.workingTime);
-        examCreation.setNumberOfExercises(examData.numberOfExercises);
-        examCreation.setExamMaxPoints(examData.maxPoints);
-
-        examCreation.setStartText(examData.startText);
-        examCreation.setEndText(examData.endText);
-        examCreation.setConfirmationStartText(examData.confirmationStartText);
-        examCreation.setConfirmationEndText(examData.confirmationEndText);
-
-        examCreation.submit().then((examResponse: Interception) => {
-            const examBody = examResponse.response!.body;
-            exam = examResponse.response!.body;
-            expect(examResponse.response!.statusCode).to.eq(201);
-            expect(examBody.title).to.eq(examData.title);
-            expect(examBody.testExam).to.be.true;
-            expect(trimDate(examBody.visibleDate)).to.eq(trimDate(dayjsToString(examData.visibleDate)));
-            expect(trimDate(examBody.startDate)).to.eq(trimDate(dayjsToString(examData.startDate)));
-            expect(trimDate(examBody.endDate)).to.eq(trimDate(dayjsToString(examData.endDate)));
-            expect(examBody.workingTime).to.eq(examData.workingTime * 60);
-            expect(examBody.numberOfExercisesInExam).to.eq(examData.numberOfExercises);
-            expect(examBody.examMaxPoints).to.eq(examData.maxPoints);
-            expect(examBody.startText).to.eq(examData.startText);
-            expect(examBody.endText).to.eq(examData.endText);
-            expect(examBody.confirmationStartText).to.eq(examData.confirmationStartText);
-            expect(examBody.confirmationEndText).to.eq(examData.confirmationEndText);
-            cy.url().should('contain', `/exams/${exam.id}`);
-        });
-        examManagement.getExamTitle().contains(examData.title);
-    });
-
-    describe('Test exam deletion', () => {
-        beforeEach(() => {
-            examData.title = 'exam' + generateUUID();
-            const examConfig: Exam = {
-                course,
-                title: examData.title,
-                testExam: true,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-            });
-        });
-
-        it('Deletes an existing test exam', () => {
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.getExamSelector(examData.title).should('exist');
-            examManagement.openExam(exam.id!);
-            examDetails.deleteExam(examData.title);
-            examManagement.getExamSelector(examData.title).should('not.exist');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/test-exam/TestExamManagement.cy.ts b/src/test/cypress/e2e/exam/test-exam/TestExamManagement.cy.ts
deleted file mode 100644
index 435595a7a2bc..000000000000
--- a/src/test/cypress/e2e/exam/test-exam/TestExamManagement.cy.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-
-import {
-    courseManagement,
-    courseManagementAPIRequest,
-    examAPIRequests,
-    examExerciseGroupCreation,
-    examExerciseGroups,
-    examManagement,
-    modelingExerciseCreation,
-    navigationBar,
-    programmingExerciseCreation,
-    quizExerciseCreation,
-    textExerciseCreation,
-} from '../../../support/artemis';
-import { admin, instructor, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-// Common primitives
-const uid = generateUUID();
-const examTitle = 'test-exam' + uid;
-
-describe.skip('Test Exam management', () => {
-    let course: Course;
-    let exam: Exam;
-    let createdGroup: ExerciseGroup;
-    let groupCount = 0;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            examAPIRequests.createExam({ course, title: examTitle, testExam: true }).then((examResponse) => {
-                exam = examResponse.body;
-            });
-        });
-    });
-
-    describe('Manage Group', () => {
-        let exerciseGroup: ExerciseGroup;
-
-        before(() => {
-            cy.login(instructor);
-            examAPIRequests.addExerciseGroupForExam(exam).then((response) => {
-                exerciseGroup = response.body;
-                groupCount++;
-            });
-        });
-
-        beforeEach(() => {
-            cy.login(instructor);
-        });
-
-        it('Create exercise group', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.shouldShowNumberOfExerciseGroups(groupCount);
-            examExerciseGroups.clickAddExerciseGroup();
-            const groupName = 'Group 1';
-            examExerciseGroupCreation.typeTitle(groupName);
-            examExerciseGroupCreation.isMandatoryBoxShouldBeChecked();
-            examExerciseGroupCreation.clickSave().then((interception) => {
-                const group = interception.response!.body;
-                groupCount++;
-                examExerciseGroups.shouldHaveTitle(group.id, groupName);
-                examExerciseGroups.shouldShowNumberOfExerciseGroups(groupCount);
-                createdGroup = group;
-            });
-        });
-
-        it('Adds a text exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddTextExercise(exerciseGroup.id!);
-            const textExerciseTitle = 'text' + uid;
-            textExerciseCreation.typeTitle(textExerciseTitle);
-            textExerciseCreation.typeMaxPoints(10);
-            textExerciseCreation.create().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, textExerciseTitle);
-        });
-
-        it('Adds a quiz exercise', () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddQuizExercise(exerciseGroup.id!);
-            const quizExerciseTitle = 'quiz' + uid;
-            quizExerciseCreation.setTitle(quizExerciseTitle);
-            quizExerciseCreation.addMultipleChoiceQuestion(quizExerciseTitle, 10);
-            quizExerciseCreation.saveQuiz().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, quizExerciseTitle);
-        });
-
-        it('Adds a modeling exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddModelingExercise(exerciseGroup.id!);
-            const modelingExerciseTitle = 'modeling' + uid;
-            modelingExerciseCreation.setTitle(modelingExerciseTitle);
-            modelingExerciseCreation.setPoints(10);
-            modelingExerciseCreation.save().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, modelingExerciseTitle);
-        });
-
-        it('Adds a programming exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.clickAddProgrammingExercise(exerciseGroup.id!);
-            const programmingExerciseTitle = 'programming' + uid;
-            programmingExerciseCreation.setTitle(programmingExerciseTitle);
-            programmingExerciseCreation.setShortName(programmingExerciseTitle);
-            programmingExerciseCreation.setPackageName('de.test');
-            programmingExerciseCreation.setPoints(10);
-            programmingExerciseCreation.generate().its('response.statusCode').should('eq', 201);
-            examExerciseGroups.visitPageViaUrl(course.id!, exam.id!);
-            examExerciseGroups.shouldContainExerciseWithTitle(exerciseGroup.id!, programmingExerciseTitle);
-        });
-
-        it('Edits an exercise group', () => {
-            cy.visit(`/course-management/${course.id}/exams`);
-            examManagement.openExerciseGroups(exam.id!);
-            examExerciseGroups.shouldHaveTitle(exerciseGroup.id!, exerciseGroup.title!);
-            examExerciseGroups.clickEditGroup(exerciseGroup.id!);
-            const newGroupName = 'Group 3';
-            examExerciseGroupCreation.typeTitle(newGroupName);
-            examExerciseGroupCreation.update();
-            examExerciseGroups.shouldHaveTitle(exerciseGroup.id!, newGroupName);
-            exerciseGroup.title = newGroupName;
-        });
-
-        it('Delete an exercise group', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openExerciseGroups(exam.id!);
-            // If the group in the "Create group test" was created successfully, we delete it so there is no group with no exercise
-            let group = exerciseGroup;
-            if (createdGroup) {
-                group = createdGroup;
-            }
-            examExerciseGroups.clickDeleteGroup(group.id!, group.title!);
-            examExerciseGroups.shouldNotExist(group.id!);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/test-exam/TestExamParticipation.cy.ts b/src/test/cypress/e2e/exam/test-exam/TestExamParticipation.cy.ts
deleted file mode 100644
index f22ab0fed6a2..000000000000
--- a/src/test/cypress/e2e/exam/test-exam/TestExamParticipation.cy.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json';
-import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
-import { courseManagementAPIRequest, examAPIRequests, examExerciseGroupCreation, examNavigation, examParticipation, examStartEnd } from '../../../support/artemis';
-import { Exercise, ExerciseType } from '../../../support/constants';
-import { admin, studentFour, studentThree, studentTwo, users } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-// Common primitives
-const textFixture = 'loremIpsum-short.txt';
-
-describe.skip('Test exam participation', () => {
-    let course: Course;
-    let exerciseArray: Array<Exercise> = [];
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentTwo);
-            courseManagementAPIRequest.addStudentToCourse(course, studentThree);
-            courseManagementAPIRequest.addStudentToCourse(course, studentFour);
-        });
-    });
-
-    describe('Early Hand-in', () => {
-        let exam: Exam;
-        const examTitle = 'test-exam' + generateUUID();
-
-        before('Create test exam', () => {
-            cy.login(admin);
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                testExam: true,
-                startDate: dayjs().subtract(1, 'day'),
-                visibleDate: dayjs().subtract(2, 'days'),
-                examMaxPoints: 100,
-                numberOfExercisesInExam: 10,
-                numberOfCorrectionRoundsInExam: 0,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                Promise.all([
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.PROGRAMMING, { submission: javaAllSuccessfulSubmission, expectedScore: 100 }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.PROGRAMMING, { submission: javaBuildErrorSubmission, expectedScore: 0 }),
-
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.QUIZ, { quizExerciseID: 0 }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.QUIZ, { quizExerciseID: 0 }),
-
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.MODELING),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.MODELING),
-                ]).then((responses) => {
-                    exerciseArray = exerciseArray.concat(responses);
-                });
-            });
-        });
-
-        it('Participates as a student in a registered test exam', () => {
-            examParticipation.startParticipation(studentTwo, course, exam);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                examNavigation.openExerciseAtIndex(j);
-                examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-            }
-            examParticipation.handInEarly();
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                examParticipation.verifyExerciseTitleOnFinalPage(exercise.id, exercise.exerciseGroup!.title!);
-                if (exercise.type === ExerciseType.TEXT) {
-                    examParticipation.verifyTextExerciseOnFinalPage(exercise.additionalData!.textFixture!);
-                }
-            }
-            examParticipation.checkExamTitle(examTitle);
-        });
-
-        it('Using save and continue to navigate within exam', () => {
-            examParticipation.startParticipation(studentThree, course, exam);
-            examNavigation.openExerciseAtIndex(0);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                // Skip programming exercise this time to save execution time
-                // (we also need to use the navigation bar here, since programming  exercises do not have a "Save and continue" button)
-                if (exercise.type == ExerciseType.PROGRAMMING) {
-                    examNavigation.openExerciseAtIndex(j + 1);
-                } else {
-                    examParticipation.checkExerciseTitle(exerciseArray[j].id, exerciseArray[j].exerciseGroup!.title!);
-                    examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-                    examParticipation.clickSaveAndContinue();
-                }
-            }
-            examParticipation.handInEarly();
-        });
-
-        it('Using exercise overview to navigate within exam', () => {
-            examParticipation.startParticipation(studentFour, course, exam);
-            for (let j = 0; j < exerciseArray.length; j++) {
-                const exercise = exerciseArray[j];
-                // Skip programming exercise this time to save execution time
-                // (we also need to use the navigation bar here, since programming  exercises do not have a "Save and continue" button)
-                if (exercise.type === ExerciseType.PROGRAMMING) {
-                    continue;
-                } else {
-                    examNavigation.openExerciseOverview();
-                    examParticipation.selectExerciseOnOverview(j + 1);
-                    examParticipation.checkExerciseTitle(exerciseArray[j].id, exerciseArray[j].exerciseGroup!.title!);
-                    examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-                }
-            }
-            examParticipation.handInEarly();
-        });
-    });
-
-    describe('Normal Hand-in', () => {
-        let exam: Exam;
-        let studentFourName: string;
-        const examTitle = 'exam' + generateUUID();
-
-        before('Create exam', () => {
-            exerciseArray = [];
-
-            cy.login(admin);
-
-            users.getUserInfo(studentFour.username, (userInfo) => {
-                studentFourName = userInfo.name;
-            });
-
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                testExam: true,
-                startDate: dayjs().subtract(1, 'day'),
-                visibleDate: dayjs().subtract(2, 'days'),
-                workingTime: 15,
-                examMaxPoints: 10,
-                numberOfCorrectionRoundsInExam: 1,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }).then((response) => {
-                    exerciseArray.push(response);
-                });
-            });
-        });
-
-        it('Participates as a student in a registered exam', () => {
-            examParticipation.startParticipation(studentFour, course, exam);
-            const textExerciseIndex = 0;
-            const textExercise = exerciseArray[textExerciseIndex];
-            examNavigation.openExerciseAtIndex(textExerciseIndex);
-            examParticipation.makeSubmission(textExercise.id, textExercise.type, textExercise.additionalData);
-            examParticipation.clickSaveAndContinue();
-            examParticipation.checkExamFullnameInputExists();
-            examParticipation.checkYourFullname(studentFourName);
-            examStartEnd.finishExam().then((request: Interception) => {
-                expect(request.response!.statusCode).to.eq(200);
-            });
-            examParticipation.verifyTextExerciseOnFinalPage(textExercise.additionalData!.textFixture!);
-            examParticipation.checkExamTitle(examTitle);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/test-exam/TestExamStudentExams.cy.ts b/src/test/cypress/e2e/exam/test-exam/TestExamStudentExams.cy.ts
deleted file mode 100644
index 63e7df7b6a31..000000000000
--- a/src/test/cypress/e2e/exam/test-exam/TestExamStudentExams.cy.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { CypressUserManagement, admin, studentOne, studentThree, studentTwo } from '../../../support/users';
-import {
-    courseManagement,
-    courseManagementAPIRequest,
-    examAPIRequests,
-    examExerciseGroupCreation,
-    examManagement,
-    examNavigation,
-    examParticipation,
-    navigationBar,
-    studentExamManagement,
-} from '../../../support/artemis';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-import { CypressCredentials } from '../../../support/users';
-import { Exercise, ExerciseType } from '../../../support/constants';
-import dayjs from 'dayjs/esm';
-
-// Common primitives
-const uid = generateUUID();
-const examTitle = 'test-exam' + uid;
-const textFixture = 'loremIpsum-short.txt';
-const students: Array<CypressCredentials> = [studentOne, studentTwo, studentThree];
-const studentNames: string[] = [];
-
-const userManagement = new CypressUserManagement();
-
-let examExercise: Exercise;
-
-describe.skip('Test Exam - student exams', () => {
-    let course: Course;
-    let exam: Exam;
-
-    before('Create course and exam', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-
-            for (const student of students) {
-                courseManagementAPIRequest.addStudentToCourse(course, student);
-            }
-
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                testExam: true,
-                startDate: dayjs().subtract(1, 'day'),
-                visibleDate: dayjs().subtract(2, 'days'),
-                workingTime: 5,
-                examMaxPoints: 10,
-                numberOfCorrectionRoundsInExam: 1,
-            };
-
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }).then((response) => {
-                    examExercise = response;
-                    participateInExam(students.at(0)!, course, exam, true, true);
-                    participateInExam(students.at(1)!, course, exam, true, false);
-                    participateInExam(students.at(2)!, course, exam, false, false);
-                });
-            });
-        });
-    });
-
-    before('Get student names', () => {
-        cy.login(admin);
-        for (let index = 0; index < students.length; index++) {
-            userManagement.getUserInfo(students[index].username, (userInfo) => {
-                studentNames[index] = userInfo.name;
-            });
-        }
-    });
-
-    beforeEach(() => {
-        cy.login(admin);
-    });
-
-    describe('Check exam participants and their submissions', () => {
-        it('Open the list of exam students', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openStudentExams(exam.id!);
-            for (const student of students) {
-                studentExamManagement.checkExamStudent(student.username);
-            }
-            studentExamManagement.getStudentExamRows().should('have.length', students.length);
-
-            studentExamManagement.checkExamProperty(students.at(0)!.username, 'Started', 'Yes');
-            studentExamManagement.checkExamProperty(students.at(1)!.username, 'Started', 'Yes');
-            studentExamManagement.checkExamProperty(students.at(2)!.username, 'Started', 'No');
-
-            studentExamManagement.checkExamProperty(students.at(0)!.username, 'Submitted', 'Yes');
-            studentExamManagement.checkExamProperty(students.at(1)!.username, 'Submitted', 'No');
-            studentExamManagement.checkExamProperty(students.at(2)!.username, 'Submitted', 'No');
-
-            studentExamManagement.checkExamProperty(students.at(1)!.username, 'Used working time', '0s');
-            studentExamManagement.checkExamProperty(students.at(2)!.username, 'Used working time', '0s');
-
-            studentExamManagement.checkExamProperty(students.at(0)!.username, 'Student', studentNames.at(0)!.trim());
-            studentExamManagement.checkExamProperty(students.at(1)!.username, 'Student', studentNames.at(1)!.trim());
-            studentExamManagement.checkExamProperty(students.at(2)!.username, 'Student', studentNames.at(2)!.trim());
-        });
-
-        it('Search for a student in exams', () => {
-            cy.visit('/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExamsOfCourse(course.id!);
-            examManagement.openStudentExams(exam.id!);
-
-            let searchText = students.at(0)!.username + ', ' + students.at(1)!.username;
-            studentExamManagement.typeSearchText(searchText);
-            studentExamManagement.checkExamStudent(students.at(0)!.username);
-            studentExamManagement.checkExamStudent(students.at(1)!.username);
-
-            searchText = studentNames.at(0)! + ', ' + studentNames.at(1)!;
-            studentExamManagement.typeSearchText(searchText);
-            studentExamManagement.checkExamStudent(students.at(0)!.username);
-            studentExamManagement.checkExamStudent(students.at(1)!.username);
-
-            searchText = 'Artemis Test User';
-            studentExamManagement.typeSearchText(searchText);
-            studentExamManagement.checkExamStudent(students.at(0)!.username);
-            studentExamManagement.checkExamStudent(students.at(1)!.username);
-            studentExamManagement.checkExamStudent(students.at(2)!.username);
-        });
-    });
-
-    function participateInExam(student: CypressCredentials, course: Course, exam: Exam, toStart: boolean, toSubmit: boolean) {
-        if (!toStart) {
-            examParticipation.openExam(student, course, exam);
-        } else {
-            examParticipation.startParticipation(student, course, exam);
-            examNavigation.openExerciseAtIndex(0);
-            examParticipation.makeSubmission(examExercise.id, examExercise.type, examExercise.additionalData);
-        }
-
-        if (toSubmit) {
-            examParticipation.handInEarly();
-        }
-    }
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exam/test-exam/TestExamTestRun.cy.ts b/src/test/cypress/e2e/exam/test-exam/TestExamTestRun.cy.ts
deleted file mode 100644
index 015700fb7a0f..000000000000
--- a/src/test/cypress/e2e/exam/test-exam/TestExamTestRun.cy.ts
+++ /dev/null
@@ -1,150 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
-import { courseManagementAPIRequest, examAPIRequests, examExerciseGroupCreation, examManagement, examNavigation, examParticipation, examTestRun } from '../../../support/artemis';
-import { Exercise, ExerciseType } from '../../../support/constants';
-import { admin, instructor } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-// Common primitives
-const textFixture = 'loremIpsum.txt';
-const examTitle = 'exam' + generateUUID();
-
-describe.skip('Test exam test run', () => {
-    let course: Course;
-    let exam: Exam;
-    let testRun: any;
-    let exerciseArray: Array<Exercise> = [];
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            const examConfig: Exam = {
-                course,
-                title: examTitle,
-                testExam: true,
-                examMaxPoints: 40,
-                numberOfExercisesInExam: 4,
-            };
-            examAPIRequests.createExam(examConfig).then((examResponse) => {
-                exam = examResponse.body;
-                Promise.all([
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.TEXT, { textFixture }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.PROGRAMMING, { submission: javaBuildErrorSubmission, practiceMode: true }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.QUIZ, { quizExerciseID: 0 }),
-                    examExerciseGroupCreation.addGroupWithExercise(exam, ExerciseType.MODELING),
-                ]).then((responses) => {
-                    exerciseArray = exerciseArray.concat(responses);
-                });
-            });
-        });
-    });
-
-    beforeEach('Create test run instance', () => {
-        cy.login(instructor);
-        // TODO: API call does not work yet, for now we use the UI to create the test run
-        // courseManagementAPIRequest.createExamTestRun(exam, exerciseArray).then((response: any) => {
-        //     testRun = response.body;
-        // });
-        cy.visit(`/course-management/${course.id}/exams/${exam.id}`);
-        examManagement.openTestRun();
-        examTestRun.createTestRun();
-        examTestRun.setWorkingTimeMinutes(2);
-        examTestRun.confirmTestRun().then((testRunResponse: Interception) => {
-            testRun = testRunResponse.response!.body;
-        });
-    });
-
-    it('Create a test run', () => {
-        cy.login(instructor);
-
-        let testRunID: number;
-        const minutes = 40;
-        const seconds = 30;
-
-        cy.visit(`/course-management/${course.id}/exams/${exam.id}`);
-        examManagement.openTestRun();
-        examTestRun.createTestRun();
-        examTestRun.setWorkingTimeMinutes(minutes);
-        examTestRun.setWorkingTimeSeconds(seconds);
-        examTestRun.confirmTestRun().then((testRunResponse: Interception) => {
-            const testRun = testRunResponse.response!.body;
-            testRunID = testRun.id;
-
-            expect(testRunResponse.response!.statusCode).to.eq(200);
-            expect(testRun.testRun).to.be.true;
-            expect(testRun.submitted).to.be.false;
-            expect(testRun.workingTime).to.eq(minutes * 60 + seconds);
-
-            examTestRun.getWorkingTime(testRunID).contains('40min 30s');
-            examTestRun.getStarted(testRunID).contains('No');
-            examTestRun.getSubmitted(testRunID).contains('No');
-        });
-    });
-
-    // Skip since this functionality is not yet supported
-    // TODO: Activate test as soon as editing test run working times for test exams is possible
-    // it.skip('Change test run working time', () => {
-    //     const hour = 1;
-    //     const minutes = 20;
-    //     const seconds = 45;
-
-    //     cy.login(instructor);
-    //     examTestRun.openTestRunPage(course, exam);
-    //     examTestRun.changeWorkingTime(testRun.id);
-    //     examTestRun.setWorkingTimeHours(hour);
-    //     examTestRun.setWorkingTimeMinutes(minutes);
-    //     examTestRun.setWorkingTimeSeconds(seconds);
-    //     examTestRun.saveTestRun().then((testRunResponse: Interception) => {
-    //         const testRun = testRunResponse.response!.body;
-
-    //         expect(testRun.id).to.eq(testRun.id);
-    //         expect(testRunResponse.response!.statusCode).to.eq(200);
-    //         expect(testRun.workingTime).to.eq(hour * 3600 + minutes * 60 + seconds);
-
-    //         examTestRun.openTestRunPage(course, exam);
-    //         examTestRun.getWorkingTime(testRun.id).contains(`${hour}h ${minutes}min ${seconds}s`);
-    //         examTestRun.getStarted(testRun.id).contains('No');
-    //         examTestRun.getSubmitted(testRun.id).contains('No');
-    //     });
-    // });
-
-    it('Conducts a test run', () => {
-        examTestRun.startParticipation(instructor, course, exam, testRun.id);
-        examTestRun.getTestRunRibbon().contains('Test Run');
-
-        for (let j = 0; j < exerciseArray.length; j++) {
-            const exercise = exerciseArray[j];
-            examNavigation.openExerciseAtIndex(j);
-            examParticipation.makeSubmission(exercise.id, exercise.type, exercise.additionalData);
-        }
-        examParticipation.handInEarly();
-        for (let j = 0; j < exerciseArray.length; j++) {
-            const exercise = exerciseArray[j];
-            examParticipation.verifyExerciseTitleOnFinalPage(exercise.id, exercise.exerciseGroup!.title!);
-            if (exercise.type === ExerciseType.TEXT) {
-                examParticipation.verifyTextExerciseOnFinalPage(exercise.additionalData!.textFixture!);
-            }
-        }
-        examParticipation.checkExamTitle(examTitle);
-        examTestRun.openTestRunPage(course, exam);
-        examTestRun.getStarted(testRun.id).contains('Yes');
-        examTestRun.getSubmitted(testRun.id).contains('Yes');
-    });
-
-    it('Deletes a test run', () => {
-        cy.login(instructor);
-        examTestRun.openTestRunPage(course, exam);
-        examTestRun.getTestRunIdElement(testRun.id).should('exist');
-        examTestRun.deleteTestRun(testRun.id);
-        examTestRun.getTestRun(testRun.id).should('not.exist');
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts b/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts
deleted file mode 100644
index 306a07bfd0a8..000000000000
--- a/src/test/cypress/e2e/exercises/ExerciseImport.cy.ts
+++ /dev/null
@@ -1,177 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-
-import javaPartiallySuccessfulSubmission from '../../fixtures/exercise/programming/java/partially_successful/submission.json';
-import multipleChoiceQuizTemplate from '../../fixtures/exercise/quiz/multiple_choice/template.json';
-import {
-    courseManagementAPIRequest,
-    courseManagementExercises,
-    courseOverview,
-    exerciseAPIRequest,
-    modelingExerciseCreation,
-    modelingExerciseEditor,
-    programmingExerciseCreation,
-    programmingExerciseEditor,
-    quizExerciseCreation,
-    quizExerciseMultipleChoice,
-    textExerciseCreation,
-    textExerciseEditor,
-} from '../../support/artemis';
-import { admin, instructor, studentOne } from '../../support/users';
-import { checkField, convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-describe.skip('Import exercises', { scrollBehavior: 'center' }, () => {
-    let course: Course;
-    let secondCourse: Course;
-    let textExercise: TextExercise;
-    let quizExercise: QuizExercise;
-    let modelingExercise: ModelingExercise;
-    let programmingExercise: ProgrammingExercise;
-
-    before('Setup course with exercises', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            exerciseAPIRequest.createTextExercise({ course }).then((response) => {
-                textExercise = response.body;
-            });
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate]).then((response) => {
-                quizExercise = convertModelAfterMultiPart(response);
-            });
-            exerciseAPIRequest.createModelingExercise({ course }).then((response) => {
-                modelingExercise = response.body;
-            });
-            exerciseAPIRequest.createProgrammingExercise({ course }).then((response) => {
-                programmingExercise = response.body;
-            });
-            courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-                secondCourse = convertModelAfterMultiPart(response);
-                courseManagementAPIRequest.addStudentToCourse(secondCourse, studentOne);
-                courseManagementAPIRequest.addInstructorToCourse(secondCourse, instructor);
-            });
-        });
-    });
-
-    after('Delete Courses', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-        courseManagementAPIRequest.deleteCourse(secondCourse, admin);
-    });
-
-    it('Imports text exercise', () => {
-        cy.login(instructor, `/course-management/${secondCourse.id}/exercises`);
-        courseManagementExercises.importTextExercise();
-        courseManagementExercises.clickImportExercise(textExercise.id!);
-
-        checkField('#field_title', textExercise.title!);
-        checkField('#field_points', textExercise.maxPoints!);
-
-        textExerciseCreation.setReleaseDate(dayjs());
-        textExerciseCreation.setDueDate(dayjs().add(1, 'days'));
-        textExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days'));
-
-        textExerciseCreation.import().then((request: Interception) => {
-            const exercise = request.response!.body;
-            cy.login(studentOne, `/courses/${secondCourse.id}`);
-            courseOverview.openExerciseOverview(exercise.title!);
-            courseOverview.startExercise(exercise.id!);
-            courseOverview.openRunningExercise(exercise.id!);
-            cy.fixture('loremIpsum-short.txt').then((submission) => {
-                textExerciseEditor.shouldShowNumberOfWords(0);
-                textExerciseEditor.shouldShowNumberOfCharacters(0);
-                textExerciseEditor.typeSubmission(exercise.id!, submission);
-                textExerciseEditor.shouldShowNumberOfWords(16);
-                textExerciseEditor.shouldShowNumberOfCharacters(83);
-                textExerciseEditor.submit().then((request: Interception) => {
-                    expect(request.response!.body.text).to.eq(submission);
-                    expect(request.response!.body.submitted).to.be.true;
-                    expect(request.response!.statusCode).to.eq(200);
-                });
-            });
-        });
-    });
-
-    it('Imports quiz exercise', () => {
-        cy.login(instructor, `/course-management/${secondCourse.id}/exercises`);
-        courseManagementExercises.importQuizExercise();
-        courseManagementExercises.clickImportExercise(quizExercise.id!);
-
-        checkField('#field_title', quizExercise.title!);
-        checkField('#quiz-duration-minutes', quizExercise.duration! / 60);
-
-        cy.wait(500);
-
-        quizExerciseCreation.setVisibleFrom(dayjs());
-
-        quizExerciseCreation.import().then((request: Interception) => {
-            const exercise = request.response!.body;
-            courseManagementExercises.startQuiz(exercise.id!);
-            cy.login(studentOne, `/courses/${secondCourse.id}`);
-            courseOverview.openExerciseOverview(exercise.title!);
-            courseOverview.startExercise(exercise.id!);
-            quizExerciseMultipleChoice.tickAnswerOption(exercise.id!, 0);
-            quizExerciseMultipleChoice.tickAnswerOption(exercise.id!, 2);
-            quizExerciseMultipleChoice.submit().then((request: Interception) => {
-                expect(request.response!.body.submitted).to.be.true;
-                expect(request.response!.statusCode).to.eq(200);
-            });
-        });
-    });
-
-    it('Imports modeling exercise', () => {
-        cy.login(instructor, `/course-management/${secondCourse.id}/exercises`);
-        courseManagementExercises.importModelingExercise();
-        courseManagementExercises.clickImportExercise(modelingExercise.id!);
-
-        checkField('#field_title', modelingExercise.title!);
-        checkField('#field_points', modelingExercise.maxPoints!);
-
-        modelingExerciseCreation.setReleaseDate(dayjs());
-        modelingExerciseCreation.setDueDate(dayjs().add(1, 'days'));
-        modelingExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days'));
-
-        modelingExerciseCreation.import().then((request: Interception) => {
-            const exercise = request.response!.body;
-            cy.login(studentOne, `/courses/${secondCourse.id}`);
-            courseOverview.openExerciseOverview(exercise.title!);
-            courseOverview.startExercise(exercise.id!);
-            courseOverview.openRunningExercise(exercise.id!);
-            modelingExerciseEditor.addComponentToModel(exercise.id!, 1);
-            modelingExerciseEditor.addComponentToModel(exercise.id!, 2);
-            modelingExerciseEditor.addComponentToModel(exercise.id!, 3);
-            modelingExerciseEditor.submit().then((request: Interception) => {
-                expect(request.response!.body.submitted).to.be.true;
-                expect(request.response!.statusCode).to.eq(200);
-            });
-        });
-    });
-
-    it('Imports programming exercise', () => {
-        cy.login(instructor, `/course-management/${secondCourse.id}/exercises`);
-        courseManagementExercises.importProgrammingExercise();
-        courseManagementExercises.clickImportExercise(programmingExercise.id!);
-
-        checkField('#field_points', programmingExercise.maxPoints!);
-
-        programmingExerciseCreation.setTitle('Import Test');
-        programmingExerciseCreation.setShortName('importtest' + generateUUID());
-        programmingExerciseCreation.setDueDate(dayjs().add(3, 'days'));
-
-        programmingExerciseCreation.import().then((request: Interception) => {
-            const exercise = request.response!.body;
-            cy.login(studentOne, `/courses/${secondCourse.id}`);
-            courseOverview.openExerciseOverview(exercise.title!);
-            courseOverview.startExercise(exercise.id!);
-            courseOverview.openRunningExercise(exercise.id!);
-            programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaPartiallySuccessfulSubmission, () => {
-                programmingExerciseEditor.getResultScore().contains(javaPartiallySuccessfulSubmission.expectedResult).and('be.visible');
-            });
-        });
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseAssessment.cy.ts b/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseAssessment.cy.ts
deleted file mode 100644
index fa19aa4b05f6..000000000000
--- a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseAssessment.cy.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-
-import {
-    courseAssessment,
-    courseManagement,
-    courseManagementAPIRequest,
-    courseOverview,
-    exerciseAPIRequest,
-    exerciseAssessment,
-    exerciseResult,
-    fileUploadExerciseAssessment,
-    fileUploadExerciseEditor,
-    fileUploadExerciseFeedback,
-} from '../../../support/artemis';
-import { admin, instructor, studentOne, tutor } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-// Common primitives
-const tutorFeedback = 'Try to use some newlines next time!';
-const tutorFeedbackPoints = 4;
-const complaint = "That feedback wasn't very useful!";
-
-describe.skip('File upload exercise assessment', () => {
-    let course: Course;
-    let exercise: FileUploadExercise;
-
-    before('Creates a file upload exercise and makes a student submission', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            exerciseAPIRequest.createFileUploadExercise({ course }).then((textResponse) => {
-                exercise = textResponse.body;
-                cy.login(studentOne, `/courses/${course.id}/exercises`);
-                courseOverview.startExercise(exercise.id!);
-                courseOverview.openRunningExercise(exercise.id!);
-                fileUploadExerciseEditor.attachFile('pdf-test-file.pdf');
-                fileUploadExerciseEditor.submit();
-            });
-        });
-    });
-
-    it('Assesses the file upload exercise submission', () => {
-        cy.login(tutor, '/course-management');
-        courseManagement.openAssessmentDashboardOfCourse(course.id!);
-        courseAssessment.clickExerciseDashboardButton();
-        exerciseAssessment.clickHaveReadInstructionsButton();
-        exerciseAssessment.clickStartNewAssessment();
-        fileUploadExerciseAssessment.getInstructionsRootElement().contains(exercise.title!).should('be.visible');
-        fileUploadExerciseAssessment.getInstructionsRootElement().contains(exercise.problemStatement!).should('be.visible');
-        fileUploadExerciseAssessment.getInstructionsRootElement().contains(exercise.exampleSolution!).should('be.visible');
-        fileUploadExerciseAssessment.getInstructionsRootElement().contains(exercise.gradingInstructions!).should('be.visible');
-        fileUploadExerciseAssessment.addNewFeedback(tutorFeedbackPoints, tutorFeedback);
-        fileUploadExerciseAssessment.submitFeedback();
-    });
-
-    describe('Feedback', () => {
-        it('Student sees feedback after assessment due date and complains', () => {
-            cy.login(studentOne, `/courses/${course.id}/exercises/${exercise.id}`);
-            const percentage = tutorFeedbackPoints * 10;
-            exerciseResult.shouldShowExerciseTitle(exercise.title!);
-            exerciseResult.shouldShowProblemStatement(exercise.problemStatement!);
-            exerciseResult.shouldShowScore(percentage);
-            exerciseResult.clickOpenExercise(exercise.id!);
-            fileUploadExerciseFeedback.shouldShowAdditionalFeedback(tutorFeedbackPoints, tutorFeedback);
-            fileUploadExerciseFeedback.shouldShowScore(percentage);
-            fileUploadExerciseFeedback.complain(complaint);
-        });
-
-        it('Instructor can see complaint and reject it', () => {
-            cy.login(instructor, `/course-management/${course.id}/complaints`);
-            fileUploadExerciseAssessment.acceptComplaint('Makes sense', false).its('response.statusCode').should('eq', 200);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseManagement.cy.ts b/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseManagement.cy.ts
deleted file mode 100644
index 199c15c05eb9..000000000000
--- a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseManagement.cy.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-
-import { courseManagement, courseManagementAPIRequest, courseManagementExercises, exerciseAPIRequest, fileUploadExerciseCreation, navigationBar } from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-describe.skip('File upload exercise management', () => {
-    let course: Course;
-
-    before(() => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    it('Creates a file upload exercise in the UI', { scrollBehavior: 'center' }, () => {
-        cy.visit('/');
-        navigationBar.openCourseManagement();
-        courseManagement.openExercisesOfCourse(course.id!);
-        courseManagementExercises.createFileUploadExercise();
-
-        // Fill out file upload exercise form
-        const exerciseTitle = 'file upload exercise' + generateUUID();
-        fileUploadExerciseCreation.typeTitle(exerciseTitle);
-        fileUploadExerciseCreation.setReleaseDate(dayjs());
-        fileUploadExerciseCreation.setDueDate(dayjs().add(1, 'days'));
-        fileUploadExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days'));
-        fileUploadExerciseCreation.typeMaxPoints(10);
-        const problemStatement = 'This is a problem statement';
-        const exampleSolution = 'E = mc^2';
-        fileUploadExerciseCreation.typeProblemStatement(problemStatement);
-        fileUploadExerciseCreation.typeExampleSolution(exampleSolution);
-        let exercise: FileUploadExercise;
-        fileUploadExerciseCreation.create().then((request: Interception) => {
-            exercise = request.response!.body;
-        });
-
-        // Make sure file upload exercise is shown in exercises list
-        cy.visit(`course-management/${course.id}/exercises`).then(() => {
-            courseManagementExercises.getExercise(exercise.id!).should('be.visible');
-        });
-    });
-
-    describe('File upload exercise deletion', () => {
-        let exercise: FileUploadExercise;
-
-        before(() => {
-            cy.login(admin, '/');
-            exerciseAPIRequest.createFileUploadExercise({ course }).then((response) => {
-                exercise = response.body;
-            });
-        });
-
-        it('Deletes an existing file upload exercise', () => {
-            cy.login(admin, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.deleteFileUploadExercise(exercise);
-            courseManagementExercises.getExercise(exercise.id!).should('not.exist');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseParticipation.cy.ts b/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseParticipation.cy.ts
deleted file mode 100644
index a8c35cc2c7e8..000000000000
--- a/src/test/cypress/e2e/exercises/file-upload/FileUploadExerciseParticipation.cy.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest, fileUploadExerciseEditor } from '../../../support/artemis';
-import { admin, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('File upload exercise participation', () => {
-    let course: Course;
-    let exercise: FileUploadExercise;
-
-    before(() => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            exerciseAPIRequest.createFileUploadExercise({ course }).then((exerciseResponse) => {
-                exercise = exerciseResponse.body;
-            });
-        });
-    });
-
-    it('Creates a file upload exercise in the UI', () => {
-        cy.login(studentOne, `/courses/${course.id}/exercises`);
-        courseOverview.startExercise(exercise.id!);
-        courseOverview.openRunningExercise(exercise.id!);
-
-        // Verify the initial state of the text editor
-        fileUploadExerciseEditor.shouldShowExerciseTitleInHeader(exercise.title!);
-        fileUploadExerciseEditor.shouldShowProblemStatement();
-
-        // Make a submission
-        fileUploadExerciseEditor.attachFile('pdf-test-file.pdf');
-        fileUploadExerciseEditor.submit().then((request: Interception) => {
-            expect(request.response!.body.submitted).to.be.true;
-            expect(request.response!.statusCode).to.eq(200);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseAssessment.cy.ts b/src/test/cypress/e2e/exercises/modeling/ModelingExerciseAssessment.cy.ts
deleted file mode 100644
index 235cac1ddd9a..000000000000
--- a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseAssessment.cy.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-
-import {
-    courseAssessment,
-    courseManagement,
-    courseManagementAPIRequest,
-    exerciseAPIRequest,
-    exerciseAssessment,
-    exerciseResult,
-    modelingExerciseAssessment,
-    modelingExerciseFeedback,
-} from '../../../support/artemis';
-import { admin, instructor, studentOne, tutor } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Modeling Exercise Assessment', () => {
-    let course: Course;
-    let modelingExercise: ModelingExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            exerciseAPIRequest.createModelingExercise({ course }).then((modelingResponse) => {
-                modelingExercise = modelingResponse.body;
-                cy.login(studentOne);
-                cy.wait(500);
-                exerciseAPIRequest.startExerciseParticipation(modelingExercise.id!).then((participation) => {
-                    exerciseAPIRequest.makeModelingExerciseSubmission(modelingExercise.id!, participation.body);
-                    cy.login(instructor);
-                    exerciseAPIRequest.updateModelingExerciseDueDate(modelingExercise, dayjs().add(5, 'seconds'));
-                });
-            });
-        });
-    });
-
-    it('Tutor can assess a submission', () => {
-        cy.login(tutor, '/course-management');
-        courseManagement.openAssessmentDashboardOfCourse(course.id!);
-        cy.wait(500);
-        courseAssessment.clickExerciseDashboardButton();
-        exerciseAssessment.clickHaveReadInstructionsButton();
-        exerciseAssessment.clickStartNewAssessment();
-        exerciseAssessment.getLockedMessage().should('be.visible');
-        modelingExerciseAssessment.addNewFeedback(1, 'Thanks, good job.');
-        modelingExerciseAssessment.openAssessmentForComponent(1);
-        modelingExerciseAssessment.assessComponent(-1, 'False');
-        modelingExerciseAssessment.clickNextAssessment();
-        modelingExerciseAssessment.assessComponent(2, 'Good');
-        modelingExerciseAssessment.clickNextAssessment();
-        modelingExerciseAssessment.assessComponent(0, 'Unnecessary');
-        modelingExerciseAssessment.submit();
-    });
-
-    describe('Handling complaints', () => {
-        before(() => {
-            cy.login(admin);
-            exerciseAPIRequest
-                .updateModelingExerciseAssessmentDueDate(modelingExercise, dayjs())
-                .its('body')
-                .then((exercise) => {
-                    modelingExercise = exercise;
-                });
-        });
-
-        it('Student can view the assessment and complain', () => {
-            cy.login(studentOne, `/courses/${course.id}/exercises/${modelingExercise.id}`);
-            exerciseResult.shouldShowExerciseTitle(modelingExercise.title!);
-            exerciseResult.shouldShowScore(20);
-            exerciseResult.clickOpenExercise(modelingExercise.id!);
-            modelingExerciseFeedback.shouldShowScore(20);
-            modelingExerciseFeedback.shouldShowAdditionalFeedback(1, 'Thanks, good job.');
-            modelingExerciseFeedback.shouldShowComponentFeedback(1, 2, 'Good');
-            modelingExerciseFeedback.complain('I am not happy with your assessment.');
-        });
-
-        it('Instructor can see complaint and reject it', () => {
-            cy.login(instructor, `/course-management/${course.id}/complaints`);
-            courseAssessment.showTheComplaint();
-            modelingExerciseAssessment.rejectComplaint('You are wrong.', false);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseManagement.cy.ts b/src/test/cypress/e2e/exercises/modeling/ModelingExerciseManagement.cy.ts
deleted file mode 100644
index e453c5bbc4fb..000000000000
--- a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseManagement.cy.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import dayjs from 'dayjs/esm';
-import { MODELING_EDITOR_CANVAS } from 'src/test/cypress/support/constants';
-
-import { Course } from 'app/entities/course.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-
-import {
-    courseManagement,
-    courseManagementAPIRequest,
-    courseManagementExercises,
-    courseOverview,
-    exerciseAPIRequest,
-    modelingExerciseAssessment,
-    modelingExerciseCreation,
-    modelingExerciseEditor,
-    navigationBar,
-} from '../../../support/artemis';
-import { admin, instructor, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-describe.skip('Modeling Exercise Management', () => {
-    let course: Course;
-    let modelingExercise: ModelingExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response: Cypress.Response<Course>) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-        });
-    });
-
-    describe('Create Modeling Exercise', () => {
-        it('Create a new modeling exercise', { scrollBehavior: 'center' }, () => {
-            cy.login(instructor);
-            cy.visit(`/course-management/${course.id}/exercises`);
-            courseManagementExercises.createModelingExercise();
-            modelingExerciseCreation.setTitle('Modeling ' + generateUUID());
-            modelingExerciseCreation.addCategories(['e2e-testing', 'test2']);
-            modelingExerciseCreation.setPoints(10);
-            modelingExerciseCreation
-                .save()
-                .its('response.body')
-                .then((body: any) => {
-                    modelingExercise = body;
-                    cy.contains(modelingExercise.title!).should('exist');
-                    cy.log('Create Example Solution');
-                    cy.visit(`/course-management/${course.id}/modeling-exercises/${modelingExercise.id}/edit`);
-                    modelingExerciseEditor.addComponentToExampleSolutionModel(1);
-                    modelingExerciseCreation.save();
-                    cy.get(MODELING_EDITOR_CANVAS).children().eq(0).should('exist');
-
-                    cy.log('Create Example Submission');
-                    cy.visit(`/course-management/${course.id}/modeling-exercises/${modelingExercise.id}/example-submissions`);
-                    modelingExerciseEditor.clickCreateExampleSubmission();
-                    modelingExerciseEditor.addComponentToExampleSolutionModel(1);
-                    modelingExerciseEditor.addComponentToExampleSolutionModel(2);
-                    modelingExerciseEditor.addComponentToExampleSolutionModel(3);
-                    modelingExerciseEditor.clickCreateNewExampleSubmission();
-                    modelingExerciseEditor.showExampleAssessment();
-                    modelingExerciseAssessment.openAssessmentForComponent(1);
-                    modelingExerciseAssessment.assessComponent(-1, 'False');
-                    modelingExerciseAssessment.clickNextAssessment();
-                    modelingExerciseAssessment.assessComponent(2, 'Good');
-                    modelingExerciseAssessment.clickNextAssessment();
-                    modelingExerciseAssessment.assessComponent(0, 'Unnecessary');
-                    modelingExerciseAssessment.submitExample();
-                    cy.visit(`/course-management/${course.id}/modeling-exercises/${modelingExercise.id}`);
-                    modelingExerciseEditor.getModelingCanvas().should('exist');
-                });
-        });
-
-        after('Delete modeling exercise', () => {
-            if (modelingExercise) {
-                cy.login(admin);
-                exerciseAPIRequest.deleteModelingExercise(modelingExercise.id!);
-            }
-        });
-    });
-
-    describe('Edit Modeling Exercise', () => {
-        before('Create Modeling Exercise', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createModelingExercise({ course }).then((resp) => {
-                modelingExercise = resp.body;
-            });
-        });
-
-        it('Edit Existing Modeling Exercise', { scrollBehavior: 'center' }, () => {
-            cy.visit(`/course-management/${course.id}/modeling-exercises/${modelingExercise.id}/edit`);
-            const newTitle = 'New Modeling Exercise Title';
-            const points = 100;
-            modelingExerciseCreation.setTitle(newTitle);
-            modelingExerciseCreation.pickDifficulty({ hard: true });
-            modelingExerciseCreation.setReleaseDate(dayjs().add(1, 'day'));
-            modelingExerciseCreation.setDueDate(dayjs().add(2, 'day'));
-            modelingExerciseCreation.setAssessmentDueDate(dayjs().add(3, 'day'));
-            modelingExerciseCreation.includeInOverallScore();
-            modelingExerciseCreation.setPoints(points);
-            modelingExerciseCreation.save();
-            cy.visit(`/course-management/${course.id}/exercises`);
-            courseManagementExercises.getModelingExerciseTitle(modelingExercise.id!).contains(newTitle);
-            courseManagementExercises.getModelingExerciseMaxPoints(modelingExercise.id!).contains(points.toString());
-        });
-
-        after('Delete exercise', () => {
-            exerciseAPIRequest.deleteModelingExercise(modelingExercise.id!);
-        });
-    });
-
-    describe('Delete Modeling Exercise', () => {
-        let modelingExercise: ModelingExercise;
-
-        before('Create Modeling exercise', () => {
-            cy.login(admin, '/');
-            exerciseAPIRequest.createModelingExercise({ course }).then((resp) => {
-                modelingExercise = resp.body;
-            });
-        });
-
-        it('Deletes an existing Modeling exercise', () => {
-            cy.login(instructor, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.deleteModelingExercise(modelingExercise);
-            courseManagementExercises.getExercise(modelingExercise.id!).should('not.exist');
-        });
-    });
-
-    describe('Modeling Exercise Release', () => {
-        it('Student can not see unreleased Modeling Exercise', () => {
-            cy.login(instructor);
-            exerciseAPIRequest.createModelingExercise({ course }, 'Modeling ' + generateUUID(), dayjs().add(1, 'hour')).then((resp) => {
-                modelingExercise = resp.body;
-            });
-            cy.login(studentOne, '/courses');
-            cy.contains(course.title!).click({ force: true });
-            courseOverview.getExercises().should('have.length', 0);
-        });
-
-        it('Student can see released Modeling Exercise', () => {
-            cy.login(instructor);
-            exerciseAPIRequest.createModelingExercise({ course }, 'Modeling ' + generateUUID(), dayjs().subtract(1, 'hour')).then((resp) => {
-                modelingExercise = resp.body;
-            });
-            cy.login(studentOne, '/courses');
-            cy.visit('/courses/' + course.id + '/exercises/' + modelingExercise.id);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseParticipation.cy.ts b/src/test/cypress/e2e/exercises/modeling/ModelingExerciseParticipation.cy.ts
deleted file mode 100644
index dcbf04bc2918..000000000000
--- a/src/test/cypress/e2e/exercises/modeling/ModelingExerciseParticipation.cy.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest, modelingExerciseEditor } from '../../../support/artemis';
-import { admin, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Modeling Exercise Participation', () => {
-    let course: Course;
-    let modelingExercise: ModelingExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response: Cypress.Response<Course>) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            exerciseAPIRequest.createModelingExercise({ course }).then((resp: Cypress.Response<ModelingExercise>) => {
-                modelingExercise = resp.body;
-            });
-        });
-    });
-
-    it('Student can start and submit their model', () => {
-        cy.login(studentOne, `/courses/${course.id}`);
-        courseOverview.startExercise(modelingExercise.id!);
-        courseOverview.openRunningExercise(modelingExercise.id!);
-        modelingExerciseEditor.addComponentToModel(modelingExercise.id!, 1, false, 310, 320);
-        modelingExerciseEditor.addComponentToModel(modelingExercise.id!, 2, false, 730, 500);
-        modelingExerciseEditor.addComponentToModel(modelingExercise.id!, 3, false, 1000, 100);
-        modelingExerciseEditor.submit();
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseAssessment.cy.ts b/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseAssessment.cy.ts
deleted file mode 100644
index c8ba45de348e..000000000000
--- a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseAssessment.cy.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-
-import {
-    courseAssessment,
-    courseManagement,
-    courseManagementAPIRequest,
-    exerciseAPIRequest,
-    exerciseAssessment,
-    exerciseResult,
-    programmingExerciseAssessment,
-    programmingExerciseEditor,
-    programmingExerciseFeedback,
-} from '../../../support/artemis';
-import { ProgrammingExerciseAssessmentType } from '../../../support/constants';
-import { admin, instructor, studentOne, tutor } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-// Common primitives
-const tutorFeedback = 'You are missing some classes! The classes, which you implemented look good though.';
-const tutorFeedbackPoints = 5;
-const tutorCodeFeedback = 'The input parameter should be mentioned in javadoc!';
-const tutorCodeFeedbackPoints = -2;
-const complaint = "That feedback wasn't very useful!";
-
-describe.skip('Programming exercise assessment', () => {
-    let course: Course;
-    let exercise: ProgrammingExercise;
-    let dueDate: dayjs.Dayjs;
-    let assessmentDueDate: dayjs.Dayjs;
-
-    before('Creates a programming exercise and makes a student submission', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            dueDate = dayjs().add(25, 'seconds');
-            assessmentDueDate = dueDate.add(30, 'seconds');
-            exerciseAPIRequest
-                .createProgrammingExercise({
-                    course,
-                    recordTestwiseCoverage: false,
-                    releaseDate: dayjs(),
-                    dueDate: dueDate,
-                    assessmentDate: assessmentDueDate,
-                    assessmentType: ProgrammingExerciseAssessmentType.SEMI_AUTOMATIC,
-                })
-                .then((programmingResponse) => {
-                    exercise = programmingResponse.body;
-                    cy.login(studentOne);
-                    exerciseAPIRequest
-                        .startExerciseParticipation(exercise.id!)
-                        .its('body.id')
-                        .then((participationId) => {
-                            exerciseAPIRequest.makeProgrammingExerciseSubmission(participationId);
-                            // Wait until the due date is in the past
-                            const now = dayjs();
-                            if (now.isBefore(dueDate)) {
-                                cy.wait(dueDate.diff(now, 'ms'));
-                            }
-                        });
-                });
-        });
-    });
-
-    /*
-     * Skipped because the hovering behavior required to manually assess a submission is not supported by Cypress.
-     * Please refer to the playwright E2E test.
-     */
-    it.skip('Assesses the programming exercise submission and verifies it', () => {
-        // Asses submission
-        cy.login(tutor, '/course-management');
-        courseManagement.openAssessmentDashboardOfCourse(course.id!);
-        courseAssessment.clickExerciseDashboardButton();
-        exerciseAssessment.clickHaveReadInstructionsButton();
-        exerciseAssessment.clickStartNewAssessment();
-        programmingExerciseEditor.openFileWithName(exercise.id!, 'BubbleSort.java');
-        programmingExerciseAssessment.provideFeedbackOnCodeLine(9, tutorCodeFeedbackPoints, tutorCodeFeedback);
-        programmingExerciseAssessment.addNewFeedback(tutorFeedbackPoints, tutorFeedback);
-        programmingExerciseAssessment.submit().then((request: Interception) => {
-            expect(request.response!.statusCode).to.eq(200);
-            // Wait until the assessment due date is over
-            const now = dayjs();
-            if (now.isBefore(assessmentDueDate)) {
-                cy.wait(assessmentDueDate.diff(now, 'ms'));
-            }
-        });
-
-        // Verify assessment as student
-        cy.login(studentOne, `/courses/${course.id}/exercises/${exercise.id}`);
-        const totalPoints = tutorFeedbackPoints + tutorCodeFeedbackPoints;
-        const percentage = totalPoints * 10;
-        exerciseResult.shouldShowExerciseTitle(exercise.title!);
-        programmingExerciseFeedback.complain(complaint);
-        exerciseResult.clickOpenCodeEditor(exercise.id!);
-        programmingExerciseFeedback.shouldShowRepositoryLockedWarning();
-        programmingExerciseFeedback.shouldShowAdditionalFeedback(tutorFeedbackPoints, tutorFeedback);
-        programmingExerciseFeedback.shouldShowScore(percentage);
-        programmingExerciseFeedback.shouldShowCodeFeedback(exercise.id!, 'BubbleSort.java', tutorCodeFeedback, '-2', programmingExerciseEditor);
-
-        // Accept complaint
-        cy.login(instructor, `/course-management/${course.id}/complaints`);
-        programmingExerciseAssessment.acceptComplaint('Makes sense', false).then((request: Interception) => {
-            expect(request.response!.statusCode).to.equal(200);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseManagement.cy.ts b/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseManagement.cy.ts
deleted file mode 100644
index e775d2174b3c..000000000000
--- a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseManagement.cy.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-
-import { courseManagement, courseManagementAPIRequest, courseManagementExercises, exerciseAPIRequest, navigationBar, programmingExerciseCreation } from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-describe.skip('Programming Exercise Management', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    describe('Programming exercise creation', () => {
-        it('Creates a new programming exercise', { scrollBehavior: 'center' }, () => {
-            cy.login(admin, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.createProgrammingExercise();
-            cy.url().should('include', '/programming-exercises/new');
-            cy.log('Filling out programming exercise info...');
-            const exerciseTitle = 'Programming exercise ' + generateUUID();
-            programmingExerciseCreation.setTitle(exerciseTitle);
-            programmingExerciseCreation.setShortName('programming' + generateUUID());
-            programmingExerciseCreation.setPackageName('de.test');
-            programmingExerciseCreation.setPoints(100);
-            programmingExerciseCreation.checkAllowOnlineEditor();
-            programmingExerciseCreation.generate().then((request: Interception) => {
-                const exercise = request.response!.body;
-                courseManagementExercises.getExerciseTitle().should('contain.text', exerciseTitle);
-                cy.url().should('include', `/programming-exercises/${exercise.id}`);
-            });
-        });
-    });
-
-    describe('Programming exercise deletion', () => {
-        let exercise: ProgrammingExercise;
-
-        before(() => {
-            cy.login(admin, '/');
-            exerciseAPIRequest.createProgrammingExercise({ course }).then((response) => {
-                exercise = response.body;
-            });
-        });
-
-        it('Deletes an existing programming exercise', () => {
-            cy.login(admin, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.deleteProgrammingExercise(exercise);
-            courseManagementExercises.getExercise(exercise.id!).should('not.exist');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseParticipation.cy.ts b/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseParticipation.cy.ts
deleted file mode 100644
index 7f915290e41d..000000000000
--- a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseParticipation.cy.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-
-import cAllSuccessful from '../../../fixtures/exercise/programming/c/all_successful/submission.json';
-import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json';
-import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
-import javaPartiallySuccessfulSubmission from '../../../fixtures/exercise/programming/java/partially_successful/submission.json';
-import pythonAllSuccessful from '../../../fixtures/exercise/programming/python/all_successful/submission.json';
-import { courseManagementAPIRequest, exerciseAPIRequest, programmingExerciseEditor } from '../../../support/artemis';
-import { ProgrammingLanguage } from '../../../support/constants';
-import { admin, studentOne, studentThree, studentTwo } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Programming exercise participation', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin, '/');
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addStudentToCourse(course, studentTwo);
-            courseManagementAPIRequest.addStudentToCourse(course, studentThree);
-        });
-    });
-
-    describe('Java programming exercise', () => {
-        let exercise: ProgrammingExercise;
-
-        before('Setup java programming exercise', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createProgrammingExercise({ course, programmingLanguage: ProgrammingLanguage.JAVA }).then((exerciseResponse) => {
-                exercise = exerciseResponse.body;
-            });
-        });
-
-        it('Makes a failing submission', () => {
-            programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
-            const submission = javaBuildErrorSubmission;
-            programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
-                programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
-            });
-        });
-
-        it('Makes a partially successful submission', () => {
-            programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentTwo);
-            const submission = javaPartiallySuccessfulSubmission;
-            programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
-                programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
-            });
-        });
-
-        it('Makes a successful submission', () => {
-            programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentThree);
-            const submission = javaAllSuccessfulSubmission;
-            programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
-                programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
-            });
-        });
-    });
-
-    // Skip C tests within Jenkins used by the Postgres setup, since C is currently not supported there
-    // See https://github.com/ls1intum/Artemis/issues/6994
-    if (Cypress.env('DB_TYPE') !== 'Postgres') {
-        describe('C programming exercise', () => {
-            let exercise: ProgrammingExercise;
-
-            before('Setup c programming exercise', () => {
-                cy.login(admin);
-                exerciseAPIRequest.createProgrammingExercise({ course, programmingLanguage: ProgrammingLanguage.C }).then((exerciseResponse) => {
-                    exercise = exerciseResponse.body;
-                });
-            });
-
-            it('Makes a submission', () => {
-                programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
-                const submission = cAllSuccessful;
-                programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
-                    programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
-                });
-            });
-        });
-    }
-
-    describe('Python programming exercise', () => {
-        let exercise: ProgrammingExercise;
-
-        before('Setup python programming exercise', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createProgrammingExercise({ course, programmingLanguage: ProgrammingLanguage.PYTHON }).then((exerciseResponse) => {
-                exercise = exerciseResponse.body;
-            });
-        });
-
-        it('Makes a submission', () => {
-            programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
-            const submission = pythonAllSuccessful;
-            programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, submission, () => {
-                programmingExerciseEditor.getResultScore().contains(submission.expectedResult).and('be.visible');
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseStaticCodeAnalysis.cy.ts b/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseStaticCodeAnalysis.cy.ts
deleted file mode 100644
index 9f06db6704d8..000000000000
--- a/src/test/cypress/e2e/exercises/programming/ProgrammingExerciseStaticCodeAnalysis.cy.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-
-import javaScaSubmission from '../../../fixtures/exercise/programming/java/static_code_analysis/submission.json';
-import { courseManagementAPIRequest, exerciseAPIRequest, programmingExerciseEditor, programmingExerciseScaFeedback, programmingExercisesScaConfig } from '../../../support/artemis';
-import { admin, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Static code analysis tests', () => {
-    let course: Course;
-    let exercise: ProgrammingExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse({ customizeGroups: true }).then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            exerciseAPIRequest.createProgrammingExercise({ course, scaMaxPenalty: 50 }).then((exerciseResponse) => {
-                exercise = exerciseResponse.body;
-            });
-        });
-    });
-
-    it('Configures SCA grading and makes a successful submission with SCA errors', () => {
-        // Configure SCA grading
-        cy.login(admin);
-        programmingExercisesScaConfig.visit(course.id!, exercise.id!);
-        programmingExercisesScaConfig.makeEveryScaCategoryInfluenceGrading();
-        programmingExercisesScaConfig.saveChanges();
-
-        // Make submission with SCA errors
-        programmingExerciseEditor.startParticipation(course.id!, exercise.id!, studentOne);
-        programmingExerciseEditor.makeSubmissionAndVerifyResults(exercise.id!, javaScaSubmission, () => {
-            programmingExerciseEditor.getResultScore().contains(javaScaSubmission.expectedResult).and('be.visible').click();
-            programmingExerciseScaFeedback.shouldShowPointChart();
-            // We have to verify those static texts here. If we don't verify those messages the only difference between the SCA and normal programming exercise
-            // tests is the score, which hardly verifies the SCA functionality
-            programmingExerciseScaFeedback.shouldShowCodeIssue("Variable 'literal1' must be private and have accessor methods.", '5');
-            programmingExerciseScaFeedback.shouldShowCodeIssue("Avoid unused private fields such as 'LITERAL_TWO'.", '0.5');
-            programmingExerciseScaFeedback.shouldShowCodeIssue("de.test.BubbleSort.literal1 isn't final but should be", '2.5');
-            programmingExerciseScaFeedback.shouldShowCodeIssue('Unread public/protected field: de.test.BubbleSort.literal1', '0.2');
-            programmingExerciseScaFeedback.closeModal();
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseAssessment.cy.ts b/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseAssessment.cy.ts
deleted file mode 100644
index 2a76b25de58c..000000000000
--- a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseAssessment.cy.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import multipleChoiceQuizTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json';
-import shortAnswerQuizTemplate from '../../../fixtures/exercise/quiz/short_answer/template.json';
-import { courseManagementAPIRequest, exerciseAPIRequest, exerciseResult } from '../../../support/artemis';
-import { admin, studentOne, tutor } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Quiz Exercise Assessment', () => {
-    let course: Course;
-    let quizExercise: QuizExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-        });
-    });
-
-    describe(
-        'MC Quiz assessment',
-        {
-            retries: 2,
-        },
-        () => {
-            it('Assesses a mc quiz submission automatically', () => {
-                cy.login(admin);
-                exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate], undefined, undefined, 10).then((quizResponse) => {
-                    quizExercise = convertModelAfterMultiPart(quizResponse);
-                    exerciseAPIRequest.setQuizVisible(quizExercise.id!);
-                    exerciseAPIRequest.startQuizNow(quizExercise.id!);
-                    cy.login(studentOne);
-                    exerciseAPIRequest.startExerciseParticipation(quizExercise.id!);
-                    exerciseAPIRequest.createMultipleChoiceSubmission(quizExercise, [0, 2]);
-                    cy.visit('/courses/' + course.id + '/exercises/' + quizExercise.id);
-                    exerciseResult.shouldShowScore(50);
-                });
-            });
-        },
-    );
-
-    describe(
-        'SA Quiz assessment',
-        {
-            retries: 2,
-        },
-        () => {
-            it('Assesses a sa quiz submission automatically', () => {
-                cy.login(admin);
-                exerciseAPIRequest.createQuizExercise({ course }, [shortAnswerQuizTemplate], undefined, undefined, 10).then((quizResponse) => {
-                    quizExercise = convertModelAfterMultiPart(quizResponse);
-                    exerciseAPIRequest.setQuizVisible(quizExercise.id!);
-                    exerciseAPIRequest.startQuizNow(quizExercise.id!);
-                    cy.login(studentOne);
-                    exerciseAPIRequest.startExerciseParticipation(quizExercise.id!);
-                    exerciseAPIRequest.createShortAnswerSubmission(quizExercise, ['give', 'let', 'run', 'desert']);
-                    cy.visit('/courses/' + course.id + '/exercises/' + quizExercise.id);
-                    exerciseResult.shouldShowScore(66.7);
-                });
-            });
-        },
-    );
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseDropLocation.cy.ts b/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseDropLocation.cy.ts
deleted file mode 100644
index f56ba79fc8f3..000000000000
--- a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseDropLocation.cy.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Course } from 'app/entities/course.model';
-
-import { courseManagementAPIRequest, courseManagementExercises, quizExerciseCreation, quizExerciseDragAndDropQuiz } from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-let course: Course;
-
-describe.skip('Quiz Exercise Drop Location Spec', () => {
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    describe('DnD Quiz drop locations', () => {
-        before('Create DND quiz', () => {
-            cy.login(admin, '/course-management/' + course.id + '/exercises');
-            courseManagementExercises.createQuizExercise();
-            quizExerciseCreation.setTitle('Quiz Exercise ' + generateUUID());
-            quizExerciseDragAndDropQuiz.createDnDQuiz('DnD Quiz Test');
-        });
-
-        it('Checks drop locations', () => {
-            let containerBounds: DOMRect;
-
-            quizExerciseDragAndDropQuiz.dragUsingCoordinates(310, 320);
-            quizExerciseDragAndDropQuiz.dragUsingCoordinates(730, 500);
-            quizExerciseDragAndDropQuiz.dragUsingCoordinates(730, 320);
-
-            quizExerciseDragAndDropQuiz.activateInteractiveMode();
-
-            quizExerciseDragAndDropQuiz.markElementAsInteractive(0, 4);
-            quizExerciseDragAndDropQuiz.markElementAsInteractive(1, 3);
-            quizExerciseDragAndDropQuiz.markElementAsInteractive(2, 3);
-            quizExerciseDragAndDropQuiz.markElementAsInteractive(2, 4);
-
-            quizExerciseDragAndDropQuiz.generateQuizExercise();
-            quizExerciseDragAndDropQuiz.waitForQuizExerciseToBeGenerated();
-
-            cy.visit(`/course-management/${course.id}/exercises`);
-            quizExerciseDragAndDropQuiz.previewQuiz();
-            quizExerciseDragAndDropQuiz.waitForQuizPreviewToLoad();
-
-            cy.get('.click-layer').then(($el) => {
-                containerBounds = $el[0].getBoundingClientRect();
-            });
-
-            cy.get('.drop-location').then(($els) => {
-                const { minX, maxX } = quizExerciseDragAndDropQuiz.getXAxis($els);
-                expect(containerBounds.right - maxX).to.be.greaterThan(0);
-                expect(minX - containerBounds.left).to.be.greaterThan(0);
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseManagement.cy.ts b/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseManagement.cy.ts
deleted file mode 100644
index b26cec263fac..000000000000
--- a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseManagement.cy.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import { Course } from 'app/entities/course.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import multipleChoiceTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json';
-import { courseManagement, courseManagementAPIRequest, courseManagementExercises, exerciseAPIRequest, navigationBar, quizExerciseCreation } from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-describe.skip('Quiz Exercise Management', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    describe('Quiz Exercise Creation', () => {
-        beforeEach(() => {
-            cy.login(admin, '/course-management/');
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.createQuizExercise();
-            quizExerciseCreation.setTitle('Quiz Exercise ' + generateUUID());
-        });
-
-        it('Creates a Quiz with Multiple Choice', () => {
-            const title = 'Multiple Choice Quiz';
-            quizExerciseCreation.addMultipleChoiceQuestion(title);
-            quizExerciseCreation.saveQuiz().then((quizResponse: Interception) => {
-                cy.visit('/course-management/' + course.id + '/quiz-exercises/' + quizResponse.response!.body.id + '/preview');
-                cy.contains(title).should('be.visible');
-            });
-        });
-
-        it('Creates a Quiz with Short Answer', () => {
-            const title = 'Short Answer Quiz';
-            quizExerciseCreation.addShortAnswerQuestion(title);
-            quizExerciseCreation.saveQuiz().then((quizResponse: Interception) => {
-                cy.visit('/course-management/' + course.id + '/quiz-exercises/' + quizResponse.response!.body.id + '/preview');
-                cy.contains(title).should('be.visible');
-            });
-        });
-
-        // TODO: Fix the drag and drop
-        // it.skip('Creates a Quiz with Drag and Drop', () => {
-        //     quizExerciseCreation.addDragAndDropQuestion(quizQuestionTitle);
-        //     quizExerciseCreation.saveQuiz().then((quizResponse: Interception) => {
-        //         cy.visit('/course-management/' + course.id + '/quiz-exercises/' + quizResponse.response!.body.id + '/preview');
-        //         cy.contains(quizQuestionTitle).should('be.visible');
-        //     });
-        // });
-    });
-
-    describe('Quiz Exercise deletion', () => {
-        let quizExercise: QuizExercise;
-
-        before('Create quiz Exercise', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceTemplate]).then((quizResponse) => {
-                quizExercise = convertModelAfterMultiPart(quizResponse);
-            });
-        });
-
-        it('Deletes a quiz exercise', () => {
-            cy.login(admin, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.deleteQuizExercise(quizExercise);
-            courseManagementExercises.getExercise(quizExercise.id!).should('not.exist');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseParticipation.cy.ts b/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseParticipation.cy.ts
deleted file mode 100644
index ce5023b500cc..000000000000
--- a/src/test/cypress/e2e/exercises/quiz-exercise/QuizExerciseParticipation.cy.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import multipleChoiceQuizTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json';
-import shortAnswerQuizTemplate from '../../../fixtures/exercise/quiz/short_answer/template.json';
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest, quizExerciseMultipleChoice, quizExerciseShortAnswerQuiz } from '../../../support/artemis';
-import { admin, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Quiz Exercise Participation', () => {
-    let course: Course;
-    let quizExercise: QuizExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-        });
-    });
-
-    describe('Quiz exercise participation', () => {
-        beforeEach('Create quiz exercise', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createQuizExercise({ course }, [multipleChoiceQuizTemplate]).then((quizResponse) => {
-                quizExercise = convertModelAfterMultiPart(quizResponse);
-            });
-        });
-
-        it('Student cannot see hidden quiz', () => {
-            cy.login(studentOne, '/courses/' + course.id);
-            courseOverview.getExercises().should('have.length', 0);
-        });
-
-        it('Student can see a visible quiz', () => {
-            cy.login(admin);
-            exerciseAPIRequest.setQuizVisible(quizExercise.id!);
-            cy.login(studentOne, '/courses/' + course.id);
-            courseOverview.openRunningExercise(quizExercise.id!);
-        });
-
-        it('Student can participate in MC quiz', () => {
-            cy.login(admin);
-            exerciseAPIRequest.setQuizVisible(quizExercise.id!);
-            exerciseAPIRequest.startQuizNow(quizExercise.id!);
-            cy.login(studentOne, '/courses/' + course.id);
-            courseOverview.startExercise(quizExercise.id!);
-            quizExerciseMultipleChoice.tickAnswerOption(quizExercise.id!, 0);
-            quizExerciseMultipleChoice.tickAnswerOption(quizExercise.id!, 2);
-            quizExerciseMultipleChoice.submit();
-        });
-    });
-
-    describe('SA quiz participation', () => {
-        before('Create SA quiz', () => {
-            cy.login(admin);
-            exerciseAPIRequest.createQuizExercise({ course }, [shortAnswerQuizTemplate]).then((quizResponse) => {
-                quizExercise = convertModelAfterMultiPart(quizResponse);
-                exerciseAPIRequest.setQuizVisible(quizExercise.id!);
-                exerciseAPIRequest.startQuizNow(quizExercise.id!);
-            });
-        });
-
-        it('Student can participate in SA quiz', () => {
-            const quizQuestionId = quizExercise.quizQuestions![0].id!;
-            cy.login(studentOne, '/courses/' + course.id);
-            courseOverview.startExercise(quizExercise.id!);
-            quizExerciseShortAnswerQuiz.typeAnswer(0, 1, quizQuestionId, 'give');
-            quizExerciseShortAnswerQuiz.typeAnswer(1, 1, quizQuestionId, 'let');
-            quizExerciseShortAnswerQuiz.typeAnswer(2, 1, quizQuestionId, 'run');
-            quizExerciseShortAnswerQuiz.typeAnswer(2, 3, quizQuestionId, 'desert');
-            quizExerciseShortAnswerQuiz.typeAnswer(3, 1, quizQuestionId, 'cry');
-            quizExerciseShortAnswerQuiz.typeAnswer(4, 1, quizQuestionId, 'goodbye');
-            quizExerciseShortAnswerQuiz.submit();
-        });
-    });
-
-    // TODO: Fix the drag and drop
-    // describe.skip('DnD Quiz participation', () => {
-    //     before('Create DND quiz', () => {
-    //         cy.login(admin, '/course-management/' + course.id + '/exercises');
-    //         courseManagementExercises.createQuizExercise();
-    //         quizExerciseCreation.setTitle('Cypress Quiz');
-    //         quizExerciseCreation.addDragAndDropQuestion('DnD Quiz');
-    //         quizExerciseCreation.saveQuiz().then((quizResponse) => {
-    //             quizExercise = quizResponse.response?.body;
-    //             courseManagementAPIRequest.setQuizVisible(quizExercise.id!);
-    //             courseManagementAPIRequest.startQuizNow(quizExercise.id!);
-    //         });
-    //     });
-
-    //     it('Student can participate in DnD Quiz', () => {
-    //         cy.login(studentOne, '/courses/' + course.id);
-    //         courseOverview.startExercise(quizExercise.id!);
-    //         quizExerciseDragAndDropQuiz.dragItemIntoDragArea(0);
-    //         quizExerciseDragAndDropQuiz.submit();
-    //     });
-    // });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/text/TextExerciseAssessment.cy.ts b/src/test/cypress/e2e/exercises/text/TextExerciseAssessment.cy.ts
deleted file mode 100644
index 10c74b853808..000000000000
--- a/src/test/cypress/e2e/exercises/text/TextExerciseAssessment.cy.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-
-import {
-    courseAssessment,
-    courseManagement,
-    courseManagementAPIRequest,
-    exerciseAPIRequest,
-    exerciseAssessment,
-    exerciseResult,
-    textExerciseAssessment,
-    textExerciseFeedback,
-} from '../../../support/artemis';
-import { admin, instructor, studentOne, tutor } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-// Common primitives
-const tutorFeedback = 'Try to use some newlines next time!';
-const tutorFeedbackPoints = 4;
-const tutorTextFeedback = 'Nice ending of the sentence!';
-const tutorTextFeedbackPoints = 2;
-const complaint = "That feedback wasn't very useful!";
-
-describe.skip('Text exercise assessment', () => {
-    let course: Course;
-    let exercise: TextExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            courseManagementAPIRequest.addTutorToCourse(course, tutor);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-            exerciseAPIRequest.createTextExercise({ course }).then((textResponse) => {
-                exercise = textResponse.body;
-                cy.login(studentOne);
-                exerciseAPIRequest.startExerciseParticipation(exercise.id!);
-                cy.fixture('loremIpsum-short.txt').then((submission) => {
-                    exerciseAPIRequest.makeTextExerciseSubmission(exercise.id!, submission);
-                });
-            });
-        });
-    });
-
-    it('Assesses the text exercise submission', () => {
-        cy.login(tutor, '/course-management');
-        courseManagement.openAssessmentDashboardOfCourse(course.id!);
-        courseAssessment.clickExerciseDashboardButton();
-        exerciseAssessment.clickHaveReadInstructionsButton();
-        exerciseAssessment.clickStartNewAssessment();
-        textExerciseAssessment.getInstructionsRootElement().contains(exercise.title!).should('be.visible');
-        textExerciseAssessment.getInstructionsRootElement().contains(exercise.problemStatement!).should('be.visible');
-        textExerciseAssessment.getInstructionsRootElement().contains(exercise.exampleSolution!).should('be.visible');
-        textExerciseAssessment.getInstructionsRootElement().contains(exercise.gradingInstructions!).should('be.visible');
-        // Assert the correct word and character count without relying on translations
-        textExerciseAssessment.getWordCountElement().should('contain.text', 16).and('be.visible');
-        textExerciseAssessment.getCharacterCountElement().should('contain.text', 83).and('be.visible');
-        textExerciseAssessment.provideFeedbackOnTextSection(1, tutorTextFeedbackPoints, tutorTextFeedback);
-        textExerciseAssessment.addNewFeedback(tutorFeedbackPoints, tutorFeedback);
-        textExerciseAssessment.submit().then((request: Interception) => {
-            expect(request.response!.statusCode).to.eq(200);
-        });
-    });
-
-    describe('Feedback', () => {
-        it('Student sees feedback after assessment due date and complains', () => {
-            cy.login(studentOne, `/courses/${course.id}/exercises/${exercise.id}`);
-            const totalPoints = tutorFeedbackPoints + tutorTextFeedbackPoints;
-            const percentage = totalPoints * 10;
-            exerciseResult.shouldShowExerciseTitle(exercise.title!);
-            exerciseResult.shouldShowProblemStatement(exercise.problemStatement!);
-            exerciseResult.shouldShowScore(percentage);
-            exerciseResult.clickOpenExercise(exercise.id!);
-            textExerciseFeedback.shouldShowTextFeedback(1, tutorTextFeedback);
-            textExerciseFeedback.shouldShowAdditionalFeedback(tutorFeedbackPoints, tutorFeedback);
-            textExerciseFeedback.shouldShowScore(percentage);
-            textExerciseFeedback.complain(complaint);
-        });
-
-        it('Instructor can see complaint and reject it', () => {
-            cy.login(instructor, `/course-management/${course.id}/complaints`);
-            textExerciseAssessment.acceptComplaint('Makes sense', false).its('response.statusCode').should('eq', 200);
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/text/TextExerciseManagement.cy.ts b/src/test/cypress/e2e/exercises/text/TextExerciseManagement.cy.ts
deleted file mode 100644
index 773136e8b727..000000000000
--- a/src/test/cypress/e2e/exercises/text/TextExerciseManagement.cy.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-
-import {
-    courseManagement,
-    courseManagementAPIRequest,
-    courseManagementExercises,
-    exerciseAPIRequest,
-    navigationBar,
-    textExerciseCreation,
-    textExerciseExampleSubmissionCreation,
-    textExerciseExampleSubmissions,
-} from '../../../support/artemis';
-import { admin } from '../../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../../support/utils';
-
-describe.skip('Text exercise management', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-        });
-    });
-
-    it('Creates a text exercise in the UI', { scrollBehavior: 'center' }, () => {
-        cy.visit('/');
-        navigationBar.openCourseManagement();
-        courseManagement.openExercisesOfCourse(course.id!);
-        courseManagementExercises.createTextExercise();
-
-        // Fill out text exercise form
-        const exerciseTitle = 'text exercise' + generateUUID();
-        textExerciseCreation.typeTitle(exerciseTitle);
-        textExerciseCreation.setReleaseDate(dayjs());
-        textExerciseCreation.setDueDate(dayjs().add(1, 'days'));
-        textExerciseCreation.setAssessmentDueDate(dayjs().add(2, 'days'));
-        textExerciseCreation.typeMaxPoints(10);
-        const problemStatement = 'This is a problem statement';
-        const exampleSolution = 'E = mc^2';
-        textExerciseCreation.typeProblemStatement(problemStatement);
-        textExerciseCreation.typeExampleSolution(exampleSolution);
-        let exercise: TextExercise;
-        textExerciseCreation.create().then((request: Interception) => {
-            exercise = request.response!.body;
-        });
-
-        // Create an example submission
-        courseManagementExercises.clickExampleSubmissionsButton();
-        textExerciseExampleSubmissions.clickCreateExampleSubmission();
-        textExerciseExampleSubmissionCreation.showsExerciseTitle(exerciseTitle);
-        textExerciseExampleSubmissionCreation.showsProblemStatement(problemStatement);
-        textExerciseExampleSubmissionCreation.showsExampleSolution(exampleSolution);
-        const submission = 'This is an\nexample\nsubmission';
-        textExerciseExampleSubmissionCreation.typeExampleSubmission(submission);
-        textExerciseExampleSubmissionCreation.clickCreateNewExampleSubmission().then((request: Interception) => {
-            expect(request.response!.statusCode).to.eq(200);
-            expect(request.response!.body.submission.text).to.equal(submission);
-        });
-
-        // Make sure text exercise is shown in exercises list
-        cy.visit(`course-management/${course.id}/exercises`).then(() => {
-            courseManagementExercises.getExercise(exercise.id!).should('be.visible');
-        });
-    });
-
-    describe('Text exercise deletion', () => {
-        let exercise: TextExercise;
-
-        before('Create text exercise', () => {
-            cy.login(admin, '/');
-            exerciseAPIRequest.createTextExercise({ course }).then((response: Cypress.Response<TextExercise>) => {
-                exercise = response.body;
-            });
-        });
-
-        it('Deletes an existing text exercise', () => {
-            cy.login(admin, '/');
-            navigationBar.openCourseManagement();
-            courseManagement.openExercisesOfCourse(course.id!);
-            courseManagementExercises.deleteTextExercise(exercise);
-            courseManagementExercises.getExercise(exercise.id!).should('not.exist');
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/exercises/text/TextExerciseParticipation.cy.ts b/src/test/cypress/e2e/exercises/text/TextExerciseParticipation.cy.ts
deleted file mode 100644
index 389fda0c887c..000000000000
--- a/src/test/cypress/e2e/exercises/text/TextExerciseParticipation.cy.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-
-import { courseManagementAPIRequest, courseOverview, exerciseAPIRequest, textExerciseEditor } from '../../../support/artemis';
-import { admin, studentOne } from '../../../support/users';
-import { convertModelAfterMultiPart } from '../../../support/utils';
-
-describe.skip('Text exercise participation', () => {
-    let course: Course;
-    let exercise: TextExercise;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addStudentToCourse(course, studentOne);
-            exerciseAPIRequest.createTextExercise({ course }).then((exerciseResponse: Cypress.Response<TextExercise>) => {
-                exercise = exerciseResponse.body;
-            });
-        });
-    });
-
-    it('Makes a text exercise submission as student', () => {
-        cy.login(studentOne, `/courses/${course.id}/exercises`);
-        courseOverview.startExercise(exercise.id!);
-        courseOverview.openRunningExercise(exercise.id!);
-
-        // Verify the initial state of the text editor
-        textExerciseEditor.shouldShowExerciseTitleInHeader(exercise.title!);
-        textExerciseEditor.shouldShowProblemStatement();
-
-        // Make a submission
-        cy.fixture('loremIpsum.txt').then((submission) => {
-            textExerciseEditor.shouldShowNumberOfWords(0);
-            textExerciseEditor.shouldShowNumberOfCharacters(0);
-            textExerciseEditor.typeSubmission(exercise.id!, submission);
-            textExerciseEditor.shouldShowNumberOfWords(74);
-            textExerciseEditor.shouldShowNumberOfCharacters(451);
-            textExerciseEditor.submit().then((request: Interception) => {
-                expect(request.response!.body.text).to.eq(submission);
-                expect(request.response!.body.submitted).to.be.true;
-                expect(request.response!.statusCode).to.eq(200);
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/e2e/lecture/LectureManagement.cy.ts b/src/test/cypress/e2e/lecture/LectureManagement.cy.ts
deleted file mode 100644
index df4f85cbf740..000000000000
--- a/src/test/cypress/e2e/lecture/LectureManagement.cy.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Lecture } from 'app/entities/lecture.model';
-
-import { courseManagementAPIRequest, exerciseAPIRequest, lectureCreation, lectureManagement } from '../../support/artemis';
-import { admin, instructor } from '../../support/users';
-import { convertModelAfterMultiPart, generateUUID } from '../../support/utils';
-
-describe.skip('Lecture management', () => {
-    let course: Course;
-
-    before('Create course', () => {
-        cy.login(admin);
-        courseManagementAPIRequest.createCourse().then((response) => {
-            course = convertModelAfterMultiPart(response);
-            courseManagementAPIRequest.addInstructorToCourse(course, instructor);
-        });
-    });
-
-    it('Creates a lecture', () => {
-        const lectureTitle = 'Lecture ' + generateUUID();
-        cy.login(instructor, '/course-management/' + course.id);
-        lectureManagement.getLectures().click();
-        lectureManagement.clickCreateLecture();
-        lectureCreation.setTitle(lectureTitle);
-        cy.fixture('loremIpsum-short.txt').then((text) => {
-            lectureCreation.typeDescription(text);
-        });
-        lectureCreation.setVisibleDate(dayjs());
-        lectureCreation.setStartDate(dayjs());
-        lectureCreation.setEndDate(dayjs().add(1, 'hour'));
-        lectureCreation.save().then((lectureResponse) => {
-            expect(lectureResponse.response!.statusCode).to.eq(201);
-        });
-    });
-
-    it('Deletes a lecture', () => {
-        let lecture: Lecture;
-        cy.login(instructor, '/');
-        courseManagementAPIRequest.createLecture(course).then((lectureResponse) => {
-            lecture = lectureResponse.body;
-            cy.visit('/course-management/' + course.id + '/lectures');
-            lectureManagement.deleteLecture(lecture).then((resp) => {
-                expect(resp.response!.statusCode).to.eq(200);
-                lectureManagement.getLecture(lecture.id!).should('not.exist');
-            });
-        });
-    });
-
-    describe('Handle existing lecture', () => {
-        let lecture: Lecture;
-
-        beforeEach('Create a lecture', () => {
-            cy.login(instructor, '/course-management/' + course.id + '/lectures');
-            courseManagementAPIRequest.createLecture(course).then((lectureResponse) => {
-                lecture = lectureResponse.body;
-            });
-        });
-
-        it('Deletes an existing lecture', () => {
-            lectureManagement.deleteLecture(lecture).then((resp) => {
-                expect(resp.response!.statusCode).to.eq(200);
-                lectureManagement.getLecture(lecture.id!).should('not.exist');
-            });
-        });
-
-        it('Adds a text unit to the lecture', () => {
-            cy.login(instructor, '/course-management/' + course.id + '/lectures');
-            lectureManagement.openUnitsPage(lecture.id!);
-            cy.fixture('loremIpsum-short.txt').then((text) => {
-                lectureManagement.addTextUnit('Text unit', text);
-            });
-            cy.contains('Text unit').should('be.visible');
-        });
-
-        it('Adds a exercise unit to the lecture', () => {
-            cy.login(instructor, '/course-management/' + course.id + '/lectures');
-            exerciseAPIRequest.createModelingExercise({ course }).then((model) => {
-                const exercise = model.body;
-                lectureManagement.openUnitsPage(lecture.id!);
-                lectureManagement.addExerciseUnit(exercise.id!);
-                cy.contains(exercise.title!);
-            });
-        });
-    });
-
-    after('Delete course', () => {
-        courseManagementAPIRequest.deleteCourse(course, admin);
-    });
-});
diff --git a/src/test/cypress/fixtures/course/icon.png b/src/test/cypress/fixtures/course/icon.png
deleted file mode 100644
index 11078220190c..000000000000
Binary files a/src/test/cypress/fixtures/course/icon.png and /dev/null differ
diff --git a/src/test/cypress/fixtures/exam/template.json b/src/test/cypress/fixtures/exam/template.json
deleted file mode 100644
index 5f4ea802e6a7..000000000000
--- a/src/test/cypress/fixtures/exam/template.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "randomizeExerciseOrder": false,
-    "numberOfCorrectionRoundsInExam": 1,
-    "examMaxPoints": 10,
-    "visible": false,
-    "started": false,
-    "gracePeriod": 30,
-    "course": "<Insert course object here>",
-    "title": "<Insert exam title here>",
-    "visibleDate": "<Insert visible date here>",
-    "startDate": "<Insert start date here>",
-    "endDate": "<Insert end date here>",
-    "numberOfExercisesInExam": 1,
-    "startText": "Exam start text",
-    "endText": "Exam end text",
-    "confirmationStartText": "Exam confirmation start text",
-    "confirmationEndText": "Exam confirmation end text"
-}
diff --git a/src/test/cypress/fixtures/exercise/file-upload/submission.json b/src/test/cypress/fixtures/exercise/file-upload/submission.json
deleted file mode 100644
index 6d588766c95a..000000000000
--- a/src/test/cypress/fixtures/exercise/file-upload/submission.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "files": [
-        {
-            "name": "BubbleSort.java",
-            "path": "programming_exercise_submissions/build_error/BubbleSort.txt"
-        }
-    ]
-}
diff --git a/src/test/cypress/fixtures/exercise/file-upload/template.json b/src/test/cypress/fixtures/exercise/file-upload/template.json
deleted file mode 100644
index add580f86f46..000000000000
--- a/src/test/cypress/fixtures/exercise/file-upload/template.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "mode": "INDIVIDUAL",
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "studentAssignedTeamIdComputed": false,
-    "secondCorrectionEnabled": false,
-    "type": "file-upload",
-    "bonusPoints": 0,
-    "isAtLeastTutor": false,
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "teamMode": false,
-    "assessmentDueDateError": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "presentationScoreEnabled": false,
-    "assessmentType": "MANUAL",
-    "title": "File Upload Exercise 1",
-    "filePattern": "pdf",
-    "maxPoints": 10,
-    "problemStatement": "Problem Statement",
-    "exampleSolution": "Example Solution",
-    "gradingInstructions": "Assessment Instructions"
-}
diff --git a/src/test/cypress/fixtures/exercise/modeling/submission.json b/src/test/cypress/fixtures/exercise/modeling/submission.json
deleted file mode 100644
index 15f3e5c2b71d..000000000000
--- a/src/test/cypress/fixtures/exercise/modeling/submission.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "submissionExerciseType": "modeling",
-    "id": null,
-    "submitted": false,
-    "participation": null,
-    "empty": true,
-    "explanationText": "",
-    "model": "{\"version\":\"2.0.0\",\"type\":\"ClassDiagram\",\"size\":{\"width\":1000,\"height\":500},\"interactive\":{\"elements\":[],\"relationships\":[]},\"elements\":[{\"id\":\"ccf5edad-98d5-401d-9885-e332607dfa6a\",\"name\":\"Package\",\"type\":\"Package\",\"owner\":null,\"bounds\":{\"x\":240,\"y\":230,\"width\":200,\"height\":100}},{\"id\":\"59787b15-e81c-4710-99bf-e11104c22dbf\",\"name\":\"Class\",\"type\":\"Class\",\"owner\":null,\"bounds\":{\"x\":0,\"y\":0,\"width\":200,\"height\":102},\"attributes\":[\"c3469dd2-a822-45b2-823d-13bc5c8370da\"],\"methods\":[\"b6457544-7cbe-47f5-b704-523ce6e967f9\"]},{\"id\":\"c3469dd2-a822-45b2-823d-13bc5c8370da\",\"name\":\"+ attribute: Type\",\"type\":\"ClassAttribute\",\"owner\":\"59787b15-e81c-4710-99bf-e11104c22dbf\",\"bounds\":{\"x\":0.5,\"y\":40.5,\"width\":199,\"height\":30}},{\"id\":\"b6457544-7cbe-47f5-b704-523ce6e967f9\",\"name\":\"+ method()\",\"type\":\"ClassMethod\",\"owner\":\"59787b15-e81c-4710-99bf-e11104c22dbf\",\"bounds\":{\"x\":0.5,\"y\":71.5,\"width\":199,\"height\":30}},{\"id\":\"8786cede-a45c-4593-ac6a-b7ac235f1fae\",\"name\":\"Abstract\",\"type\":\"AbstractClass\",\"owner\":null,\"bounds\":{\"x\":0,\"y\":120,\"width\":200,\"height\":112},\"attributes\":[\"0aaf6115-8d34-4509-a179-26d7b7d22596\"],\"methods\":[\"9f285794-4e97-42d1-adcc-e5467977b76c\"]},{\"id\":\"0aaf6115-8d34-4509-a179-26d7b7d22596\",\"name\":\"+ attribute: Type\",\"type\":\"ClassAttribute\",\"owner\":\"8786cede-a45c-4593-ac6a-b7ac235f1fae\",\"bounds\":{\"x\":0.5,\"y\":170.5,\"width\":199,\"height\":30}},{\"id\":\"9f285794-4e97-42d1-adcc-e5467977b76c\",\"name\":\"+ method()\",\"type\":\"ClassMethod\",\"owner\":\"8786cede-a45c-4593-ac6a-b7ac235f1fae\",\"bounds\":{\"x\":0.5,\"y\":201.5,\"width\":199,\"height\":30}}],\"relationships\":[],\"assessments\":[]}"
-}
diff --git a/src/test/cypress/fixtures/exercise/modeling/template.json b/src/test/cypress/fixtures/exercise/modeling/template.json
deleted file mode 100644
index 6173bb7cfe61..000000000000
--- a/src/test/cypress/fixtures/exercise/modeling/template.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "mode": "INDIVIDUAL",
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "numberOfAssessmentsOfCorrectionRounds": [
-        {
-            "inTime": 0,
-            "late": 0
-        }
-    ],
-    "studentAssignedTeamIdComputed": false,
-    "secondCorrectionEnabled": false,
-    "type": "modeling",
-    "bonusPoints": 10,
-    "isAtLeastTutor": false,
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "teamMode": false,
-    "assessmentDueDateError": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "presentationScoreEnabled": false,
-    "diagramType": "ClassDiagram",
-    "assessmentType": "MANUAL",
-    "title": "Modeling Exercise",
-    "categories": ["{\"category\":\"cypress-e2e\",\"color\":\"#6ae8ac\"}"],
-    "difficulty": "EASY",
-    "maxPoints": 10,
-    "problemStatement": "Problem Statement",
-    "gradingInstructions": "Grading Instruction ",
-    "exampleSolutionExplanation": "Example Solution Explanation",
-    "exampleSolutionModel": "{\"version\":\"2.0.0\",\"type\":\"ClassDiagram\",\"size\":{\"width\":640,\"height\":600},\"interactive\":{\"elements\":[],\"relationships\":[]},\"elements\":[{\"id\":\"6e1f57c6-cbc7-4b97-9df9-c5741dc905fa\",\"name\":\"Package\",\"type\":\"Package\",\"owner\":null,\"bounds\":{\"x\":230,\"y\":0,\"width\":200,\"height\":100}},{\"id\":\"ff7e3be0-9765-4301-baf5-cf9cf2f17c3c\",\"name\":\"Class\",\"type\":\"Class\",\"owner\":null,\"bounds\":{\"x\":0,\"y\":220,\"width\":200,\"height\":100},\"attributes\":[\"de2d464b-f969-4cf3-ac0d-2f300b3a6497\"],\"methods\":[\"084a59b9-3009-4ebd-885c-159b436581d9\"]},{\"id\":\"de2d464b-f969-4cf3-ac0d-2f300b3a6497\",\"name\":\"+ attribute: Type\",\"type\":\"ClassAttribute\",\"owner\":\"ff7e3be0-9765-4301-baf5-cf9cf2f17c3c\",\"bounds\":{\"x\":0,\"y\":260,\"width\":200,\"height\":30}},{\"id\":\"084a59b9-3009-4ebd-885c-159b436581d9\",\"name\":\"+ method()\",\"type\":\"ClassMethod\",\"owner\":\"ff7e3be0-9765-4301-baf5-cf9cf2f17c3c\",\"bounds\":{\"x\":0,\"y\":290,\"width\":200,\"height\":30}},{\"id\":\"1ad94aff-ee37-494f-8b99-9d861dc58e4a\",\"name\":\"Abstract\",\"type\":\"AbstractClass\",\"owner\":null,\"bounds\":{\"x\":380,\"y\":220,\"width\":200,\"height\":110},\"attributes\":[\"4d58287c-d4c0-42d1-9d02-ad239b701de6\"],\"methods\":[\"2de2a7c3-19c9-4534-8a71-f6607e93556c\"]},{\"id\":\"4d58287c-d4c0-42d1-9d02-ad239b701de6\",\"name\":\"+ attribute: Type\",\"type\":\"ClassAttribute\",\"owner\":\"1ad94aff-ee37-494f-8b99-9d861dc58e4a\",\"bounds\":{\"x\":380,\"y\":270,\"width\":200,\"height\":30}},{\"id\":\"2de2a7c3-19c9-4534-8a71-f6607e93556c\",\"name\":\"+ method()\",\"type\":\"ClassMethod\",\"owner\":\"1ad94aff-ee37-494f-8b99-9d861dc58e4a\",\"bounds\":{\"x\":380,\"y\":300,\"width\":200,\"height\":30}}],\"relationships\":[],\"assessments\":[]}"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/c/all_successful/exercise.txt b/src/test/cypress/fixtures/exercise/programming/c/all_successful/exercise.txt
deleted file mode 100644
index 9fec30452413..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/c/all_successful/exercise.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(void) {
-    int x = 6;
-    int y = 10;
-    printf("%d\n", x * x + 5 * y - 4);
-    return EXIT_SUCCESS;
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/c/all_successful/submission.json b/src/test/cypress/fixtures/exercise/programming/c/all_successful/submission.json
deleted file mode 100644
index b12cadde14e5..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/c/all_successful/submission.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "deleteFiles": ["exercise.c"],
-    "createFilesInRootFolder": true,
-    "files": [
-        {
-            "name": "exercise.c",
-            "path": "exercise/programming/c/all_successful/exercise.txt"
-        }
-    ],
-    "expectedResult": "100%"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/c/template.json b/src/test/cypress/fixtures/exercise/programming/c/template.json
deleted file mode 100644
index ee82b71a9be9..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/c/template.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "allowOfflineIde": true,
-    "allowOnlineEditor": true,
-    "assessmentDueDateError": false,
-    "assessmentType": "AUTOMATIC",
-    "bonusPoints": 0,
-    "checkoutSolutionRepository": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "isAtLeastTutor": false,
-    "maxPoints": 10,
-    "mode": "INDIVIDUAL",
-    "noVersionControlAndContinuousIntegrationAvailable": false,
-    "packageName": "<Insert package name here>",
-    "presentationScoreEnabled": false,
-    "problemStatement": "# Aufgabe (6 Punkte)\n\n## Beschreibung\n\nErstelle ein C-Programm, welches das Ergebnis des Terms $$ x^2 + 5 \\cdot y - 4 $$ berechnet und auf der\nStandardausgabe ausgibt. Verwende für die Variablen `x` und `y` den Datentyp `int` und wähle für beide\nVariablen einen beliebigen Wert!\n\n### Beispielausgaben\n\nBeispiel 1: `x = 3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 2: `x = -3` und `y = 5`\n\n```text\n30\n```\n\nBeispiel 3: `x = 5` und `y = -10`\n\n```text\n-29\n```\n\n## Hinweise\n\n- Bei den Ein-/Ausgabetests werden beim Testen die Werte der Variablen `x` und `y` in Ihrem Programm verändert!\n\n## Tests\n\n1. [task][Kompilieren](Compile)\n2. [task][Strukturtests](CodeStructure)\n3. [task][Ein-/Ausgabetests](InputOutput)\n",
-    "programmingLanguage": "C",
-    "projectType": "FACT",
-    "secondCorrectionEnabled": false,
-    "shortName": "<Insert programming exercise short name here>",
-    "showTestNamesToStudents": false,
-    "solutionParticipation": {
-        "type": "solution"
-    },
-    "staticCodeAnalysisEnabled": false,
-    "studentAssignedTeamIdComputed": false,
-    "teamMode": false,
-    "templateParticipation": {
-        "type": "template"
-    },
-    "title": "<Insert programming exercise title here>",
-    "type": "programming"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/BubbleSort.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/BubbleSort.txt
deleted file mode 100644
index 8484f2f2bc90..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/BubbleSort.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-package de.test;
-
-import java.util.*;
-
-public class BubbleSort implements SortStrategy {
-  
-  /**
-  * Sorts dates with BubbleSort.
-  *
-  * @param input the List of Dates to be sorted
-  */
-  public void performSort(List<Date> input) {
-    for (int i = input.size() - 1; i >= 0; i--) {
-      for (int j = 0; j < i; j++) {
-        if (input.get(j).compareTo(input.get(j + 1)) > 0) {
-          Date temp = input.get(j);
-          input.set(j, input.get(j + 1));
-          input.set(j + 1, temp);
-        }
-      }
-    }
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Client.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/Client.txt
deleted file mode 100644
index b4142dec7883..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Client.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-package de.test;
-
-import java.text.*;
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-
-public final class Client {
-  
-  private static final int ITERATIONS = 10;
-  
-  private static final int RANDOM_FLOOR = 5;
-  
-  private static final int RANDOM_CEILING = 15;
-  
-  private Client() {
-  }
-  
-  /**
-  * Main method.
-  * Add code to demonstrate your implementation here.
-  *
-  * @param args command line arguments
-  */
-  public static void main(String[] args) throws ParseException {
-    
-    Context sortingContext = new Context();
-    Policy policy = new Policy(sortingContext);
-    
-    for (int i = 0; i < ITERATIONS; i++) {
-      List<Date> dates = createRandomDatesList();
-      
-      sortingContext.setDates(dates);
-      policy.configure();
-      
-      System.out.print("Unsorted Array of course dates = ");
-      printDateList(dates);
-      
-      sortingContext.sort();
-      
-      System.out.print("Sorted Array of course dates = ");
-      printDateList(dates);
-    }
-  }
-  
-  /**
-  * Generates a List of random Date objects with random List size between
-  * {@link #RANDOM_FLOOR} and {@link #RANDOM_CEILING}.
-  *
-  * @return a List of random Date objects
-  * @throws ParserException if date string cannot be parsed
-  */
-  private static List<Date> createRandomDatesList() throws ParseException {
-    int listLength = randomIntegerWithin(RANDOM_FLOOR, RANDOM_CEILING);
-    List<Date> list = new ArrayList<>();
-    
-    SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy");
-    Date lowestDate = dateFormat.parse("08.11.2016");
-    Date highestDate = dateFormat.parse("03.11.2020");
-    
-    for (int i = 0; i < listLength; i++) {
-      Date randomDate = randomDateWithin(lowestDate, highestDate);
-      list.add(randomDate);
-    }
-    return list;
-  }
-  
-  /**
-  * Creates a random Date within the given range.
-  *
-  * @param low the lower bound
-  * @param high the upper bound
-  * @return random Date within the given range
-  */
-  private static Date randomDateWithin(Date low, Date high) {
-    long randomLong = randomLongWithin(low.getTime(), high.getTime());
-    return new Date(randomLong);
-  }
-  
-  /**
-  * Creates a random long within the given range.
-  *
-  * @param low the lower bound
-  * @param high the upper bound
-  * @return random long within the given range
-  */
-  private static long randomLongWithin(long low, long high) {
-    return ThreadLocalRandom.current().nextLong(low, high + 1);
-  }
-  
-  /**
-  * Creates a random int within the given range.
-  *
-  * @param low the lower bound
-  * @param high the upper bound
-  * @return random int within the given range
-  */
-  private static int randomIntegerWithin(int low, int high) {
-    return ThreadLocalRandom.current().nextInt(low, high + 1);
-  }
-  
-  /**
-  * Prints out the given Array of Date objects.
-  *
-  * @param list of the dates to print
-  */
-  private static void printDateList(List<Date> list) {
-    System.out.println(list.toString());
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Context.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/Context.txt
deleted file mode 100644
index c44eca71bc4c..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Context.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-package de.test;
-
-import java.util.*;
-
-public class Context {
-  private SortStrategy sortAlgorithm;
-  
-  private List<Date> dates;
-  
-  public List<Date> getDates() {
-    return dates;
-  }
-  
-  public void setDates(List<Date> dates) {
-    this.dates = dates;
-  }
-  
-  public void setSortAlgorithm(SortStrategy sa) {
-    sortAlgorithm = sa;
-  }
-  
-  public SortStrategy getSortAlgorithm() {
-    return sortAlgorithm;
-  }
-  
-  /**
-  * Runs the configured sort algorithm.
-  */
-  public void sort() {
-    if (sortAlgorithm != null) {
-      sortAlgorithm.performSort(this.dates);
-    }
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/MergeSort.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/MergeSort.txt
deleted file mode 100644
index 449b265e261c..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/MergeSort.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-package de.test;
-
-import java.util.*;
-
-public class MergeSort implements SortStrategy {
-  
-  /**
-  * Wrapper method for the real MergeSort algorithm.
-  *
-  * @param input the List of Dates to be sorted
-  */
-  public void performSort(List<Date> input) {
-    mergesort(input, 0, input.size() - 1);
-  }
-  
-  private void mergesort(List<Date> input, int low, int high) {
-    if (high - low < 1) {
-      return;
-    }
-    int mid = (low + high) / 2;
-    mergesort(input, low, mid);
-    mergesort(input, mid + 1, high);
-    merge(input, low, mid, high);
-  }
-  
-  private void merge(List<Date> input, int low, int middle, int high) {
-    
-    Date[] temp = new Date[high - low + 1];
-    int leftIndex = low;
-    int rightIndex = middle + 1;
-    int wholeIndex = 0;
-    while (leftIndex <= middle && rightIndex <= high) {
-      if (input.get(leftIndex).compareTo(input.get(rightIndex)) <= 0) {
-        temp[wholeIndex] = input.get(leftIndex++);
-      } else {
-        temp[wholeIndex] = input.get(rightIndex++);
-      }
-      wholeIndex++;
-    }
-    if (leftIndex <= middle && rightIndex > high) {
-      while (leftIndex <= middle) {
-        temp[wholeIndex++] = input.get(leftIndex++);
-      }
-    } else {
-      while (rightIndex <= high) {
-        temp[wholeIndex++] = input.get(rightIndex++);
-      }
-    }
-    for (wholeIndex = 0; wholeIndex < temp.length; wholeIndex++) {
-      input.set(wholeIndex + low, temp[wholeIndex]);
-    }
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Policy.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/Policy.txt
deleted file mode 100644
index 1ed740f33d38..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/Policy.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.test;
-
-public class Policy {
-
-  private static final int DATES_SIZE_THRESHOLD = 10;
-
-  private Context context;
-
-  public Policy(Context context) {
-    this.context = context;
-  }
-
-  /**
-  * Chooses a strategy depending on the number of date objects.
-  */
-  public void configure() {
-    if (this.context.getDates().size() > DATES_SIZE_THRESHOLD) {
-      System.out.println("More than " + DATES_SIZE_THRESHOLD + " dates, choosing merge sort!");
-      this.context.setSortAlgorithm(new MergeSort());
-    } else {
-      System.out.println("Less or equal than " + DATES_SIZE_THRESHOLD + " dates. choosing quick sort!");
-      this.context.setSortAlgorithm(new BubbleSort());
-    }
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/SortStrategy.txt b/src/test/cypress/fixtures/exercise/programming/java/all_successful/SortStrategy.txt
deleted file mode 100644
index c721267ddb7a..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/SortStrategy.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.test;
-
-import java.util.Date;
-import java.util.List;
-
-public interface SortStrategy {
-  
-  /**
-  * Sorts a list of Dates.
-  *
-  * @param input list of Dates
-  */
-  void performSort(List<Date> input);
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/all_successful/submission.json b/src/test/cypress/fixtures/exercise/programming/java/all_successful/submission.json
deleted file mode 100644
index 8a4d1751131b..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/all_successful/submission.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "deleteFiles": ["BubbleSort.java", "Client.java", "MergeSort.java"],
-    "createFilesInRootFolder": false,
-    "files": [
-        {
-            "name": "BubbleSort.java",
-            "path": "exercise/programming/java/all_successful/BubbleSort.txt"
-        },
-        {
-            "name": "Context.java",
-            "path": "exercise/programming/java/all_successful/Context.txt"
-        },
-        {
-            "name": "Client.java",
-            "path": "exercise/programming/java/all_successful/Client.txt"
-        },
-        {
-            "name": "MergeSort.java",
-            "path": "exercise/programming/java/all_successful/MergeSort.txt"
-        },
-        {
-            "name": "Policy.java",
-            "path": "exercise/programming/java/all_successful/Policy.txt"
-        },
-        {
-            "name": "SortStrategy.java",
-            "path": "exercise/programming/java/all_successful/SortStrategy.txt"
-        }
-    ],
-    "expectedResult": "100%",
-    "packageName": "de.test"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/assessment/submission.json b/src/test/cypress/fixtures/exercise/programming/java/assessment/submission.json
deleted file mode 100644
index 00f63679dd36..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/assessment/submission.json
+++ /dev/null
@@ -1,14 +0,0 @@
-[
-    {
-        "fileName": "src/de/test/MergeSort.java",
-        "fileContent": "package de.test;\n\nimport java.util.*;\n\npublic class MergeSort implements SortStrategy {\n    \n    /**\n     * Wrapper method for the real MergeSort algorithm.\n     *\n     * @param input the List of Dates to be sorted\n     */\n    public void performSort(List<Date> input) {\n        mergesort(input, 0, input.size() - 1);\n    }\n\n    // Recursive merge sort method\n    private void mergesort(List<Date> input, int low, int high) {\n        if (high - low < 1) {\n            return;\n        }\n        int mid = (low + high) / 2;\n        mergesort(input, low, mid);\n        mergesort(input, mid + 1, high);\n        merge(input, low, mid, high);\n    }\n\n    // Merge method\n    private void merge(List<Date> input, int low, int middle, int high) {\n\n        Date[] temp = new Date[high - low + 1];\n        int leftIndex = low;\n        int rightIndex = middle + 1;\n        int wholeIndex = 0;\n        while (leftIndex <= middle && rightIndex <= high) {\n            if (input.get(leftIndex).compareTo(input.get(rightIndex)) <= 0) {\n                temp[wholeIndex] = input.get(leftIndex++);\n            }\n            else {\n                temp[wholeIndex] = input.get(rightIndex++);\n            }\n            wholeIndex++;\n        }\n        if (leftIndex <= middle && rightIndex > high) {\n            while (leftIndex <= middle) {\n                temp[wholeIndex++] = input.get(leftIndex++);\n            }\n        }\n        else {\n            while (rightIndex <= high) {\n                temp[wholeIndex++] = input.get(rightIndex++);\n            }\n        }\n        for (wholeIndex = 0; wholeIndex < temp.length; wholeIndex++) {\n            input.set(wholeIndex + low, temp[wholeIndex]);\n        }\n    }\n}\n"
-    },
-    {
-        "fileName": "src/de/test/Client.java",
-        "fileContent": "package de.test;\n\nimport java.text.*;\nimport java.util.*;\nimport java.util.concurrent.ThreadLocalRandom;\n\npublic final class Client {\n\n    private static final int ITERATIONS = 10;\n    \n    private static final int RANDOM_FLOOR = 5;\n    \n    private static final int RANDOM_CEILING = 15;\n\n    private Client() {\n    }\n\n    /**\n     * Main method.\n     * Add code to demonstrate your implementation here.\n     *\n     * @param args command line arguments\n     */\n    public static void main(String[] args) throws ParseException {\n\n        // Init Context and Policy\n\n        Context sortingContext = new Context();\n        Policy policy = new Policy(sortingContext);\n\n        // Run multiple times to simulate different sorting strategies\n        for (int i = 0; i < ITERATIONS; i++) {\n            List<Date> dates = createRandomDatesList();\n\n            sortingContext.setDates(dates);\n            policy.configure();\n\n            System.out.print(\"Unsorted Array of course dates = \");\n            printDateList(dates);\n\n            sortingContext.sort();\n\n            System.out.print(\"Sorted Array of course dates = \");\n            printDateList(dates);\n        }\n    }\n\n    /**\n     * Generates a List of random Date objects with random List size between\n     * {@link #RANDOM_FLOOR} and {@link #RANDOM_CEILING}.\n     *\n     * @return a List of random Date objects\n     * @throws ParserException if date string cannot be parsed\n     */\n    private static List<Date> createRandomDatesList() throws ParseException {\n        int listLength = randomIntegerWithin(RANDOM_FLOOR, RANDOM_CEILING);\n        List<Date> list = new ArrayList<>();\n\n        SimpleDateFormat dateFormat = new SimpleDateFormat(\"dd.MM.yyyy\");\n        Date lowestDate = dateFormat.parse(\"08.11.2016\");\n        Date highestDate = dateFormat.parse(\"03.11.2020\");\n\n        for (int i = 0; i < listLength; i++) {\n            Date randomDate = randomDateWithin(lowestDate, highestDate);\n            list.add(randomDate);\n        }\n        return list;\n    }\n\n    /**\n     * Creates a random Date within the given range.\n     *\n     * @param low the lower bound\n     * @param high the upper bound\n     * @return random Date within the given range\n     */\n    private static Date randomDateWithin(Date low, Date high) {\n        long randomLong = randomLongWithin(low.getTime(), high.getTime());\n        return new Date(randomLong);\n    }\n\n    /**\n     * Creates a random long within the given range.\n     *\n     * @param low the lower bound\n     * @param high the upper bound\n     * @return random long within the given range\n     */\n    private static long randomLongWithin(long low, long high) {\n        return ThreadLocalRandom.current().nextLong(low, high + 1);\n    }\n\n    /**\n     * Creates a random int within the given range.\n     *\n     * @param low the lower bound\n     * @param high the upper bound\n     * @return random int within the given range\n     */\n    private static int randomIntegerWithin(int low, int high) {\n        return ThreadLocalRandom.current().nextInt(low, high + 1);\n    }\n\n    /**\n     * Prints out the given Array of Date objects.\n     *\n     * @param list of the dates to print\n     */\n    private static void printDateList(List<Date> list) {\n        System.out.println(list.toString());\n    }\n}\n"
-    },
-    {
-        "fileName": "src/de/test/BubbleSort.java",
-        "fileContent": "package de.test;\n\nimport java.util.*;\n\npublic class BubbleSort implements SortStrategy {\n    /**\n     * Sorts dates with BubbleSort.\n     *\n     */\n    public void performSort(List<Date> input) {\n        for (int i = input.size() - 1; i >= 0; i--) {\n            for (int j = 0; j < i; j++) {\n                if (input.get(j).compareTo(input.get(j + 1)) > 0) {\n                    Date temp = input.get(j);\n                    input.set(j, input.get(j + 1));\n                    input.set(j + 1, temp);\n                }\n            }\n        }\n\n    }\n}\n"
-    }
-]
diff --git a/src/test/cypress/fixtures/exercise/programming/java/build_error/BubbleSort.txt b/src/test/cypress/fixtures/exercise/programming/java/build_error/BubbleSort.txt
deleted file mode 100644
index 030102a8e7c1..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/build_error/BubbleSort.txt
+++ /dev/null
@@ -1 +0,0 @@
-this should fail
\ No newline at end of file
diff --git a/src/test/cypress/fixtures/exercise/programming/java/build_error/submission.json b/src/test/cypress/fixtures/exercise/programming/java/build_error/submission.json
deleted file mode 100644
index 4a873094d884..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/build_error/submission.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "deleteFiles": ["BubbleSort.java", "Client.java", "MergeSort.java"],
-    "createFilesInRootFolder": false,
-    "files": [
-        {
-            "name": "BubbleSort.java",
-            "path": "exercise/programming/java/build_error/BubbleSort.txt"
-        }
-    ],
-    "expectedResult": "0%",
-    "packageName": "de.test"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/partially_successful/submission.json b/src/test/cypress/fixtures/exercise/programming/java/partially_successful/submission.json
deleted file mode 100644
index 97560fee1f72..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/partially_successful/submission.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "deleteFiles": ["BubbleSort.java", "Client.java", "MergeSort.java"],
-    "createFilesInRootFolder": false,
-    "files": [
-        {
-            "name": "BubbleSort.java",
-            "path": "exercise/programming/java/all_successful/BubbleSort.txt"
-        },
-        {
-            "name": "MergeSort.java",
-            "path": "exercise/programming/java/all_successful/MergeSort.txt"
-        },
-        {
-            "name": "SortStrategy.java",
-            "path": "exercise/programming/java/all_successful/SortStrategy.txt"
-        }
-    ],
-    "expectedResult": "46.2%",
-    "packageName": "de.test"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/BubbleSort.txt b/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/BubbleSort.txt
deleted file mode 100644
index e5c69849b14c..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/BubbleSort.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.test;
-
-import java.util.*;
-
-public class BubbleSort implements SortStrategy {
-  
-  public static String literal1 = "Header";
-  private static final String LITERAL_TWO = "Literal2";
-  
-  /**
-  * Sorts dates with BubbleSort.
-  *
-  * @param input the List of Dates to be sorted
-  */
-  public void performSort(List<Date> input) {
-    
-    for (int i = input.size() - 1; i >= 0; i--) {
-      for (int j = 0; j < i; j++) {
-        if (input.get(j).compareTo(input.get(j + 1)) > 0) {
-          Date temp = input.get(j);
-          input.set(j, input.get(j + 1));
-          input.set(j + 1, temp);
-        }
-      }
-    }
-    
-  }
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/submission.json b/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/submission.json
deleted file mode 100644
index 330ddd0f554d..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/static_code_analysis/submission.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "deleteFiles": ["BubbleSort.java", "Client.java", "MergeSort.java"],
-    "createFilesInRootFolder": false,
-    "files": [
-        {
-            "name": "BubbleSort.java",
-            "path": "exercise/programming/java/static_code_analysis/BubbleSort.txt"
-        },
-        {
-            "name": "Context.java",
-            "path": "exercise/programming/java/all_successful/Context.txt"
-        },
-        {
-            "name": "Client.java",
-            "path": "exercise/programming/java/all_successful/Client.txt"
-        },
-        {
-            "name": "MergeSort.java",
-            "path": "exercise/programming/java/all_successful/MergeSort.txt"
-        },
-        {
-            "name": "Policy.java",
-            "path": "exercise/programming/java/all_successful/Policy.txt"
-        },
-        {
-            "name": "SortStrategy.java",
-            "path": "exercise/programming/java/all_successful/SortStrategy.txt"
-        }
-    ],
-    "expectedResult": "50%",
-    "packageName": "de.test"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/java/template.json b/src/test/cypress/fixtures/exercise/programming/java/template.json
deleted file mode 100644
index b5a45c605e12..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/java/template.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "allowOfflineIde": true,
-    "allowOnlineEditor": true,
-    "assessmentDueDateError": false,
-    "assessmentType": "AUTOMATIC",
-    "bonusPoints": 0,
-    "checkoutSolutionRepository": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "isAtLeastTutor": false,
-    "maxPoints": 10,
-    "mode": "INDIVIDUAL",
-    "noVersionControlAndContinuousIntegrationAvailable": false,
-    "packageName": "<Insert package name here>",
-    "presentationScoreEnabled": false,
-    "problemStatement": "# Sorting with the Strategy Pattern\n\nIn this exercise, we want to implement sorting algorithms and choose them based on runtime specific variables.\n\n### Part 1: Sorting\n\nFirst, we need to implement two sorting algorithms, in this case `MergeSort` and `BubbleSort`.\n\n**You have the following tasks:**\n\n1. [task][Implement Bubble Sort](testBubbleSort)\nImplement the method `performSort(List<Date>)` in the class `BubbleSort`. Make sure to follow the Bubble Sort algorithm exactly.\n\n2. [task][Implement Merge Sort](testMergeSort)\nImplement the method `performSort(List<Date>)` in the class `MergeSort`. Make sure to follow the Merge Sort algorithm exactly.\n\n### Part 2: Strategy Pattern\n\nWe want the application to apply different algorithms for sorting a `List` of `Date` objects.\nUse the strategy pattern to select the right sorting algorithm at runtime.\n\n**You have the following tasks:**\n\n1. [task][SortStrategy Interface](testClass[SortStrategy],testMethods[SortStrategy])\nCreate a `SortStrategy` interface and adjust the sorting algorithms so that they implement this interface.\n\n2. [task][Context Class](testAttributes[Context],testMethods[Context])\nCreate and implement a `Context` class following the below class diagram\n\n3. [task][Context Policy](testConstructors[Policy],testAttributes[Policy],testMethods[Policy])\nCreate and implement a `Policy` class following the below class diagram with a simple configuration mechanism:\n\n    1. [task][Select MergeSort](testClass[MergeSort],testUseMergeSortForBigList)\n    Select `MergeSort` when the List has more than 10 dates.\n\n    2. [task][Select BubbleSort](testClass[BubbleSort],testUseBubbleSortForSmallList)\n    Select `BubbleSort` when the List has less or equal 10 dates.\n\n4. Complete the `Client` class which demonstrates switching between two strategies at runtime.\n\n@startuml\n\nclass Client {\n}\n\nclass Policy {\n  <color:testsColor(testMethods[Policy])>+configure()</color>\n}\n\nclass Context {\n  <color:testsColor(testAttributes[Context])>-dates: List<Date></color>\n  <color:testsColor(testMethods[Context])>+sort()</color>\n}\n\ninterface SortStrategy {\n  <color:testsColor(testMethods[SortStrategy])>+performSort(List<Date>)</color>\n}\n\nclass BubbleSort {\n  <color:testsColor(testBubbleSort)>+performSort(List<Date>)</color>\n}\n\nclass MergeSort {\n  <color:testsColor(testMergeSort)>+performSort(List<Date>)</color>\n}\n\nMergeSort -up-|> SortStrategy #testsColor(testClass[MergeSort])\nBubbleSort -up-|> SortStrategy #testsColor(testClass[BubbleSort])\nPolicy -right-> Context #testsColor(testAttributes[Policy]): context\nContext -right-> SortStrategy #testsColor(testAttributes[Context]): sortAlgorithm\nClient .down.> Policy\nClient .down.> Context\n\nhide empty fields\nhide empty methods\n\n@enduml\n\n\n### Part 3: Optional Challenges\n\n(These are not tested)\n\n1. Create a new class `QuickSort` that implements `SortStrategy` and implement the Quick Sort algorithm.\n\n2. Make the method `performSort(List<Dates>)` generic, so that other objects can also be sorted by the same method.\n**Hint:** Have a look at Java Generics and the interface `Comparable`.\n\n3. Think about a useful decision in `Policy` when to use the new `QuickSort` algorithm.\n",
-    "programmingLanguage": "JAVA",
-    "projectType": "PLAIN_MAVEN",
-    "secondCorrectionEnabled": false,
-    "shortName": "<Insert programming exercise short name here>",
-    "showTestNamesToStudents": false,
-    "solutionParticipation": {
-        "type": "solution"
-    },
-    "staticCodeAnalysisEnabled": false,
-    "studentAssignedTeamIdComputed": false,
-    "teamMode": false,
-    "templateParticipation": {
-        "type": "template"
-    },
-    "title": "<Insert programming exercise title here>",
-    "type": "programming"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/python/all_successful/context.txt b/src/test/cypress/fixtures/exercise/programming/python/all_successful/context.txt
deleted file mode 100644
index b57df9cfc106..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/all_successful/context.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-class Context:
-    sorting_algorithm = None
-    numbers = None
-
-    def sort(self):
-        self.sorting_algorithm.perform_sort(self.numbers)
diff --git a/src/test/cypress/fixtures/exercise/programming/python/all_successful/policy.txt b/src/test/cypress/fixtures/exercise/programming/python/all_successful/policy.txt
deleted file mode 100644
index 72517c91096d..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/all_successful/policy.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-from .sorting_algorithms import *
-
-
-class Policy:
-    context = None
-
-    def __init__(self, context):
-        self.context = context
-
-    def configure(self):
-        if len(self.context.numbers) > 10:
-            print('More than 10 numbers, choosing merge sort!')
-            self.context.sorting_algorithm = MergeSort()
-        else:
-            print('Less or equal than 10 numbers, choosing bubble sort!')
-            self.context.sorting_algorithm = BubbleSort()
diff --git a/src/test/cypress/fixtures/exercise/programming/python/all_successful/sort_strategy.txt b/src/test/cypress/fixtures/exercise/programming/python/all_successful/sort_strategy.txt
deleted file mode 100644
index a1f8b65ee6a1..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/all_successful/sort_strategy.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class SortStrategy(ABC):
-
-    @abstractmethod
-    def perform_sort(self, array):
-        pass
diff --git a/src/test/cypress/fixtures/exercise/programming/python/all_successful/sorting_algorithms.txt b/src/test/cypress/fixtures/exercise/programming/python/all_successful/sorting_algorithms.txt
deleted file mode 100644
index a51fe1b136c6..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/all_successful/sorting_algorithms.txt
+++ /dev/null
@@ -1,58 +0,0 @@
-from .sort_strategy import SortStrategy
-
-
-class BubbleSort(SortStrategy):
-
-    def perform_sort(self, arr):
-        if arr is None:
-            return
-
-        for i in range(len(arr))[::-1]:
-            for j in range(i):
-                if arr[j] > arr[j + 1]:
-                    arr[j], arr[j + 1] = arr[j + 1], arr[j]
-
-
-class MergeSort(SortStrategy):
-
-    def perform_sort(self, arr):
-        self.__merge_sort(arr, 0, len(arr) - 1)
-
-    def __merge_sort(self, arr, low, high):
-        if high - low < 1:
-            return
-
-        mid = int((low + high) / 2)
-        self.__merge_sort(arr, low, mid)
-        self.__merge_sort(arr, mid + 1, high)
-        self.__merge(arr, low, mid, high)
-
-    def __merge(self, arr, low, mid, high):
-        temp = [None] * (high - low + 1)
-
-        left_index = low
-        right_index = mid + 1
-        whole_index = 0
-
-        while left_index <= mid and right_index <= high:
-            if arr[left_index] <= arr[right_index]:
-                temp[whole_index] = arr[left_index]
-                left_index += 1
-            else:
-                temp[whole_index] = arr[right_index]
-                right_index += 1
-            whole_index += 1
-
-        if left_index <= mid and right_index > high:
-            while left_index <= mid:
-                temp[whole_index] = arr[left_index]
-                whole_index += 1
-                left_index += 1
-        else:
-            while right_index <= high:
-                temp[whole_index] = arr[right_index]
-                whole_index += 1
-                right_index += 1
-
-        for whole_index in range(len(temp)):
-            arr[whole_index + low] = temp[whole_index]
diff --git a/src/test/cypress/fixtures/exercise/programming/python/all_successful/submission.json b/src/test/cypress/fixtures/exercise/programming/python/all_successful/submission.json
deleted file mode 100644
index 258756288bb9..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/all_successful/submission.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "deleteFiles": ["context.py", "policy.py", "sort_strategy.py", "sorting_algorithms.py"],
-    "createFilesInRootFolder": true,
-    "files": [
-        {
-            "name": "context.py",
-            "path": "exercise/programming/python/all_successful/context.txt"
-        },
-        {
-            "name": "policy.py",
-            "path": "exercise/programming/python/all_successful/policy.txt"
-        },
-        {
-            "name": "sort_strategy.py",
-            "path": "exercise/programming/python/all_successful/sort_strategy.txt"
-        },
-        {
-            "name": "sorting_algorithms.py",
-            "path": "exercise/programming/python/all_successful/sorting_algorithms.txt"
-        }
-    ],
-    "expectedResult": "100%"
-}
diff --git a/src/test/cypress/fixtures/exercise/programming/python/template.json b/src/test/cypress/fixtures/exercise/programming/python/template.json
deleted file mode 100644
index cb0962ce3c00..000000000000
--- a/src/test/cypress/fixtures/exercise/programming/python/template.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "allowComplaintsForAutomaticAssessments": false,
-    "allowFeedbackRequests": false,
-    "allowOfflineIde": false,
-    "allowOnlineEditor": true,
-    "assessmentDueDateError": false,
-    "assessmentType": "AUTOMATIC",
-    "bonusPoints": 0,
-    "checkoutSolutionRepository": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "isAtLeastTutor": false,
-    "maxPoints": 10,
-    "mode": "INDIVIDUAL",
-    "noVersionControlAndContinuousIntegrationAvailable": false,
-    "packageName": "<Insert package name here>",
-    "presentationScoreEnabled": false,
-    "problemStatement": "# Sorting with the Strategy Pattern\n\nIn this exercise, we want to implement sorting algorithms and choose them based on runtime specific variables.\n\n### Part 1: Sorting\n\nFirst, we need to implement two sorting algorithms, in this case `MergeSort` and `BubbleSort`.\n\n**You have the following tasks:**\n\n1. [task][Implement Bubble Sort](test_bubble_sort)\nImplement the method `perform_sort(List<int>)` in the class `BubbleSort`. Make sure to follow the Bubble Sort algorithm exactly.\n\n2. [task][Implement Merge Sort](test_merge_sort)\nImplement the method `perform_sort(List<int>)` in the class `MergeSort`. Make sure to follow the Merge Sort algorithm exactly.\n\n### Part 2: Strategy Pattern\n\nWe want the application to apply different algorithms for sorting a `List` of `Int` objects.\nUse the strategy pattern to select the right sorting algorithm at runtime.\n\n**You have the following tasks:**\n\n1. [task][SortStrategy Interface](test_sort_strategy_class,test_sort_strategy_methods)\nCreate a `SortStrategy` abstract class with an abstract method and adjust the sorting algorithms so that they inherit from this class.\n\n2. [task][Context Class](test_context_attributes,test_context_methods)\nCreate and implement a `Context` class following the below class diagram\n\n3. [task][Context Policy](test_policy_constructor,test_policy_attributes,test_policy_methods)\nCreate and implement a `Policy` class following the below class diagram with a simple configuration mechanism:\n\n    1. [task][Select MergeSort](test_merge_sort_struct,test_merge_sort_for_big_list)\n    Select `MergeSort` when the List has more than 10 dates.\n\n    2. [task][Select BubbleSort](test_bubble_sort_struct,test_bubble_sort_for_small_list)\n    Select `BubbleSort` when the List has less or equal 10 dates.\n\n4. Complete the `Client` class which demonstrates switching between two strategies at runtime.\n\n@startuml\n\nclass Client {\n}\n\nclass Policy {\n  <color:testsColor(test_policy_methods)>+configure()</color>\n}\n\nclass Context {\n  <color:testsColor(test_context_attributes)>numbers: List<int></color>\n  <color:testsColor(test_context_methods)>+sort()</color>\n}\n\nabstract class SortStrategy {\n  <color:testsColor(test_sort_strategy_methods)>+perform_sort(List<int>)</color>\n}\n\nclass BubbleSort {\n  <color:testsColor(test_bubble_sort_struct)>+performSort(List<int>)</color>\n}\n\nclass MergeSort {\n  <color:testsColor(test_merge_sort_struct)>+perform_sort(List<int>)</color>\n}\n\nMergeSort -up-|> SortStrategy #testsColor(test_merge_sort_class)\nBubbleSort -up-|> SortStrategy #testsColor(test_bubble_sort_class)\nPolicy -right-> Context #testsColor(test_policy_attributes): context\nContext -right-> SortStrategy #testsColor(test_context_attributes): sortAlgorithm\nClient .down.> Policy\nClient .down.> Context\n\nhide empty fields\nhide empty methods\n\n@enduml\n\n\n### Part 3: Optional Challenges\n\n(These are not tested)\n\n1. Create a new class `QuickSort` that inherits from `SortStrategy` and implement the Quick Sort algorithm.\n\n2. Think about a useful decision in `Policy` when to use the new `QuickSort` algorithm.\n",
-    "programmingLanguage": "PYTHON",
-    "secondCorrectionEnabled": false,
-    "shortName": "<Insert programming exercise short name here>",
-    "showTestNamesToStudents": false,
-    "solutionParticipation": {
-        "type": "solution"
-    },
-    "startDateError": false,
-    "staticCodeAnalysisEnabled": false,
-    "studentAssignedTeamIdComputed": false,
-    "teamMode": false,
-    "templateParticipation": {
-        "type": "template"
-    },
-    "testwiseCoverageEnabled": false,
-    "title": "<Insert programming exercise title here>",
-    "type": "programming"
-}
diff --git a/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/background.jpg b/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/background.jpg
deleted file mode 100644
index b7c357de728b..000000000000
Binary files a/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/background.jpg and /dev/null differ
diff --git a/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/question.txt b/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/question.txt
deleted file mode 100644
index 955e816cc5df..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/drag_and_drop/question.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Who is never going to give you up?
-    [hint] His first name is Rick
diff --git a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/question.txt b/src/test/cypress/fixtures/exercise/quiz/multiple_choice/question.txt
deleted file mode 100644
index ee4700fa3a9b..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/question.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-A longer more detailed question
-[hint] A general hint
-[correct] Correct answer 1
-[hint] A hint
-[exp] Explanation for why this is correct
-[correct] Correct answer 2
-[hint] A hint
-[exp] Explanation for why this is correct
-[wrong] Wrong Answer 1
-[hint] A hint
-[exp] Explanation for why this is wrong
-[wrong] Wrong Answer 2
-[hint] A hint
-[exp] Explanation for why this is wrong
diff --git a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/submission.json b/src/test/cypress/fixtures/exercise/quiz/multiple_choice/submission.json
deleted file mode 100644
index 5515e12441a9..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/submission.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "submissionExerciseType": "quiz",
-    "submitted": false,
-    "submittedAnswers": [
-        {
-            "type": "multiple-choice",
-            "quizQuestion": null,
-            "selectedOptions": []
-        }
-    ]
-}
diff --git a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/template.json b/src/test/cypress/fixtures/exercise/quiz/multiple_choice/template.json
deleted file mode 100644
index 288e2447996b..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/multiple_choice/template.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "type": "multiple-choice",
-    "randomizeOrder": false,
-    "invalid": false,
-    "exportQuiz": false,
-    "title": "<Some title>",
-    "text": "A longer more detailed question",
-    "hint": "A general hint",
-    "scoringType": "PROPORTIONAL_WITHOUT_PENALTY",
-    "points": 10,
-    "answerOptions": [
-        {
-            "isCorrect": true,
-            "invalid": false,
-            "text": "Correct answer 1",
-            "hint": "A hint",
-            "explanation": "Explanation for why this is correct"
-        },
-        {
-            "isCorrect": true,
-            "invalid": false,
-            "text": "Correct answer 2",
-            "hint": "A hint",
-            "explanation": "Explanation for why this is correct"
-        },
-        {
-            "isCorrect": false,
-            "invalid": false,
-            "text": "Wrong Answer 1",
-            "hint": "A hint",
-            "explanation": "Explanation for why this is wrong"
-        },
-        {
-            "isCorrect": false,
-            "invalid": false,
-            "text": "Wrong Answer 2",
-            "hint": "A hint",
-            "explanation": "Explanation for why this is wrong"
-        }
-    ]
-}
diff --git a/src/test/cypress/fixtures/exercise/quiz/short_answer/question.txt b/src/test/cypress/fixtures/exercise/quiz/short_answer/question.txt
deleted file mode 100644
index 2691efde042f..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/short_answer/question.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Never gonna [-spot 1] you up
-Never gonna [-spot 2] you down
-Never gonna [-spot 3] around and [-spot 4] you
-Never gonna make you [-spot 5]
-Never gonna say [-spot 6]
-Never gonna tell a lie and hurt you
-
-
-[-option 1] give
-[-option 2] let
-[-option 3] run
-[-option 4] desert
-[-option 5] cry
-[-option 6] goodbye
diff --git a/src/test/cypress/fixtures/exercise/quiz/short_answer/submission.json b/src/test/cypress/fixtures/exercise/quiz/short_answer/submission.json
deleted file mode 100644
index dc62a419a4b8..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/short_answer/submission.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "submissionExerciseType": "quiz",
-    "submitted": false,
-    "submittedAnswers": [
-        {
-            "type": "short-answer",
-            "quizQuestion": null,
-            "submittedTexts": []
-        }
-    ]
-}
diff --git a/src/test/cypress/fixtures/exercise/quiz/short_answer/template.json b/src/test/cypress/fixtures/exercise/quiz/short_answer/template.json
deleted file mode 100644
index adb85d9280df..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/short_answer/template.json
+++ /dev/null
@@ -1,168 +0,0 @@
-{
-    "type": "short-answer",
-    "randomizeOrder": true,
-    "invalid": false,
-    "exportQuiz": false,
-    "matchLetterCase": false,
-    "similarityValue": 85,
-    "title": "Short Answer Quiz",
-    "text": "Never gonna [-spot 1] you up\nNever gonna [-spot 2] you down\nNever gonna [-spot 3] around and [-spot 4] you\nNever gonna make you [-spot 5]\nNever gonna say [-spot 6]\nNever gonna tell a lie and hurt you",
-    "scoringType": "PROPORTIONAL_WITHOUT_PENALTY",
-    "points": 1,
-    "spots": [
-        {
-            "tempID": 8562027009747859,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 1
-        },
-        {
-            "tempID": 1693282244205775,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 2
-        },
-        {
-            "tempID": 2470277842944981,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 3
-        },
-        {
-            "tempID": 1444701769469013,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 4
-        },
-        {
-            "tempID": 3791222413897993,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 5
-        },
-        {
-            "tempID": 1633040437192643,
-            "invalid": false,
-            "width": 15,
-            "spotNr": 6
-        }
-    ],
-    "solutions": [
-        {
-            "tempID": 7036040666954049,
-            "invalid": false,
-            "text": "give"
-        },
-        {
-            "tempID": 94143448556475,
-            "invalid": false,
-            "text": "let"
-        },
-        {
-            "tempID": 5696516478778027,
-            "invalid": false,
-            "text": "run"
-        },
-        {
-            "tempID": 3116087876447447,
-            "invalid": false,
-            "text": "desert"
-        },
-        {
-            "tempID": 8350692113124205,
-            "invalid": false,
-            "text": "cry"
-        },
-        {
-            "tempID": 1934608439373183,
-            "invalid": false,
-            "text": "goodbye"
-        }
-    ],
-    "correctMappings": [
-        {
-            "spot": {
-                "tempID": 8562027009747859,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 1
-            },
-            "solution": {
-                "tempID": 7036040666954049,
-                "invalid": false,
-                "text": "give"
-            },
-            "invalid": false
-        },
-        {
-            "spot": {
-                "tempID": 1693282244205775,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 2
-            },
-            "solution": {
-                "tempID": 94143448556475,
-                "invalid": false,
-                "text": "let"
-            },
-            "invalid": false
-        },
-        {
-            "spot": {
-                "tempID": 2470277842944981,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 3
-            },
-            "solution": {
-                "tempID": 5696516478778027,
-                "invalid": false,
-                "text": "run"
-            },
-            "invalid": false
-        },
-        {
-            "spot": {
-                "tempID": 1444701769469013,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 4
-            },
-            "solution": {
-                "tempID": 3116087876447447,
-                "invalid": false,
-                "text": "desert"
-            },
-            "invalid": false
-        },
-        {
-            "spot": {
-                "tempID": 3791222413897993,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 5
-            },
-            "solution": {
-                "tempID": 8350692113124205,
-                "invalid": false,
-                "text": "cry"
-            },
-            "invalid": false
-        },
-        {
-            "spot": {
-                "tempID": 1633040437192643,
-                "invalid": false,
-                "width": 15,
-                "spotNr": 6
-            },
-            "solution": {
-                "tempID": 1934608439373183,
-                "invalid": false,
-                "text": "goodbye"
-            },
-            "invalid": false
-        }
-    ]
-}
diff --git a/src/test/cypress/fixtures/exercise/quiz/template.json b/src/test/cypress/fixtures/exercise/quiz/template.json
deleted file mode 100644
index b487d5d1c09a..000000000000
--- a/src/test/cypress/fixtures/exercise/quiz/template.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "mode": "INDIVIDUAL",
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "numberOfAssessmentsOfCorrectionRounds": [{ "inTime": 0, "late": 0, "total": 0 }],
-    "studentAssignedTeamIdComputed": false,
-    "secondCorrectionEnabled": false,
-    "type": "quiz",
-    "bonusPoints": 0,
-    "isAtLeastTutor": false,
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "teamMode": false,
-    "assessmentDueDateError": false,
-    "dueDateError": false,
-    "presentationScoreEnabled": false,
-    "randomizeQuestionOrder": true,
-    "releaseDate": null,
-    "isVisibleBeforeStart": false,
-    "isOpenForPractice": false,
-    "isPlannedToStart": false,
-    "isActiveQuiz": false,
-    "isPracticeModeAvailable": true,
-    "title": "<some title>",
-    "duration": 600,
-    "quizQuestions": [],
-    "quizMode": "SYNCHRONIZED"
-}
diff --git a/src/test/cypress/fixtures/exercise/text/submission.json b/src/test/cypress/fixtures/exercise/text/submission.json
deleted file mode 100644
index 4e7acc5e5242..000000000000
--- a/src/test/cypress/fixtures/exercise/text/submission.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "text": "On the other hand, we denounce with righteous indignation and dislike men who are so beguiled and demoralized by the charms of pleasure of the moment, so blinded by desire, that they cannot foresee the pain and trouble that are bound to ensue; and equal blame belongs to those who fail in their duty through weakness of will, which is the same as saying through shrinking from toil and pain. These cases are perfectly simple and easy to distinguish."
-}
diff --git a/src/test/cypress/fixtures/exercise/text/template.json b/src/test/cypress/fixtures/exercise/text/template.json
deleted file mode 100644
index 9a185cec3058..000000000000
--- a/src/test/cypress/fixtures/exercise/text/template.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "mode": "INDIVIDUAL",
-    "includedInOverallScore": "INCLUDED_COMPLETELY",
-    "numberOfAssessmentsOfCorrectionRounds": [
-        {
-            "inTime": 0,
-            "late": 0
-        }
-    ],
-    "studentAssignedTeamIdComputed": false,
-    "secondCorrectionEnabled": false,
-    "type": "text",
-    "bonusPoints": 0,
-    "isAtLeastTutor": false,
-    "isAtLeastEditor": false,
-    "isAtLeastInstructor": false,
-    "teamMode": false,
-    "assessmentDueDateError": false,
-    "dueDateError": false,
-    "exampleSolutionPublicationDateError": false,
-    "exampleSolutionPublicationDateWarning": false,
-    "presentationScoreEnabled": false,
-    "assessmentType": "MANUAL",
-    "title": "Text Exercise 1",
-    "maxPoints": 10,
-    "problemStatement": "Problem Statement",
-    "exampleSolution": "Example Solution",
-    "gradingInstructions": "Assessment Instructions"
-}
diff --git a/src/test/cypress/fixtures/lecture/template.json b/src/test/cypress/fixtures/lecture/template.json
deleted file mode 100644
index 4c540b3d11f2..000000000000
--- a/src/test/cypress/fixtures/lecture/template.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "course": null,
-    "title": "Test lecture",
-    "channelName": "lecture-test-lecture",
-    "description": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.",
-    "startDate": null,
-    "endDate": null
-}
diff --git a/src/test/cypress/fixtures/loremIpsum-short.txt b/src/test/cypress/fixtures/loremIpsum-short.txt
deleted file mode 100644
index b9c7a9bd3d14..000000000000
--- a/src/test/cypress/fixtures/loremIpsum-short.txt
+++ /dev/null
@@ -1 +0,0 @@
-At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren.
\ No newline at end of file
diff --git a/src/test/cypress/fixtures/loremIpsum.txt b/src/test/cypress/fixtures/loremIpsum.txt
deleted file mode 100644
index b45a9d5eccd8..000000000000
--- a/src/test/cypress/fixtures/loremIpsum.txt
+++ /dev/null
@@ -1 +0,0 @@
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
\ No newline at end of file
diff --git a/src/test/cypress/fixtures/pdf-test-file.pdf b/src/test/cypress/fixtures/pdf-test-file.pdf
deleted file mode 100644
index e60c959ec0ba..000000000000
Binary files a/src/test/cypress/fixtures/pdf-test-file.pdf and /dev/null differ
diff --git a/src/test/cypress/init/ImportUsers.cy.ts b/src/test/cypress/init/ImportUsers.cy.ts
deleted file mode 100644
index 0e141f269d4c..000000000000
--- a/src/test/cypress/init/ImportUsers.cy.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { userManagementAPIRequest } from '../support/artemis';
-import { USER_ID, USER_ROLE, admin, instructor, studentFour, studentOne, studentThree, studentTwo, tutor, users } from '../support/users';
-
-describe('Setup users', () => {
-    if (Cypress.env('createUsers')) {
-        before('Creates all required users', () => {
-            cy.login(admin);
-            for (const userKey in USER_ID) {
-                const user = users.getUserWithId(USER_ID[userKey]);
-                userManagementAPIRequest.getUser(user.username).then((response) => {
-                    if (!response.isOkStatusCode) {
-                        userManagementAPIRequest.createUser(user.username, user.password, USER_ROLE[userKey]);
-                    }
-                });
-            }
-        });
-    }
-
-    it('Logs in once with all required users', () => {
-        // If Artemis hasn't imported the required users from Jira we have to force this by logging in with these users once
-        cy.login(admin);
-        cy.login(instructor);
-        cy.login(tutor);
-        cy.login(studentOne);
-        cy.login(studentTwo);
-        cy.login(studentThree);
-        cy.login(studentFour);
-    });
-});
diff --git a/src/test/cypress/package-lock.json b/src/test/cypress/package-lock.json
deleted file mode 100644
index 1b660ab0208e..000000000000
--- a/src/test/cypress/package-lock.json
+++ /dev/null
@@ -1,3222 +0,0 @@
-{
-    "name": "artemis_cypress",
-    "lockfileVersion": 3,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "artemis_cypress",
-            "license": "MIT",
-            "devDependencies": {
-                "@4tw/cypress-drag-drop": "2.2.5",
-                "@types/node": "20.9.1",
-                "cypress": "12.17.4",
-                "cypress-cloud": "2.0.0-beta.1",
-                "cypress-file-upload": "5.0.8",
-                "cypress-pipe": "2.0.0",
-                "cypress-wait-until": "2.0.1",
-                "typescript": "5.2.2",
-                "uuid": "9.0.1",
-                "wait-on": "7.2.0"
-            }
-        },
-        "node_modules/@4tw/cypress-drag-drop": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@4tw/cypress-drag-drop/-/cypress-drag-drop-2.2.5.tgz",
-            "integrity": "sha512-3ghTmzhOmUqeN6U3QmUnKRUxI7OMLbJA4hHUY/eS/FhWJgxbiGgcaELbolWnBAOpajPXcsNQGYEj9brd59WH6A==",
-            "dev": true,
-            "peerDependencies": {
-                "cypress": "2 - 13"
-            }
-        },
-        "node_modules/@babel/runtime": {
-            "version": "7.22.15",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
-            "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
-            "dev": true,
-            "dependencies": {
-                "regenerator-runtime": "^0.14.0"
-            },
-            "engines": {
-                "node": ">=6.9.0"
-            }
-        },
-        "node_modules/@colors/colors": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
-            "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
-            "dev": true,
-            "optional": true,
-            "engines": {
-                "node": ">=0.1.90"
-            }
-        },
-        "node_modules/@cypress/commit-info": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/@cypress/commit-info/-/commit-info-2.2.0.tgz",
-            "integrity": "sha512-A7CYS0Iqp/u52JTnSWlDFjWMKx7rIfd+mk0Fdksrcs4Wdf5HXPsoZO475VJ+xL7LPhJrjKhgyl/TPKO3worZyQ==",
-            "dev": true,
-            "dependencies": {
-                "bluebird": "3.5.5",
-                "check-more-types": "2.24.0",
-                "debug": "4.1.1",
-                "execa": "1.0.0",
-                "lazy-ass": "1.6.0",
-                "ramda": "0.26.1"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/bluebird": {
-            "version": "3.5.5",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
-            "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
-            "dev": true
-        },
-        "node_modules/@cypress/commit-info/node_modules/cross-spawn": {
-            "version": "6.0.5",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-            "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-            "dev": true,
-            "dependencies": {
-                "nice-try": "^1.0.4",
-                "path-key": "^2.0.1",
-                "semver": "^5.5.0",
-                "shebang-command": "^1.2.0",
-                "which": "^1.2.9"
-            },
-            "engines": {
-                "node": ">=4.8"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/execa": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-            "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^6.0.0",
-                "get-stream": "^4.0.0",
-                "is-stream": "^1.1.0",
-                "npm-run-path": "^2.0.0",
-                "p-finally": "^1.0.0",
-                "signal-exit": "^3.0.0",
-                "strip-eof": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/get-stream": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-            "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-            "dev": true,
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/is-stream": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-            "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/npm-run-path": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-            "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/path-key": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-            "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/shebang-command": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-            "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-            "dev": true,
-            "dependencies": {
-                "shebang-regex": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/shebang-regex": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-            "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/@cypress/commit-info/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
-        "node_modules/@cypress/request": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-            "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
-            "dev": true,
-            "dependencies": {
-                "aws-sign2": "~0.7.0",
-                "aws4": "^1.8.0",
-                "caseless": "~0.12.0",
-                "combined-stream": "~1.0.6",
-                "extend": "~3.0.2",
-                "forever-agent": "~0.6.1",
-                "form-data": "~2.3.2",
-                "http-signature": "~1.3.6",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.19",
-                "performance-now": "^2.1.0",
-                "qs": "6.10.4",
-                "safe-buffer": "^5.1.2",
-                "tough-cookie": "^4.1.3",
-                "tunnel-agent": "^0.6.0",
-                "uuid": "^8.3.2"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/@cypress/request/node_modules/uuid": {
-            "version": "8.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-            "dev": true,
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        },
-        "node_modules/@cypress/xvfb": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
-            "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^3.1.0",
-                "lodash.once": "^4.1.1"
-            }
-        },
-        "node_modules/@hapi/hoek": {
-            "version": "9.3.0",
-            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
-            "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
-            "dev": true
-        },
-        "node_modules/@hapi/topo": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
-            "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
-            "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0"
-            }
-        },
-        "node_modules/@nodelib/fs.scandir": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-            "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "2.0.5",
-                "run-parallel": "^1.1.9"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.stat": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-            "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@nodelib/fs.walk": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-            "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.scandir": "2.1.5",
-                "fastq": "^1.6.0"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/@sideway/address": {
-            "version": "4.1.4",
-            "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
-            "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
-            "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0"
-            }
-        },
-        "node_modules/@sideway/formula": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
-            "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
-            "dev": true
-        },
-        "node_modules/@sideway/pinpoint": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
-            "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
-            "dev": true
-        },
-        "node_modules/@types/node": {
-            "version": "20.9.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.1.tgz",
-            "integrity": "sha512-HhmzZh5LSJNS5O8jQKpJ/3ZcrrlG6L70hpGqMIAoM9YVD0YBRNWYsfwcXq8VnSjlNpCpgLzMXdiPo+dxcvSmiA==",
-            "dev": true,
-            "dependencies": {
-                "undici-types": "~5.26.4"
-            }
-        },
-        "node_modules/@types/sinonjs__fake-timers": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
-            "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
-            "dev": true
-        },
-        "node_modules/@types/sizzle": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
-            "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
-            "dev": true
-        },
-        "node_modules/@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/acorn": {
-            "version": "8.10.0",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
-            "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
-            "dev": true,
-            "bin": {
-                "acorn": "bin/acorn"
-            },
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/aggregate-error": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
-            "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
-            "dev": true,
-            "dependencies": {
-                "clean-stack": "^2.0.0",
-                "indent-string": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ajv": {
-            "version": "8.12.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-            "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-            "dev": true,
-            "dependencies": {
-                "fast-deep-equal": "^3.1.1",
-                "json-schema-traverse": "^1.0.0",
-                "require-from-string": "^2.0.2",
-                "uri-js": "^4.2.2"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/epoberezkin"
-            }
-        },
-        "node_modules/ansi-colors": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
-            "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/ansi-escapes": {
-            "version": "4.3.2",
-            "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-            "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-            "dev": true,
-            "dependencies": {
-                "type-fest": "^0.21.3"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ansi-styles": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-            "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-            "dev": true,
-            "dependencies": {
-                "color-convert": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
-        "node_modules/arch": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
-            "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/argparse": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-            "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-            "dev": true
-        },
-        "node_modules/array-union": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-            "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/asn1": {
-            "version": "0.2.6",
-            "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz",
-            "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==",
-            "dev": true,
-            "dependencies": {
-                "safer-buffer": "~2.1.0"
-            }
-        },
-        "node_modules/assert-plus": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-            "integrity": "sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/astral-regex": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-            "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/async": {
-            "version": "3.2.4",
-            "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
-            "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
-            "dev": true
-        },
-        "node_modules/asynckit": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-            "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-            "dev": true
-        },
-        "node_modules/at-least-node": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
-            "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
-        "node_modules/aws-sign2": {
-            "version": "0.7.0",
-            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-            "integrity": "sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/aws4": {
-            "version": "1.12.0",
-            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-            "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
-            "dev": true
-        },
-        "node_modules/axios": {
-            "version": "1.6.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-            "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
-            "dev": true,
-            "dependencies": {
-                "follow-redirects": "^1.15.0",
-                "form-data": "^4.0.0",
-                "proxy-from-env": "^1.1.0"
-            }
-        },
-        "node_modules/axios-retry": {
-            "version": "3.7.0",
-            "resolved": "https://registry.npmjs.org/axios-retry/-/axios-retry-3.7.0.tgz",
-            "integrity": "sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==",
-            "dev": true,
-            "dependencies": {
-                "@babel/runtime": "^7.15.4",
-                "is-retry-allowed": "^2.2.0"
-            }
-        },
-        "node_modules/axios/node_modules/form-data": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-            "dev": true,
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.8",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/axios/node_modules/proxy-from-env": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-            "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-            "dev": true
-        },
-        "node_modules/balanced-match": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-            "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-            "dev": true
-        },
-        "node_modules/base64-js": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-            "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/bcrypt-pbkdf": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-            "integrity": "sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==",
-            "dev": true,
-            "dependencies": {
-                "tweetnacl": "^0.14.3"
-            }
-        },
-        "node_modules/blob-util": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
-            "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
-            "dev": true
-        },
-        "node_modules/bluebird": {
-            "version": "3.7.2",
-            "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-            "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
-            "dev": true
-        },
-        "node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/braces": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-            "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-            "dev": true,
-            "dependencies": {
-                "fill-range": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/buffer": {
-            "version": "5.7.1",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-            "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.1.13"
-            }
-        },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true
-        },
-        "node_modules/cachedir": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
-            "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/caseless": {
-            "version": "0.12.0",
-            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-            "integrity": "sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==",
-            "dev": true
-        },
-        "node_modules/chalk": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-            "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.1.0",
-                "supports-color": "^7.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/chalk?sponsor=1"
-            }
-        },
-        "node_modules/chalk/node_modules/supports-color": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-            "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/check-more-types": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
-            "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.8.0"
-            }
-        },
-        "node_modules/ci-info": {
-            "version": "3.8.0",
-            "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
-            "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/sibiraj-s"
-                }
-            ],
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/clean-stack": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
-            "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/cli-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-            "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-            "dev": true,
-            "dependencies": {
-                "restore-cursor": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cli-table3": {
-            "version": "0.6.3",
-            "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
-            "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
-            "dev": true,
-            "dependencies": {
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": "10.* || >= 12.*"
-            },
-            "optionalDependencies": {
-                "@colors/colors": "1.5.0"
-            }
-        },
-        "node_modules/cli-truncate": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
-            "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
-            "dev": true,
-            "dependencies": {
-                "slice-ansi": "^3.0.0",
-                "string-width": "^4.2.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/color-convert": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-            "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-            "dev": true,
-            "dependencies": {
-                "color-name": "~1.1.4"
-            },
-            "engines": {
-                "node": ">=7.0.0"
-            }
-        },
-        "node_modules/color-name": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-            "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-            "dev": true
-        },
-        "node_modules/colorette": {
-            "version": "2.0.20",
-            "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-            "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
-            "dev": true
-        },
-        "node_modules/combined-stream": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-            "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-            "dev": true,
-            "dependencies": {
-                "delayed-stream": "~1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/commander": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
-            "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
-            "dev": true,
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/common-path-prefix": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
-            "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
-            "dev": true
-        },
-        "node_modules/common-tags": {
-            "version": "1.8.2",
-            "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
-            "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/concat-map": {
-            "version": "0.0.1",
-            "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-            "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-            "dev": true
-        },
-        "node_modules/core-util-is": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-            "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==",
-            "dev": true
-        },
-        "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.1.0",
-                "shebang-command": "^2.0.0",
-                "which": "^2.0.1"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/cy2": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/cy2/-/cy2-3.4.3.tgz",
-            "integrity": "sha512-I1yfJWJTRy2ROti1TlLM5Qk86WSeKMrtZbY/G6VD2tjm3VKTu6pDkpcV56C2HhN+txK5p6MMsmzKXJM2W9JlxA==",
-            "dev": true,
-            "dependencies": {
-                "acorn": "^8.8.0",
-                "debug": "^4.3.2",
-                "escodegen": "^2.0.0",
-                "estraverse": "^5.3.0",
-                "js-yaml": "^4.1.0",
-                "npm-which": "^3.0.1",
-                "slash": "3.0.0"
-            },
-            "bin": {
-                "cy2": "bin/cy2"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            }
-        },
-        "node_modules/cypress": {
-            "version": "12.17.4",
-            "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
-            "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
-            "dev": true,
-            "hasInstallScript": true,
-            "dependencies": {
-                "@cypress/request": "2.88.12",
-                "@cypress/xvfb": "^1.2.4",
-                "@types/node": "^16.18.39",
-                "@types/sinonjs__fake-timers": "8.1.1",
-                "@types/sizzle": "^2.3.2",
-                "arch": "^2.2.0",
-                "blob-util": "^2.0.2",
-                "bluebird": "^3.7.2",
-                "buffer": "^5.6.0",
-                "cachedir": "^2.3.0",
-                "chalk": "^4.1.0",
-                "check-more-types": "^2.24.0",
-                "cli-cursor": "^3.1.0",
-                "cli-table3": "~0.6.1",
-                "commander": "^6.2.1",
-                "common-tags": "^1.8.0",
-                "dayjs": "^1.10.4",
-                "debug": "^4.3.4",
-                "enquirer": "^2.3.6",
-                "eventemitter2": "6.4.7",
-                "execa": "4.1.0",
-                "executable": "^4.1.1",
-                "extract-zip": "2.0.1",
-                "figures": "^3.2.0",
-                "fs-extra": "^9.1.0",
-                "getos": "^3.2.1",
-                "is-ci": "^3.0.0",
-                "is-installed-globally": "~0.4.0",
-                "lazy-ass": "^1.6.0",
-                "listr2": "^3.8.3",
-                "lodash": "^4.17.21",
-                "log-symbols": "^4.0.0",
-                "minimist": "^1.2.8",
-                "ospath": "^1.2.2",
-                "pretty-bytes": "^5.6.0",
-                "process": "^0.11.10",
-                "proxy-from-env": "1.0.0",
-                "request-progress": "^3.0.0",
-                "semver": "^7.5.3",
-                "supports-color": "^8.1.1",
-                "tmp": "~0.2.1",
-                "untildify": "^4.0.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "cypress": "bin/cypress"
-            },
-            "engines": {
-                "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
-            }
-        },
-        "node_modules/cypress-cloud": {
-            "version": "2.0.0-beta.1",
-            "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-2.0.0-beta.1.tgz",
-            "integrity": "sha512-nMKf7077NaOK4AFHUwYGAnL3HtgTWsyQ+dSB4YxSH0GvQbtJo7Ljk0dlkzkUraiPb+0/Rr+XF0ozorSPz7ChJw==",
-            "dev": true,
-            "dependencies": {
-                "@cypress/commit-info": "^2.2.0",
-                "axios": "^1.2.0",
-                "axios-retry": "^3.4.0",
-                "bluebird": "^3.7.2",
-                "chalk": "^4.1.2",
-                "commander": "^10.0.0",
-                "common-path-prefix": "^3.0.0",
-                "cy2": "^3.4.2",
-                "date-fns": "^2.30.0",
-                "debug": "^4.3.4",
-                "execa": "^5.1.1",
-                "fast-safe-stringify": "^2.1.1",
-                "getos": "^3.2.1",
-                "globby": "^11.1.0",
-                "is-absolute": "^1.0.0",
-                "lil-http-terminator": "^1.2.3",
-                "lodash": "^4.17.21",
-                "nanoid": "^3.3.4",
-                "plur": "^4.0.0",
-                "pretty-ms": "^7.0.1",
-                "source-map-support": "^0.5.21",
-                "table": "^6.8.1",
-                "tmp-promise": "^3.0.3",
-                "ts-pattern": "^4.3.0",
-                "ws": "^8.13.0"
-            },
-            "bin": {
-                "cypress-cloud": "bin/cli.js"
-            },
-            "engines": {
-                "node": ">=14.7.0"
-            }
-        },
-        "node_modules/cypress-cloud/node_modules/commander": {
-            "version": "10.0.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
-            "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
-            "dev": true,
-            "engines": {
-                "node": ">=14"
-            }
-        },
-        "node_modules/cypress-cloud/node_modules/execa": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-            "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^7.0.3",
-                "get-stream": "^6.0.0",
-                "human-signals": "^2.1.0",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.1",
-                "onetime": "^5.1.2",
-                "signal-exit": "^3.0.3",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/cypress-cloud/node_modules/get-stream": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-            "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/cypress-cloud/node_modules/human-signals": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-            "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.17.0"
-            }
-        },
-        "node_modules/cypress-file-upload": {
-            "version": "5.0.8",
-            "resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz",
-            "integrity": "sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.2.1"
-            },
-            "peerDependencies": {
-                "cypress": ">3.0.0"
-            }
-        },
-        "node_modules/cypress-pipe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/cypress-pipe/-/cypress-pipe-2.0.0.tgz",
-            "integrity": "sha512-KW9s+bz4tFLucH3rBGfjW+Q12n7S4QpUSSyxiGrgPOfoHlbYWzAGB3H26MO0VTojqf9NVvfd5Kt0MH5XMgbfyg==",
-            "dev": true
-        },
-        "node_modules/cypress-wait-until": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/cypress-wait-until/-/cypress-wait-until-2.0.1.tgz",
-            "integrity": "sha512-+IyVnYNiaX1+C+V/LazrJWAi/CqiwfNoRSrFviECQEyolW1gDRy765PZosL2alSSGK8V10Y7BGfOQyZUDgmnjQ==",
-            "dev": true
-        },
-        "node_modules/cypress/node_modules/@types/node": {
-            "version": "16.18.54",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.54.tgz",
-            "integrity": "sha512-oTmGy68gxZZ21FhTJVVvZBYpQHEBZxHKTsGshobMqm9qWpbqdZsA5jvsuPZcHu0KwpmLrOHWPdEfg7XDpNT9UA==",
-            "dev": true
-        },
-        "node_modules/dashdash": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-            "integrity": "sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/date-fns": {
-            "version": "2.30.0",
-            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
-            "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
-            "dev": true,
-            "dependencies": {
-                "@babel/runtime": "^7.21.0"
-            },
-            "engines": {
-                "node": ">=0.11"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/date-fns"
-            }
-        },
-        "node_modules/dayjs": {
-            "version": "1.11.9",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
-            "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==",
-            "dev": true
-        },
-        "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/delayed-stream": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-            "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/dir-glob": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-            "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-            "dev": true,
-            "dependencies": {
-                "path-type": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/ecc-jsbn": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-            "integrity": "sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==",
-            "dev": true,
-            "dependencies": {
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.1.0"
-            }
-        },
-        "node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true
-        },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
-        "node_modules/enquirer": {
-            "version": "2.4.1",
-            "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
-            "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-colors": "^4.1.1",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/escape-string-regexp": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-            "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.8.0"
-            }
-        },
-        "node_modules/escodegen": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-            "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
-            "dev": true,
-            "dependencies": {
-                "esprima": "^4.0.1",
-                "estraverse": "^5.2.0",
-                "esutils": "^2.0.2"
-            },
-            "bin": {
-                "escodegen": "bin/escodegen.js",
-                "esgenerate": "bin/esgenerate.js"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "optionalDependencies": {
-                "source-map": "~0.6.1"
-            }
-        },
-        "node_modules/esprima": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-            "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-            "dev": true,
-            "bin": {
-                "esparse": "bin/esparse.js",
-                "esvalidate": "bin/esvalidate.js"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/estraverse": {
-            "version": "5.3.0",
-            "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-            "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
-            "dev": true,
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/esutils": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-            "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/eventemitter2": {
-            "version": "6.4.7",
-            "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
-            "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
-            "dev": true
-        },
-        "node_modules/execa": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
-            "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
-            "dev": true,
-            "dependencies": {
-                "cross-spawn": "^7.0.0",
-                "get-stream": "^5.0.0",
-                "human-signals": "^1.1.1",
-                "is-stream": "^2.0.0",
-                "merge-stream": "^2.0.0",
-                "npm-run-path": "^4.0.0",
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2",
-                "strip-final-newline": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/execa?sponsor=1"
-            }
-        },
-        "node_modules/executable": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
-            "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
-            "dev": true,
-            "dependencies": {
-                "pify": "^2.2.0"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/extend": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-            "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-            "dev": true
-        },
-        "node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/extsprintf": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-            "integrity": "sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ]
-        },
-        "node_modules/fast-deep-equal": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-            "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-            "dev": true
-        },
-        "node_modules/fast-glob": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
-            "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
-            "dev": true,
-            "dependencies": {
-                "@nodelib/fs.stat": "^2.0.2",
-                "@nodelib/fs.walk": "^1.2.3",
-                "glob-parent": "^5.1.2",
-                "merge2": "^1.3.0",
-                "micromatch": "^4.0.4"
-            },
-            "engines": {
-                "node": ">=8.6.0"
-            }
-        },
-        "node_modules/fast-safe-stringify": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
-            "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
-            "dev": true
-        },
-        "node_modules/fastq": {
-            "version": "1.15.0",
-            "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-            "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-            "dev": true,
-            "dependencies": {
-                "reusify": "^1.0.4"
-            }
-        },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "dev": true,
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
-        "node_modules/figures": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-            "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-            "dev": true,
-            "dependencies": {
-                "escape-string-regexp": "^1.0.5"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/fill-range": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-            "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-            "dev": true,
-            "dependencies": {
-                "to-regex-range": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/follow-redirects": {
-            "version": "1.15.6",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/RubenVerborgh"
-                }
-            ],
-            "engines": {
-                "node": ">=4.0"
-            },
-            "peerDependenciesMeta": {
-                "debug": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/forever-agent": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-            "integrity": "sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/form-data": {
-            "version": "2.3.3",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-            "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-            "dev": true,
-            "dependencies": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.6",
-                "mime-types": "^2.1.12"
-            },
-            "engines": {
-                "node": ">= 0.12"
-            }
-        },
-        "node_modules/fs-extra": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-            "dev": true,
-            "dependencies": {
-                "at-least-node": "^1.0.0",
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^6.0.1",
-                "universalify": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/fs.realpath": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-            "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-            "dev": true
-        },
-        "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
-            "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-proto": "^1.0.1",
-                "has-symbols": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "dev": true,
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/getos": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
-            "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
-            "dev": true,
-            "dependencies": {
-                "async": "^3.2.0"
-            }
-        },
-        "node_modules/getpass": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-            "integrity": "sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0"
-            }
-        },
-        "node_modules/glob": {
-            "version": "7.2.3",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-            "dev": true,
-            "dependencies": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.1.1",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-            },
-            "engines": {
-                "node": "*"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "dev": true,
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/global-dirs": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
-            "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
-            "dev": true,
-            "dependencies": {
-                "ini": "2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/globby": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-            "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-            "dev": true,
-            "dependencies": {
-                "array-union": "^2.1.0",
-                "dir-glob": "^3.0.1",
-                "fast-glob": "^3.2.9",
-                "ignore": "^5.2.0",
-                "merge2": "^1.4.1",
-                "slash": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.11",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
-            "dev": true
-        },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "dependencies": {
-                "function-bind": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
-        "node_modules/has-flag": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-            "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/has-proto": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
-            "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/http-signature": {
-            "version": "1.3.6",
-            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
-            "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
-            "dev": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0",
-                "jsprim": "^2.0.2",
-                "sshpk": "^1.14.1"
-            },
-            "engines": {
-                "node": ">=0.10"
-            }
-        },
-        "node_modules/human-signals": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-            "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.12.0"
-            }
-        },
-        "node_modules/ieee754": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-            "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/ignore": {
-            "version": "5.2.4",
-            "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
-            "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4"
-            }
-        },
-        "node_modules/indent-string": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-            "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/inflight": {
-            "version": "1.0.6",
-            "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-            "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-            }
-        },
-        "node_modules/inherits": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-            "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-            "dev": true
-        },
-        "node_modules/ini": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-            "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/irregular-plurals": {
-            "version": "3.5.0",
-            "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
-            "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-absolute": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-            "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-            "dev": true,
-            "dependencies": {
-                "is-relative": "^1.0.0",
-                "is-windows": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-ci": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
-            "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
-            "dev": true,
-            "dependencies": {
-                "ci-info": "^3.2.0"
-            },
-            "bin": {
-                "is-ci": "bin.js"
-            }
-        },
-        "node_modules/is-extglob": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-            "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-fullwidth-code-point": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-            "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-glob": {
-            "version": "4.0.3",
-            "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-            "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-            "dev": true,
-            "dependencies": {
-                "is-extglob": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-installed-globally": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-            "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-            "dev": true,
-            "dependencies": {
-                "global-dirs": "^3.0.0",
-                "is-path-inside": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-number": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-            "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.12.0"
-            }
-        },
-        "node_modules/is-path-inside": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-relative": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-            "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-            "dev": true,
-            "dependencies": {
-                "is-unc-path": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-retry-allowed": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
-            "integrity": "sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-stream": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-            "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-typedarray": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-            "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
-            "dev": true
-        },
-        "node_modules/is-unc-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-            "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-            "dev": true,
-            "dependencies": {
-                "unc-path-regex": "^0.1.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/is-unicode-supported": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-            "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/is-windows": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-            "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/isexe": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-            "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-            "dev": true
-        },
-        "node_modules/isstream": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-            "integrity": "sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==",
-            "dev": true
-        },
-        "node_modules/joi": {
-            "version": "17.11.0",
-            "resolved": "https://registry.npmjs.org/joi/-/joi-17.11.0.tgz",
-            "integrity": "sha512-NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==",
-            "dev": true,
-            "dependencies": {
-                "@hapi/hoek": "^9.0.0",
-                "@hapi/topo": "^5.0.0",
-                "@sideway/address": "^4.1.3",
-                "@sideway/formula": "^3.0.1",
-                "@sideway/pinpoint": "^2.0.0"
-            }
-        },
-        "node_modules/js-yaml": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-            "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-            "dev": true,
-            "dependencies": {
-                "argparse": "^2.0.1"
-            },
-            "bin": {
-                "js-yaml": "bin/js-yaml.js"
-            }
-        },
-        "node_modules/jsbn": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-            "integrity": "sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==",
-            "dev": true
-        },
-        "node_modules/json-schema": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-            "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-            "dev": true
-        },
-        "node_modules/json-schema-traverse": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-            "dev": true
-        },
-        "node_modules/json-stringify-safe": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-            "dev": true
-        },
-        "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-            "dev": true,
-            "dependencies": {
-                "universalify": "^2.0.0"
-            },
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/jsprim": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
-            "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ],
-            "dependencies": {
-                "assert-plus": "1.0.0",
-                "extsprintf": "1.3.0",
-                "json-schema": "0.4.0",
-                "verror": "1.10.0"
-            }
-        },
-        "node_modules/lazy-ass": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
-            "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
-            "dev": true,
-            "engines": {
-                "node": "> 0.8"
-            }
-        },
-        "node_modules/lil-http-terminator": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/lil-http-terminator/-/lil-http-terminator-1.2.3.tgz",
-            "integrity": "sha512-vQcHSwAFq/kTR2cG6peOVS7SjgksGgSPeH0G2lkw+buue33thE/FCHdn10wJXXshc5RswFy0Iaz48qA2Busw5Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=12"
-            }
-        },
-        "node_modules/listr2": {
-            "version": "3.14.0",
-            "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
-            "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
-            "dev": true,
-            "dependencies": {
-                "cli-truncate": "^2.1.0",
-                "colorette": "^2.0.16",
-                "log-update": "^4.0.0",
-                "p-map": "^4.0.0",
-                "rfdc": "^1.3.0",
-                "rxjs": "^7.5.1",
-                "through": "^2.3.8",
-                "wrap-ansi": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "enquirer": ">= 2.3.0 < 3"
-            },
-            "peerDependenciesMeta": {
-                "enquirer": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/lodash": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-            "dev": true
-        },
-        "node_modules/lodash.once": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
-            "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
-            "dev": true
-        },
-        "node_modules/lodash.truncate": {
-            "version": "4.4.2",
-            "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-            "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-            "dev": true
-        },
-        "node_modules/log-symbols": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-            "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-            "dev": true,
-            "dependencies": {
-                "chalk": "^4.1.0",
-                "is-unicode-supported": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-update": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
-            "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
-            "dev": true,
-            "dependencies": {
-                "ansi-escapes": "^4.3.0",
-                "cli-cursor": "^3.1.0",
-                "slice-ansi": "^4.0.0",
-                "wrap-ansi": "^6.2.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/log-update/node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/log-update/node_modules/wrap-ansi": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
-            "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/merge-stream": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-            "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-            "dev": true
-        },
-        "node_modules/merge2": {
-            "version": "1.4.1",
-            "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-            "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/micromatch": {
-            "version": "4.0.5",
-            "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-            "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
-            "dev": true,
-            "dependencies": {
-                "braces": "^3.0.2",
-                "picomatch": "^2.3.1"
-            },
-            "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/mime-db": {
-            "version": "1.52.0",
-            "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-            "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mime-types": {
-            "version": "2.1.35",
-            "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-            "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-            "dev": true,
-            "dependencies": {
-                "mime-db": "1.52.0"
-            },
-            "engines": {
-                "node": ">= 0.6"
-            }
-        },
-        "node_modules/mimic-fn": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-            "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/minimist": {
-            "version": "1.2.8",
-            "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-            "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/nanoid": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
-            "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "bin": {
-                "nanoid": "bin/nanoid.cjs"
-            },
-            "engines": {
-                "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-            }
-        },
-        "node_modules/nice-try": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-            "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-            "dev": true
-        },
-        "node_modules/npm-path": {
-            "version": "2.0.4",
-            "resolved": "https://registry.npmjs.org/npm-path/-/npm-path-2.0.4.tgz",
-            "integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
-            "dev": true,
-            "dependencies": {
-                "which": "^1.2.10"
-            },
-            "bin": {
-                "npm-path": "bin/npm-path"
-            },
-            "engines": {
-                "node": ">=0.8"
-            }
-        },
-        "node_modules/npm-path/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
-        "node_modules/npm-run-path": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-            "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-            "dev": true,
-            "dependencies": {
-                "path-key": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/npm-which": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/npm-which/-/npm-which-3.0.1.tgz",
-            "integrity": "sha512-CM8vMpeFQ7MAPin0U3wzDhSGV0hMHNwHU0wjo402IVizPDrs45jSfSuoC+wThevY88LQti8VvaAnqYAeVy3I1A==",
-            "dev": true,
-            "dependencies": {
-                "commander": "^2.9.0",
-                "npm-path": "^2.0.2",
-                "which": "^1.2.10"
-            },
-            "bin": {
-                "npm-which": "bin/npm-which.js"
-            },
-            "engines": {
-                "node": ">=4.2.0"
-            }
-        },
-        "node_modules/npm-which/node_modules/commander": {
-            "version": "2.20.3",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-            "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-            "dev": true
-        },
-        "node_modules/npm-which/node_modules/which": {
-            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-            "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "which": "bin/which"
-            }
-        },
-        "node_modules/object-inspect": {
-            "version": "1.12.3",
-            "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-            "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
-            "dev": true,
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dev": true,
-            "dependencies": {
-                "wrappy": "1"
-            }
-        },
-        "node_modules/onetime": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-            "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-            "dev": true,
-            "dependencies": {
-                "mimic-fn": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/ospath": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
-            "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
-            "dev": true
-        },
-        "node_modules/p-finally": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-            "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/p-map": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-            "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
-            "dev": true,
-            "dependencies": {
-                "aggregate-error": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/parse-ms": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz",
-            "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/path-is-absolute": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-            "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/path-key": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-            "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/path-type": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-            "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "dev": true
-        },
-        "node_modules/performance-now": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-            "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
-            "dev": true
-        },
-        "node_modules/picomatch": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/jonschlinkert"
-            }
-        },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/plur": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
-            "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
-            "dev": true,
-            "dependencies": {
-                "irregular-plurals": "^3.2.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/pretty-bytes": {
-            "version": "5.6.0",
-            "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
-            "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/pretty-ms": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz",
-            "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==",
-            "dev": true,
-            "dependencies": {
-                "parse-ms": "^2.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/process": {
-            "version": "0.11.10",
-            "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-            "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-            "dev": true,
-            "engines": {
-                "node": ">= 0.6.0"
-            }
-        },
-        "node_modules/proxy-from-env": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
-            "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
-            "dev": true
-        },
-        "node_modules/psl": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
-            "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
-            "dev": true
-        },
-        "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "node_modules/punycode": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
-            "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/qs": {
-            "version": "6.10.4",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.4.tgz",
-            "integrity": "sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==",
-            "dev": true,
-            "dependencies": {
-                "side-channel": "^1.0.4"
-            },
-            "engines": {
-                "node": ">=0.6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/querystringify": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
-            "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
-            "dev": true
-        },
-        "node_modules/queue-microtask": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-            "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/ramda": {
-            "version": "0.26.1",
-            "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
-            "integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==",
-            "dev": true
-        },
-        "node_modules/regenerator-runtime": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-            "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
-            "dev": true
-        },
-        "node_modules/request-progress": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-            "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
-            "dev": true,
-            "dependencies": {
-                "throttleit": "^1.0.0"
-            }
-        },
-        "node_modules/require-from-string": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-            "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/requires-port": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-            "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
-            "dev": true
-        },
-        "node_modules/restore-cursor": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-            "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-            "dev": true,
-            "dependencies": {
-                "onetime": "^5.1.0",
-                "signal-exit": "^3.0.2"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/reusify": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-            "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-            "dev": true,
-            "engines": {
-                "iojs": ">=1.0.0",
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/rfdc": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
-            "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
-            "dev": true
-        },
-        "node_modules/rimraf": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-            "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-            "dev": true,
-            "dependencies": {
-                "glob": "^7.1.3"
-            },
-            "bin": {
-                "rimraf": "bin.js"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/run-parallel": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-            "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "dependencies": {
-                "queue-microtask": "^1.2.2"
-            }
-        },
-        "node_modules/rxjs": {
-            "version": "7.8.1",
-            "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
-            "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
-            "dev": true,
-            "dependencies": {
-                "tslib": "^2.1.0"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/safer-buffer": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-            "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true
-        },
-        "node_modules/semver": {
-            "version": "7.5.3",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz",
-            "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==",
-            "dev": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/shebang-command": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-            "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-            "dev": true,
-            "dependencies": {
-                "shebang-regex": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/shebang-regex": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-            "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/side-channel": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
-            "dev": true,
-            "dependencies": {
-                "call-bind": "^1.0.0",
-                "get-intrinsic": "^1.0.2",
-                "object-inspect": "^1.9.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/signal-exit": {
-            "version": "3.0.7",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-            "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-            "dev": true
-        },
-        "node_modules/slash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-            "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/slice-ansi": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
-            "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
-            "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/sshpk": {
-            "version": "1.17.0",
-            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-            "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
-            "dev": true,
-            "dependencies": {
-                "asn1": "~0.2.3",
-                "assert-plus": "^1.0.0",
-                "bcrypt-pbkdf": "^1.0.0",
-                "dashdash": "^1.12.0",
-                "ecc-jsbn": "~0.1.1",
-                "getpass": "^0.1.1",
-                "jsbn": "~0.1.0",
-                "safer-buffer": "^2.0.2",
-                "tweetnacl": "~0.14.0"
-            },
-            "bin": {
-                "sshpk-conv": "bin/sshpk-conv",
-                "sshpk-sign": "bin/sshpk-sign",
-                "sshpk-verify": "bin/sshpk-verify"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/strip-eof": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-            "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/strip-final-newline": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-            "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/supports-color": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-            "dev": true,
-            "dependencies": {
-                "has-flag": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/supports-color?sponsor=1"
-            }
-        },
-        "node_modules/table": {
-            "version": "6.8.1",
-            "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-            "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
-            "dev": true,
-            "dependencies": {
-                "ajv": "^8.0.1",
-                "lodash.truncate": "^4.4.2",
-                "slice-ansi": "^4.0.0",
-                "string-width": "^4.2.3",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=10.0.0"
-            }
-        },
-        "node_modules/table/node_modules/slice-ansi": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-            "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "astral-regex": "^2.0.0",
-                "is-fullwidth-code-point": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-            }
-        },
-        "node_modules/throttleit": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
-            "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
-            "dev": true
-        },
-        "node_modules/through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-            "dev": true
-        },
-        "node_modules/tmp": {
-            "version": "0.2.1",
-            "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-            "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-            "dev": true,
-            "dependencies": {
-                "rimraf": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8.17.0"
-            }
-        },
-        "node_modules/tmp-promise": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
-            "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
-            "dev": true,
-            "dependencies": {
-                "tmp": "^0.2.0"
-            }
-        },
-        "node_modules/to-regex-range": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-            "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-            "dev": true,
-            "dependencies": {
-                "is-number": "^7.0.0"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/tough-cookie": {
-            "version": "4.1.3",
-            "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
-            "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
-            "dev": true,
-            "dependencies": {
-                "psl": "^1.1.33",
-                "punycode": "^2.1.1",
-                "universalify": "^0.2.0",
-                "url-parse": "^1.5.3"
-            },
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/tough-cookie/node_modules/universalify": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
-            "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
-        "node_modules/ts-pattern": {
-            "version": "4.3.0",
-            "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.3.0.tgz",
-            "integrity": "sha512-pefrkcd4lmIVR0LA49Imjf9DYLK8vtWhqBPA3Ya1ir8xCW0O2yjL9dsCVvI7pCodLC5q7smNpEtDR2yVulQxOg==",
-            "dev": true
-        },
-        "node_modules/tslib": {
-            "version": "2.6.2",
-            "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-            "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-            "dev": true
-        },
-        "node_modules/tunnel-agent": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-            "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==",
-            "dev": true,
-            "dependencies": {
-                "safe-buffer": "^5.0.1"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/tweetnacl": {
-            "version": "0.14.5",
-            "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-            "integrity": "sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==",
-            "dev": true
-        },
-        "node_modules/type-fest": {
-            "version": "0.21.3",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-            "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/typescript": {
-            "version": "5.2.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-            "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
-            "dev": true,
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
-        "node_modules/unc-path-regex": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-            "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/undici-types": {
-            "version": "5.26.5",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-            "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-            "dev": true
-        },
-        "node_modules/universalify": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
-            "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
-            "dev": true,
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/untildify": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-            "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/url-parse": {
-            "version": "1.5.10",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
-            "dev": true,
-            "dependencies": {
-                "querystringify": "^2.1.1",
-                "requires-port": "^1.0.0"
-            }
-        },
-        "node_modules/uuid": {
-            "version": "9.0.1",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-            "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
-            "dev": true,
-            "funding": [
-                "https://github.com/sponsors/broofa",
-                "https://github.com/sponsors/ctavan"
-            ],
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        },
-        "node_modules/verror": {
-            "version": "1.10.0",
-            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-            "integrity": "sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==",
-            "dev": true,
-            "engines": [
-                "node >=0.6.0"
-            ],
-            "dependencies": {
-                "assert-plus": "^1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "^1.2.0"
-            }
-        },
-        "node_modules/wait-on": {
-            "version": "7.2.0",
-            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.2.0.tgz",
-            "integrity": "sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ==",
-            "dev": true,
-            "dependencies": {
-                "axios": "^1.6.1",
-                "joi": "^17.11.0",
-                "lodash": "^4.17.21",
-                "minimist": "^1.2.8",
-                "rxjs": "^7.8.1"
-            },
-            "bin": {
-                "wait-on": "bin/wait-on"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
-        "node_modules/which": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-            "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "dev": true,
-            "dependencies": {
-                "isexe": "^2.0.0"
-            },
-            "bin": {
-                "node-which": "bin/node-which"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true
-        },
-        "node_modules/ws": {
-            "version": "8.14.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.1.tgz",
-            "integrity": "sha512-4OOseMUq8AzRBI/7SLMUwO+FEDnguetSk7KMb1sHwvF2w2Wv5Hoj0nlifx8vtGsftE/jWHojPy8sMMzYLJ2G/A==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": ">=5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true
-        },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "dev": true,
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        }
-    }
-}
diff --git a/src/test/cypress/package.json b/src/test/cypress/package.json
deleted file mode 100644
index 88a277ab0820..000000000000
--- a/src/test/cypress/package.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "artemis_cypress",
-    "description": "Cypress tests for Artemis",
-    "private": true,
-    "license": "MIT",
-    "cacheDirectories": [
-        "node_modules"
-    ],
-    "devDependencies": {
-        "@4tw/cypress-drag-drop": "2.2.5",
-        "@types/node": "20.9.1",
-        "cypress": "12.17.4",
-        "cypress-cloud": "2.0.0-beta.1",
-        "cypress-file-upload": "5.0.8",
-        "cypress-wait-until": "2.0.1",
-        "cypress-pipe": "2.0.0",
-        "typescript": "5.2.2",
-        "uuid": "9.0.1",
-        "wait-on": "7.2.0"
-    },
-    "overrides": {
-        "semver": "7.5.3",
-        "word-wrap": "1.2.3",
-        "debug": "4.3.4",
-        "tough-cookie": "4.1.3",
-        "@cypress/request": "3.0.1"
-    },
-    "scripts": {
-        "cypress:open": "cypress open",
-        "cypress:run": "cypress run --browser=chrome",
-        "cypress:setup": "cypress install && cypress run --quiet --spec init/ImportUsers.cy.ts",
-        "cypress:record:mysql": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (MySQL)\"",
-        "cypress:record:postgres": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (Postgres)\"",
-        "cypress:record:local": "npx cypress-cloud run --parallel --record --ci-build-id \"${SORRY_CYPRESS_BRANCH_NAME} #${SORRY_CYPRESS_BUILD_ID} ${SORRY_CYPRESS_RERUN_COUNT} (Local)\"",
-        "update": "ncu -i --format group"
-    }
-}
diff --git a/src/test/cypress/support/artemis.ts b/src/test/cypress/support/artemis.ts
deleted file mode 100644
index c23be9249317..000000000000
--- a/src/test/cypress/support/artemis.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ArtemisPageobjects } from './pageobjects/ArtemisPageobjects';
-import { ArtemisRequests } from './requests/ArtemisRequests';
-
-/**
- * File which contains all shared code related to testing Artemis.
- */
-
-// Requests
-const requests = new ArtemisRequests();
-export const communicationAPIRequest = requests.communication;
-export const courseManagementAPIRequest = requests.courseManagement;
-export const examAPIRequests = requests.exam;
-export const exerciseAPIRequest = requests.exercise;
-export const userManagementAPIRequest = requests.userManagement;
-
-// PageObjects
-const pageObjects = new ArtemisPageobjects();
-
-export const loginPage = pageObjects.login;
-
-export const courseCreation = pageObjects.course.creation;
-export const courseList = pageObjects.course.list;
-export const courseOverview = pageObjects.course.overview;
-export const courseManagement = pageObjects.course.management;
-export const courseManagementExercises = pageObjects.course.managementExercises;
-export const courseMessages = pageObjects.course.messages;
-export const courseAssessment = pageObjects.assessment.course;
-
-export const lectureCreation = pageObjects.lecture.creation;
-export const lectureManagement = pageObjects.lecture.management;
-
-export const navigationBar = pageObjects.navigationBar;
-
-export const examCreation = pageObjects.exam.creation;
-export const examManagement = pageObjects.exam.management;
-export const examDetails = pageObjects.exam.details;
-export const examAssessment = pageObjects.assessment.exam;
-export const examNavigation = pageObjects.exam.navigationBar;
-export const examStartEnd = pageObjects.exam.startEnd;
-export const examExerciseGroupCreation = pageObjects.exam.exerciseGroupCreation;
-export const examExerciseGroups = pageObjects.exam.exerciseGroups;
-export const examParticipation = pageObjects.exam.participation;
-export const examTestRun = pageObjects.exam.testRun;
-export const studentExamManagement = pageObjects.exam.studentExamManagement;
-
-export const studentAssessment = pageObjects.assessment.student;
-
-export const exerciseAssessment = pageObjects.assessment.exercise;
-export const exerciseResult = pageObjects.exercise.result;
-
-export const textExerciseCreation = pageObjects.exercise.text.creation;
-export const textExerciseEditor = pageObjects.exercise.text.editor;
-export const textExerciseAssessment = pageObjects.assessment.text;
-export const textExerciseFeedback = pageObjects.exercise.text.feedback;
-export const textExerciseExampleSubmissionCreation = pageObjects.exercise.text.exampleSubmissionCreation;
-export const textExerciseExampleSubmissions = pageObjects.exercise.text.exampleSubmissions;
-
-export const modelingExerciseCreation = pageObjects.exercise.modeling.creation;
-export const modelingExerciseEditor = pageObjects.exercise.modeling.editor;
-export const modelingExerciseAssessment = pageObjects.assessment.modeling;
-export const modelingExerciseFeedback = pageObjects.exercise.modeling.feedback;
-
-export const programmingExerciseCreation = pageObjects.exercise.programming.creation;
-export const programmingExerciseEditor = pageObjects.exercise.programming.editor;
-export const programmingExerciseAssessment = pageObjects.assessment.programming;
-export const programmingExerciseFeedback = pageObjects.exercise.programming.feedback;
-export const programmingExercisesScaConfig = pageObjects.exercise.programming.scaConfiguration;
-export const programmingExerciseScaFeedback = pageObjects.exercise.programming.scaFeedback;
-
-export const quizExerciseCreation = pageObjects.exercise.quiz.creation;
-export const quizExerciseMultipleChoice = pageObjects.exercise.quiz.multipleChoice;
-export const quizExerciseShortAnswerQuiz = pageObjects.exercise.quiz.shortAnswer;
-export const quizExerciseDragAndDropQuiz = pageObjects.exercise.quiz.dragAndDrop;
-
-export const fileUploadExerciseCreation = pageObjects.exercise.fileUpload.creation;
-export const fileUploadExerciseEditor = pageObjects.exercise.fileUpload.editor;
-export const fileUploadExerciseAssessment = pageObjects.assessment.fileUpload;
-export const fileUploadExerciseFeedback = pageObjects.exercise.fileUpload.feedback;
diff --git a/src/test/cypress/support/commands.ts b/src/test/cypress/support/commands.ts
deleted file mode 100644
index d2bf385fe315..000000000000
--- a/src/test/cypress/support/commands.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add('login', (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
-import { BASE_API, POST } from './constants';
-import { CypressCredentials } from './users';
-
-export {};
-
-declare global {
-    // eslint-disable-next-line @typescript-eslint/no-namespace
-    namespace Cypress {
-        interface Chainable {
-            login(credentials: CypressCredentials, url?: string): any;
-            loginWithGUI(credentials: CypressCredentials): any;
-            getSettled(selector: string, options?: any): Chainable<unknown>;
-            reloadUntilFound(selector: string, interval?: number, timeout?: number): Chainable<undefined>;
-            formRequest(url: string, method: string, formData: FormData): Chainable<any>;
-        }
-    }
-}
-
-/**
- * Logs in using API
- * */
-Cypress.Commands.add('login', (credentials: CypressCredentials, url) => {
-    const username = credentials.username;
-    const password = credentials.password;
-
-    cy.session(
-        username,
-        () => {
-            // IMPORTANT: The "log" and "failOnStatusCode" fields need to be set to false to prevent leakage of the credentials via the Cypress Dashboard!
-            // log = false does not prevent cypress to log the request if it failed, so failOnStatusCode also needs to be set to false, so that the request is never logged.
-            // We still want to the test to fail if the authentication is unsuccessful, so we expect the status code in the then block. This only logs the status code, so it is safe.
-            cy.request({
-                url: `${BASE_API}/public/authenticate`,
-                method: POST,
-                followRedirect: true,
-                body: {
-                    username,
-                    password,
-                    rememberMe: true,
-                },
-                log: false,
-                failOnStatusCode: false,
-            }).then((response) => {
-                expect(response.status).to.equal(200);
-            });
-        },
-        {
-            validate: () => {
-                cy.getCookie('jwt', { log: false }).should('exist');
-            },
-            cacheAcrossSpecs: true,
-        },
-    );
-    if (url) {
-        cy.visit(url);
-    }
-});
-
-/** recursively gets an element, returning only after it's determined to be attached to the DOM for good
- *  this prevents the "Element is detached from DOM" issue in some cases
- */
-Cypress.Commands.add('getSettled', (selector: any, opts: { retries?: number; delay?: number } = {}) => {
-    const retries = opts.retries || 3;
-    const delay = opts.delay || 100;
-
-    const isAttached = (resolve: any, count = 0) => {
-        const el = Cypress.$(selector);
-
-        // is element attached to the DOM?
-        count = Cypress.dom.isAttached(el) ? count + 1 : 0;
-
-        // hit our base case, return the element
-        if (count >= retries) {
-            return resolve(el);
-        }
-
-        // retry after a bit of a delay
-        setTimeout(() => isAttached(resolve, count), delay);
-    };
-
-    // wrap, so we can chain cypress commands off the result
-    return cy.wrap(null).then(() => {
-        return new Cypress.Promise((resolve) => {
-            return isAttached(resolve, 0);
-        }).then((el) => {
-            return cy.wrap(el);
-        });
-    });
-});
-
-/**
- * Periodically refreshes the page until an element with the specified selector is found. The command fails if the time exceeds the timeout.
- */
-Cypress.Commands.add('reloadUntilFound', (selector: string, interval = 2000, timeout = 20000) => {
-    return cy.waitUntil(
-        () => {
-            const found = Cypress.$(selector).length > 0;
-            if (!found) {
-                cy.reload();
-            }
-            return found;
-        },
-        {
-            interval,
-            timeout,
-            errorMsg: `Timed out finding an element matching the "${selector}" selector`,
-        },
-    );
-});
-
-Cypress.Commands.add('formRequest', (url: string, method: string, formData: FormData) => {
-    return cy
-        .intercept(method, url)
-        .as('formRequest')
-        .window()
-        .then((win) => {
-            const xhr = new win.XMLHttpRequest();
-            xhr.open(method, url);
-            const token = localStorage.getItem('authTokenKey')?.replace(/"/g, '');
-            if (token) {
-                const authHeader = 'Bearer ' + token;
-                xhr.setRequestHeader('Authorization', authHeader);
-            }
-            xhr.send(formData);
-        })
-        .wait('@formRequest')
-        .then((xhr: any) => {
-            return cy.wrap({ status: xhr.status, body: xhr.response.body });
-        });
-});
diff --git a/src/test/cypress/support/constants.ts b/src/test/cypress/support/constants.ts
deleted file mode 100644
index 97ee7440e57b..000000000000
--- a/src/test/cypress/support/constants.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-
-import { ProgrammingExerciseSubmission } from './pageobjects/exercises/programming/OnlineEditorPage';
-
-// Constants which are used in the test specs
-
-// Requests
-export const DELETE = 'DELETE';
-export const POST = 'POST';
-export const GET = 'GET';
-export const PUT = 'PUT';
-export const PATCH = 'PATCH';
-export const BASE_API = 'api';
-export const EXERCISE_BASE = `${BASE_API}/exercises`;
-
-export const COURSE_BASE = `${BASE_API}/courses`;
-export const COURSE_ADMIN_BASE = `${BASE_API}/admin/courses`;
-
-export const PROGRAMMING_EXERCISE_BASE = `${BASE_API}/programming-exercises`;
-export const QUIZ_EXERCISE_BASE = `${BASE_API}/quiz-exercises`;
-export const TEXT_EXERCISE_BASE = `${BASE_API}/text-exercises`;
-export const MODELING_EXERCISE_BASE = `${BASE_API}/modeling-exercises`;
-export const UPLOAD_EXERCISE_BASE = `${BASE_API}/file-upload-exercises`;
-
-// Constants
-export const USER_ID_SELECTOR = 'USERID';
-export const MODELING_EDITOR_CANVAS = '#modeling-editor-canvas';
-
-// Timeformat
-export const TIME_FORMAT = 'YYYY-MM-DDTHH:mm:ss.SSS';
-
-// ExerciseType
-// Copied from app/entities/exercise.model
-export enum ExerciseType {
-    PROGRAMMING = 'programming',
-    MODELING = 'modeling',
-    QUIZ = 'quiz',
-    TEXT = 'text',
-    FILE_UPLOAD = 'file-upload',
-}
-
-// ProgrammingLanguage
-// Copied from app/entities/programming-exercise.model
-export enum ProgrammingLanguage {
-    JAVA = 'JAVA',
-    PYTHON = 'PYTHON',
-    C = 'C',
-    HASKELL = 'HASKELL',
-    KOTLIN = 'KOTLIN',
-    VHDL = 'VHDL',
-    ASSEMBLER = 'ASSEMBLER',
-    SWIFT = 'SWIFT',
-    OCAML = 'OCAML',
-    EMPTY = 'EMPTY',
-}
-
-// ProgrammingExerciseAssessmentType
-export enum ProgrammingExerciseAssessmentType {
-    AUTOMATIC,
-    SEMI_AUTOMATIC,
-    MANUAL,
-}
-
-// AdditionalData
-export class AdditionalData {
-    quizExerciseID?: number;
-    submission?: ProgrammingExerciseSubmission;
-    expectedScore?: number;
-    textFixture?: string;
-    practiceMode?: boolean;
-    progExerciseAssessmentType?: ProgrammingExerciseAssessmentType;
-}
-
-// Exercise
-export type Exercise = {
-    title: string;
-    type: ExerciseType;
-    id: number;
-    additionalData?: AdditionalData;
-    exerciseGroup?: ExerciseGroup;
-};
diff --git a/src/test/cypress/support/index.ts b/src/test/cypress/support/index.ts
deleted file mode 100644
index 18be87965603..000000000000
--- a/src/test/cypress/support/index.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-
-// https://github.com/4teamwork/cypress-drag-drop#options adds .drag and .move commands
-import '@4tw/cypress-drag-drop';
-// Imports file upload capabilities https://github.com/abramenal/cypress-file-upload
-import 'cypress-file-upload';
-// Imports cy.waitUntil https://github.com/NoriSte/cypress-wait-until
-import 'cypress-wait-until';
-
-import './commands';
-// Imports utility functions
-import './utils';
-// Imports cy.pipe https://github.com/NicholasBoll/cypress-pipe
-import 'cypress-pipe';
-
-/**
- * We register hooks on the console.error and console.warn methods and forward their content to the process console to allow better debugging with cypress:run.
- */
-/*eslint-disable */
-Cypress.on('window:before:load', (win) => {
-    cy.stub(win.console, 'error').callsFake((msg) => {
-        cy.now('task', 'error', msg);
-    });
-
-    cy.stub(win.console, 'warn').callsFake((msg) => {
-        cy.now('task', 'warn', msg);
-    });
-});
-
-/**
- * We have to disable all service workers because the test will fail with a security exception and translations will also not be resolved properly otherwise.
- * For some reason this does not work when I add it to the hook above.
- */
-Cypress.on('window:before:load', (win) => {
-    delete win.navigator.__proto__.serviceWorker;
-});
-
-/**
- * On development environments (i.e. local environments) sentry is disabled and produces error messages in the console that cause cypress to fail.
- * This call tells cypress to ignore errors related to sentry
- */
-Cypress.on('uncaught:exception', (err, runnable) => {
-    return err.name === 'TypeError' && err?.stack?.includes('sentry');
-});
-
-/**
- * We want to log our test retries to the console to be able to see how often a test is retried.
- */
-const config: any = Cypress.config();
-if (!config.isInteractive && config.reporter !== 'spec') {
-    afterEach(() => {
-        const test = (cy as any).state('runnable')?.ctx?.currentTest;
-        if (test?.state === 'failed' && test?._currentRetry < test?._retries) {
-            cy.task('log', ` RERUN: (Attempt ${test._currentRetry + 1} of ${test._retries + 1}) ${test.title}`, { log: false });
-        }
-    });
-}
-/*eslint-enable */
diff --git a/src/test/cypress/support/pageobjects/ArtemisPageobjects.ts b/src/test/cypress/support/pageobjects/ArtemisPageobjects.ts
deleted file mode 100644
index 1e2bc2b56b82..000000000000
--- a/src/test/cypress/support/pageobjects/ArtemisPageobjects.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { LoginPage } from './LoginPage';
-import { NavigationBar } from './NavigationBar';
-import { CourseAssessmentDashboardPage } from './assessment/CourseAssessmentDashboardPage';
-import { ExamAssessmentPage } from './assessment/ExamAssessmentPage';
-import { ExerciseAssessmentDashboardPage } from './assessment/ExerciseAssessmentDashboardPage';
-import { FileUploadExerciseAssessmentPage } from './assessment/FileUploadExerciseAssessmentPage';
-import { ModelingExerciseAssessmentEditor } from './assessment/ModelingExerciseAssessmentEditor';
-import { ProgrammingExerciseAssessmentPage } from './assessment/ProgrammingExerciseAssessmentPage';
-import { StudentAssessmentPage } from './assessment/StudentAssessmentPage';
-import { TextExerciseAssessmentPage } from './assessment/TextExerciseAssessmentPage';
-import { CourseCreationPage } from './course/CourseCreationPage';
-import { CourseManagementExercisesPage } from './course/CourseManagementExercisesPage';
-import { CourseManagementPage } from './course/CourseManagementPage';
-import { CourseMessagesPage } from './course/CourseMessages';
-import { CourseOverviewPage } from './course/CourseOverviewPage';
-import { CoursesPage } from './course/CoursesPage';
-import { ExamCreationPage } from './exam/ExamCreationPage';
-import { ExamDetailsPage } from './exam/ExamDetailsPage';
-import { ExamExerciseGroupCreationPage } from './exam/ExamExerciseGroupCreationPage';
-import { ExamExerciseGroupsPage } from './exam/ExamExerciseGroupsPage';
-import { ExamManagementPage } from './exam/ExamManagementPage';
-import { ExamNavigationBar } from './exam/ExamNavigationBar';
-import { ExamParticipation } from './exam/ExamParticipation';
-import { ExamStartEndPage } from './exam/ExamStartEndPage';
-import { ExamTestRunPage } from './exam/ExamTestRunPage';
-import { StudentExamManagementPage } from './exam/StudentExamManagementPage';
-import { ExerciseResultPage } from './exercises/ExerciseResultPage';
-import { FileUploadEditorPage } from './exercises/file-upload/FileUploadEditorPage';
-import { FileUploadExerciseCreationPage } from './exercises/file-upload/FileUploadExerciseCreationPage';
-import { FileUploadExerciseFeedbackPage } from './exercises/file-upload/FileUploadExerciseFeedbackPage';
-import { CreateModelingExercisePage } from './exercises/modeling/CreateModelingExercisePage';
-import { ModelingEditor } from './exercises/modeling/ModelingEditor';
-import { ModelingExerciseFeedbackPage } from './exercises/modeling/ModelingExerciseFeedbackPage';
-import { CodeAnalysisGradingPage } from './exercises/programming/CodeAnalysisGradingPage';
-import { OnlineEditorPage } from './exercises/programming/OnlineEditorPage';
-import { ProgrammingExerciseCreationPage } from './exercises/programming/ProgrammingExerciseCreationPage';
-import { ProgrammingExerciseFeedbackPage } from './exercises/programming/ProgrammingExerciseFeedbackPage';
-import { ScaFeedbackModal } from './exercises/programming/ScaFeedbackModal';
-import { DragAndDropQuiz } from './exercises/quiz/DragAndDropQuiz';
-import { MultipleChoiceQuiz } from './exercises/quiz/MultipleChoiceQuiz';
-import { QuizExerciseCreationPage } from './exercises/quiz/QuizExerciseCreationPage';
-import { ShortAnswerQuiz } from './exercises/quiz/ShortAnswerQuiz';
-import { TextEditorPage } from './exercises/text/TextEditorPage';
-import { TextExerciseCreationPage } from './exercises/text/TextExerciseCreationPage';
-import { TextExerciseExampleSubmissionCreationPage } from './exercises/text/TextExerciseExampleSubmissionCreationPage';
-import { TextExerciseExampleSubmissionsPage } from './exercises/text/TextExerciseExampleSubmissionsPage';
-import { TextExerciseFeedbackPage } from './exercises/text/TextExerciseFeedbackPage';
-import { LectureCreationPage } from './lecture/LectureCreationPage';
-import { LectureManagementPage } from './lecture/LectureManagementPage';
-
-/**
- * A class which encapsulates all pageobjects, which can be used to automate the Artemis UI.
- */
-export class ArtemisPageobjects {
-    login = new LoginPage();
-    navigationBar = new NavigationBar();
-    course = {
-        creation: new CourseCreationPage(),
-        management: new CourseManagementPage(),
-        managementExercises: new CourseManagementExercisesPage(),
-        list: new CoursesPage(),
-        overview: new CourseOverviewPage(),
-        messages: new CourseMessagesPage(),
-    };
-    exam = {
-        details: new ExamDetailsPage(),
-        creation: new ExamCreationPage(),
-        management: new ExamManagementPage(),
-        participation: new ExamParticipation(),
-        startEnd: new ExamStartEndPage(),
-        navigationBar: new ExamNavigationBar(),
-        exerciseGroups: new ExamExerciseGroupsPage(),
-        exerciseGroupCreation: new ExamExerciseGroupCreationPage(),
-        studentExamManagement: new StudentExamManagementPage(),
-        testRun: new ExamTestRunPage(),
-    };
-    exercise = {
-        result: new ExerciseResultPage(),
-        programming: {
-            editor: new OnlineEditorPage(),
-            creation: new ProgrammingExerciseCreationPage(),
-            feedback: new ProgrammingExerciseFeedbackPage(),
-            scaConfiguration: new CodeAnalysisGradingPage(),
-            scaFeedback: new ScaFeedbackModal(),
-        },
-        text: {
-            creation: new TextExerciseCreationPage(),
-            exampleSubmissions: new TextExerciseExampleSubmissionsPage(),
-            exampleSubmissionCreation: new TextExerciseExampleSubmissionCreationPage(),
-            editor: new TextEditorPage(),
-            feedback: new TextExerciseFeedbackPage(),
-        },
-        modeling: {
-            creation: new CreateModelingExercisePage(),
-            editor: new ModelingEditor(),
-            feedback: new ModelingExerciseFeedbackPage(),
-        },
-        quiz: {
-            creation: new QuizExerciseCreationPage(),
-            multipleChoice: new MultipleChoiceQuiz(),
-            shortAnswer: new ShortAnswerQuiz(),
-            dragAndDrop: new DragAndDropQuiz(),
-        },
-        fileUpload: {
-            creation: new FileUploadExerciseCreationPage(),
-            editor: new FileUploadEditorPage(),
-            feedback: new FileUploadExerciseFeedbackPage(),
-        },
-    };
-    assessment = {
-        exam: new ExamAssessmentPage(),
-        course: new CourseAssessmentDashboardPage(),
-        exercise: new ExerciseAssessmentDashboardPage(),
-        text: new TextExerciseAssessmentPage(),
-        programming: new ProgrammingExerciseAssessmentPage(),
-        modeling: new ModelingExerciseAssessmentEditor(),
-        fileUpload: new FileUploadExerciseAssessmentPage(),
-        student: new StudentAssessmentPage(),
-    };
-    lecture = {
-        management: new LectureManagementPage(),
-        creation: new LectureCreationPage(),
-    };
-}
diff --git a/src/test/cypress/support/pageobjects/LoginPage.ts b/src/test/cypress/support/pageobjects/LoginPage.ts
deleted file mode 100644
index d7383b7b2372..000000000000
--- a/src/test/cypress/support/pageobjects/LoginPage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { CypressCredentials } from '../users';
-
-/**
- * A class which encapsulates UI selectors and actions for the Login Page.
- */
-export class LoginPage {
-    enterUsername(name: string) {
-        cy.get('#username').type(name, { log: false });
-    }
-
-    enterPassword(password: string) {
-        cy.get('#password').type(password, { log: false });
-    }
-
-    clickLoginButton() {
-        cy.get('#login-button').click();
-    }
-
-    login(credentials: CypressCredentials) {
-        this.enterUsername(credentials.username);
-        this.enterPassword(credentials.password);
-        this.clickLoginButton();
-    }
-
-    shouldShowFooter() {
-        cy.get('#footer').should('be.visible');
-    }
-
-    shouldShowAboutUsInFooter() {
-        cy.get('#about').should('be.visible').and('have.attr', 'href', '/about');
-    }
-
-    shouldShowRequestChangeInFooter() {
-        cy.get('#feedback').should('be.visible').and('have.attr', 'href');
-    }
-
-    shouldShowReleaseNotesInFooter() {
-        cy.get('#releases').should('be.visible').and('have.attr', 'href');
-    }
-
-    shouldShowPrivacyStatementInFooter() {
-        cy.get('#privacy').should('be.visible').and('have.attr', 'href', '/privacy');
-    }
-
-    shouldShowImprintInFooter() {
-        cy.get('#imprint').should('be.visible').and('have.attr', 'href', '/imprint');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/NavigationBar.ts b/src/test/cypress/support/pageobjects/NavigationBar.ts
deleted file mode 100644
index 18fd393a8bd4..000000000000
--- a/src/test/cypress/support/pageobjects/NavigationBar.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { COURSE_BASE, GET } from '../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the navigation bar at the top.
- */
-export class NavigationBar {
-    /**
-     * Opens the course management page via the menu at the top and waits until it is loaded.
-     */
-    openCourseManagement() {
-        cy.log('Opening course-management page...');
-        cy.intercept(GET, `${COURSE_BASE}/course-management-overview*`).as('courseManagementQuery');
-        cy.get('#course-admin-menu').click();
-        cy.wait('@courseManagementQuery', { timeout: 30000 });
-        cy.url().should('include', '/course-management');
-    }
-
-    openNotificationPanel() {
-        cy.get('.navbar .notification-button').click();
-    }
-
-    getNotifications() {
-        return cy.get('.notification-sidebar .notification-item');
-    }
-
-    getAccountItem() {
-        return cy.get('#account-menu');
-    }
-
-    logout() {
-        this.getAccountItem().click().get('#logout').click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts
deleted file mode 100644
index 6082ff502a56..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/AbstractExerciseAssessmentPage.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { BASE_API, ExerciseType, PATCH, PUT } from '../../constants';
-
-/**
- * Parent class for all exercise assessment pages.
- */
-export abstract class AbstractExerciseAssessmentPage {
-    readonly UNREFERENCED_FEEDBACK_SELECTOR = '.unreferenced-feedback-detail';
-
-    addNewFeedback(points: number, feedback?: string) {
-        cy.get('.add-unreferenced-feedback').click();
-        cy.get(this.UNREFERENCED_FEEDBACK_SELECTOR).find('#feedback-points').clear().type(points.toString());
-        if (feedback) {
-            cy.get(this.UNREFERENCED_FEEDBACK_SELECTOR).find('#feedback-textarea').clear().type(feedback);
-        }
-    }
-
-    submitWithoutInterception() {
-        cy.get('#submit').click();
-    }
-
-    submit() {
-        cy.intercept(PUT, `${BASE_API}/participations/*/manual-results?submit=true`).as('submitAssessment');
-        this.submitWithoutInterception();
-        return cy.wait('@submitAssessment');
-    }
-
-    rejectComplaint(response: string, examMode: boolean, exerciseType: ExerciseType) {
-        return this.handleComplaint(response, false, exerciseType, examMode);
-    }
-
-    acceptComplaint(response: string, examMode: boolean, exerciseType: ExerciseType) {
-        return this.handleComplaint(response, true, exerciseType, examMode);
-    }
-
-    private handleComplaint(response: string, accept: boolean, exerciseType: ExerciseType, examMode: boolean) {
-        if (exerciseType !== ExerciseType.MODELING && !examMode) {
-            cy.get('#show-complaint').click();
-        }
-        cy.get('#responseTextArea').type(response, { parseSpecialCharSequences: false });
-        switch (exerciseType) {
-            case ExerciseType.PROGRAMMING:
-                cy.intercept(PUT, `${BASE_API}/programming-submissions/*/assessment-after-complaint`).as('complaintAnswer');
-                break;
-            case ExerciseType.TEXT:
-                cy.intercept(PUT, `${BASE_API}/participations/*/submissions/*/text-assessment-after-complaint`).as('complaintAnswer');
-                break;
-            case ExerciseType.MODELING:
-                cy.intercept(PATCH, `${BASE_API}/complaints/*/response`).as('complaintAnswer');
-                break;
-            case ExerciseType.FILE_UPLOAD:
-                cy.intercept(PUT, `${BASE_API}/file-upload-submissions/*/assessment-after-complaint`).as('complaintAnswer');
-                break;
-            default:
-                throw new Error(`Exercise type '${exerciseType}' is not supported yet!`);
-        }
-        if (accept) {
-            cy.get('#acceptComplaintButton').click();
-        } else {
-            cy.get('#rejectComplaintButton').click();
-        }
-        return cy.wait('@complaintAnswer');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/CourseAssessmentDashboardPage.ts b/src/test/cypress/support/pageobjects/assessment/CourseAssessmentDashboardPage.ts
deleted file mode 100644
index da24b01bcfb2..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/CourseAssessmentDashboardPage.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { COURSE_BASE, POST } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the course assessment dashboard page.
- */
-export class CourseAssessmentDashboardPage {
-    openComplaints() {
-        cy.get('#open-complaints').click();
-    }
-
-    showTheComplaint() {
-        cy.get('#show-complaint').click();
-    }
-
-    clickExerciseDashboardButton() {
-        // Sometimes the page does not load properly, so we reload it if the button is not found
-        cy.reloadUntilFound('#open-exercise-dashboard');
-        cy.get('#open-exercise-dashboard').click();
-    }
-
-    clickEvaluateQuizzes() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams/*/student-exams/evaluate-quiz-exercises`).as('evaluateQuizzes');
-        cy.get('#evaluateQuizExercisesButton').click();
-        return cy.wait('@evaluateQuizzes');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/ExamAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/ExamAssessmentPage.ts
deleted file mode 100644
index 444d6fa743c1..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/ExamAssessmentPage.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { BASE_API, POST, PUT } from '../../constants';
-import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage';
-
-export class ExamAssessmentPage extends AbstractExerciseAssessmentPage {
-    submitModelingAssessment() {
-        cy.intercept(PUT, `${BASE_API}/modeling-submissions/*/result/*/assessment*`).as('submitAssessment');
-        super.submitWithoutInterception();
-        return cy.wait('@submitAssessment');
-    }
-
-    submitTextAssessment() {
-        cy.intercept(POST, `${BASE_API}/participations/*/results/*/submit-text-assessment`).as('submitFeedback');
-        super.submitWithoutInterception();
-        return cy.wait('@submitFeedback');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts b/src/test/cypress/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts
deleted file mode 100644
index 97b1cef4b06a..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/ExerciseAssessmentDashboardPage.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the exercise assessment dashboard page.
- */
-export class ExerciseAssessmentDashboardPage {
-    readonly START_ASSESSING_SELECTOR = '#start-new-assessment';
-
-    clickHaveReadInstructionsButton() {
-        cy.get('#participate-in-assessment').click();
-    }
-
-    clickStartNewAssessment() {
-        cy.reloadUntilFound(this.START_ASSESSING_SELECTOR);
-        cy.get(this.START_ASSESSING_SELECTOR).click();
-    }
-
-    clickOpenAssessment() {
-        cy.get('#open-assessment').click();
-    }
-
-    clickEvaluateComplaint() {
-        cy.get('#evaluate-complaint').click();
-    }
-
-    getComplaintText() {
-        return cy.get('#complaintTextArea');
-    }
-
-    getLockedMessage() {
-        return cy.get('#assessmentLockedCurrentUser');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/FileUploadExerciseAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/FileUploadExerciseAssessmentPage.ts
deleted file mode 100644
index d8e1ebae54ba..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/FileUploadExerciseAssessmentPage.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ExerciseType } from '../../constants';
-import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage';
-
-/**
- * A class which encapsulates UI selectors and actions for the file upload exercise assessment page.
- */
-export class FileUploadExerciseAssessmentPage extends AbstractExerciseAssessmentPage {
-    getInstructionsRootElement() {
-        return cy.get('#instructions-card');
-    }
-
-    submitFeedback() {
-        cy.get('#submit').click();
-    }
-
-    rejectComplaint(response: string, examMode: boolean) {
-        return super.rejectComplaint(response, examMode, ExerciseType.FILE_UPLOAD);
-    }
-
-    acceptComplaint(response: string, examMode: boolean) {
-        return super.acceptComplaint(response, examMode, ExerciseType.FILE_UPLOAD);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/ModelingExerciseAssessmentEditor.ts b/src/test/cypress/support/pageobjects/assessment/ModelingExerciseAssessmentEditor.ts
deleted file mode 100644
index 917d80b47b2f..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/ModelingExerciseAssessmentEditor.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { BASE_API, ExerciseType, MODELING_EDITOR_CANVAS, PUT } from '../../constants';
-import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage';
-
-const ASSESSMENT_CONTAINER = '#modeling-assessment-container';
-
-/**
- * A class which encapsulates UI selectors and actions for the Modeling Exercise Assessment editor
- */
-export class ModelingExerciseAssessmentEditor extends AbstractExerciseAssessmentPage {
-    openAssessmentForComponent(componentNumber: number) {
-        cy.get('#apollon-assessment-row').getSettled(`${MODELING_EDITOR_CANVAS} >>> :nth-child(${componentNumber})`).children().eq(0).dblclick('top', { force: true });
-    }
-
-    assessComponent(points: number, feedback: string) {
-        this.getPointAssessmentField().type(`${points}`);
-        this.getFeedbackAssessmentField().type(`${feedback}`);
-    }
-
-    clickNextAssessment() {
-        this.getNextAssessmentField().click();
-    }
-
-    rejectComplaint(response: string, examMode: false) {
-        return super.rejectComplaint(response, examMode, ExerciseType.MODELING);
-    }
-
-    acceptComplaint(response: string, examMode: false) {
-        return super.acceptComplaint(response, examMode, ExerciseType.MODELING);
-    }
-
-    submitExample() {
-        cy.intercept(PUT, `${BASE_API}/modeling-submissions/*/example-assessment`).as('createExampleSubmission');
-        cy.contains('Save Example Assessment').click();
-        return cy.wait('@createExampleSubmission').its('response.statusCode').should('eq', 200);
-    }
-
-    submit() {
-        cy.intercept(PUT, `${BASE_API}/modeling-submissions/*/result/*/assessment*`).as('submitModelingAssessment');
-        super.submitWithoutInterception();
-        return cy.wait('@submitModelingAssessment').its('response.statusCode').should('eq', 200);
-    }
-
-    private getNextAssessmentField() {
-        return this.getAssessmentContainer().children().last();
-    }
-
-    private getPointAssessmentField() {
-        return this.getAssessmentContainer().children().eq(1).children().children().eq(1);
-    }
-
-    private getFeedbackAssessmentField() {
-        return this.getAssessmentContainer().children().eq(3);
-    }
-
-    private getAssessmentContainer() {
-        return cy.get(`${ASSESSMENT_CONTAINER}`);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts
deleted file mode 100644
index 961934b5ba14..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { ExerciseType } from '../../constants';
-import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage';
-
-/**
- * A class which encapsulates UI selectors and actions for the programming exercise assessment page.
- */
-export class ProgrammingExerciseAssessmentPage extends AbstractExerciseAssessmentPage {
-    readonly feedbackEditorSelector = '#test-';
-
-    provideFeedbackOnCodeLine(lineIndex: number, points: number, feedback: string) {
-        // We can't change elements from the ace editor, so we can't use custom ids here
-        cy.get('.ace_gutter-cell').eq(lineIndex).find('svg').click({ force: true });
-        this.typeIntoFeedbackEditor(feedback, lineIndex);
-        this.typePointsIntoFeedbackEditor(points, lineIndex);
-        this.saveFeedback(lineIndex);
-    }
-
-    private typeIntoFeedbackEditor(text: string, index: number) {
-        this.getInlineFeedback(index).find('#feedback-textarea').type(text, { parseSpecialCharSequences: false });
-    }
-
-    private typePointsIntoFeedbackEditor(points: number, index: number) {
-        this.getInlineFeedback(index).find('#feedback-points').clear().type(points.toString());
-    }
-
-    private saveFeedback(index: number) {
-        this.getInlineFeedback(index).find('#feedback-save').click();
-    }
-
-    /**
-     * Every code line in the ace editor has an attached inline feedback
-     * @param line the code line where the inline feedback is attached
-     * @returns the root element of the inline feedback component
-     */
-    private getInlineFeedback(line: number) {
-        return cy.get('#code-editor-inline-feedback-' + line);
-    }
-
-    rejectComplaint(response: string, examMode: boolean) {
-        return super.rejectComplaint(response, examMode, ExerciseType.PROGRAMMING);
-    }
-
-    acceptComplaint(response: string, examMode: boolean) {
-        return super.acceptComplaint(response, examMode, ExerciseType.PROGRAMMING);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/StudentAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/StudentAssessmentPage.ts
deleted file mode 100644
index 43a6bc0e2388..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/StudentAssessmentPage.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the student assessment page.
- */
-export class StudentAssessmentPage {
-    startComplaint() {
-        cy.get('#complain', { timeout: 30000 }).click();
-    }
-
-    enterComplaint(text: string) {
-        cy.get('#complainTextArea').type(text);
-    }
-
-    submitComplaint() {
-        cy.get('#submit-complaint').click();
-    }
-
-    getComplaintBadge() {
-        return cy.get('jhi-complaint-request .badge');
-    }
-
-    getComplaintResponse() {
-        return cy.get('#complainResponseTextArea');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/assessment/TextExerciseAssessmentPage.ts b/src/test/cypress/support/pageobjects/assessment/TextExerciseAssessmentPage.ts
deleted file mode 100644
index 93c8ac8a388b..000000000000
--- a/src/test/cypress/support/pageobjects/assessment/TextExerciseAssessmentPage.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { BASE_API, ExerciseType, POST } from '../../constants';
-import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage';
-
-/**
- * A class which encapsulates UI selectors and actions for the text exercise assessment page.
- */
-export class TextExerciseAssessmentPage extends AbstractExerciseAssessmentPage {
-    getInstructionsRootElement() {
-        return cy.get('#instructions-card');
-    }
-
-    provideFeedbackOnTextSection(sectionIndex: number, points: number, feedback: string) {
-        this.getFeedbackSection(sectionIndex).click();
-        this.typeIntoFeedbackEditor(sectionIndex, feedback);
-        this.typePointsIntoFeedbackEditor(sectionIndex, points);
-    }
-
-    private typeIntoFeedbackEditor(sectionIndex: number, feedbackText: string) {
-        this.getFeedbackSection(sectionIndex).find('#feedback-editor-text-input').type(feedbackText, { parseSpecialCharSequences: false });
-    }
-
-    private typePointsIntoFeedbackEditor(sectionIndex: number, feedbackPoints: number) {
-        this.getFeedbackSection(sectionIndex).find('#feedback-editor-points-input').clear().type(feedbackPoints.toString());
-    }
-
-    private getFeedbackSection(sectionIndex: number) {
-        return cy.get('#text-feedback-block-' + sectionIndex);
-    }
-
-    submit() {
-        // Feedback route is special for text exercises, so we override parent here...
-        cy.intercept(POST, `${BASE_API}/participations/*/results/*/submit-text-assessment`).as('submitFeedback');
-        cy.get('#submit').click();
-        return cy.wait('@submitFeedback');
-    }
-
-    rejectComplaint(response: string, examMode: boolean) {
-        return super.rejectComplaint(response, examMode, ExerciseType.TEXT);
-    }
-
-    acceptComplaint(response: string, examMode: boolean) {
-        return super.acceptComplaint(response, examMode, ExerciseType.TEXT);
-    }
-
-    getWordCountElement() {
-        return cy.get('#text-assessment-word-count');
-    }
-
-    getCharacterCountElement() {
-        return cy.get('#text-assessment-character-count');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CourseCreationPage.ts b/src/test/cypress/support/pageobjects/course/CourseCreationPage.ts
deleted file mode 100644
index 24db4af3cb9c..000000000000
--- a/src/test/cypress/support/pageobjects/course/CourseCreationPage.ts
+++ /dev/null
@@ -1,243 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { COURSE_ADMIN_BASE, COURSE_BASE, POST, PUT } from '../../constants';
-import { enterDate } from '../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the course creation page.
- */
-export class CourseCreationPage {
-    /**
-     * Sets the title of the course.
-     * @param title the exam title
-     */
-    setTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    /**
-     * Sets the short name of the course.
-     * @param shortName the course short name
-     */
-    setShortName(shortName: string) {
-        cy.get('#field_shortName').clear().type(shortName);
-    }
-
-    /**
-     * Sets the description of the course.
-     * @param description the course description
-     */
-    setDescription(description: string) {
-        cy.get('#field_description').clear().type(description);
-    }
-
-    /**
-     * @param date the date when the exam starts
-     */
-    setStartDate(date: dayjs.Dayjs) {
-        enterDate('#field_startDate', date);
-    }
-
-    /**
-     * @param date the date when the exam will end
-     */
-    setEndDate(date: dayjs.Dayjs) {
-        enterDate('#field_endDate', date);
-    }
-
-    /**
-     * Sets course to be a test course
-     * @param testCourse if is a test course
-     */
-    setTestCourse(testCourse: boolean) {
-        if (testCourse) {
-            cy.get('#field_testCourse').check();
-        } else {
-            cy.get('#field_testCourse').uncheck();
-        }
-    }
-
-    /**
-     * Sets semester for the course
-     * @param semester the semester of the course
-     */
-    setSemester(semester: string) {
-        cy.get('#semester').select(semester);
-    }
-
-    /**
-     * Sets the maximum achievable points in the course.
-     * @param courseMaxPoints the max points
-     */
-    setCourseMaxPoints(courseMaxPoints: number) {
-        cy.get('#field_maxPoints').clear().type(courseMaxPoints.toString());
-    }
-
-    /**
-     * Sets the default programming language
-     * @param programmingLanguage the programming language
-     */
-    setProgrammingLanguage(programmingLanguage: string) {
-        cy.get('#programmingLanguage').select(programmingLanguage);
-    }
-
-    /**
-     * Sets if the course group names should be customized
-     * @param customizeGroupNames customize the group names
-     */
-    setCustomizeGroupNames(customizeGroupNames: boolean) {
-        if (customizeGroupNames) {
-            cy.get('#field_customizeGroupNamesEnabled').check();
-        } else {
-            cy.get('#field_customizeGroupNamesEnabled').uncheck();
-        }
-    }
-
-    /**
-     * Sets the customized group name for students
-     * @param groupName the group name
-     */
-    setStudentGroup(groupName: string) {
-        cy.get('#field_studentGroupName').clear().type(groupName);
-    }
-
-    /**
-     * Sets the customized group name for tutors
-     * @param groupName the group name
-     */
-    setTutorGroup(groupName: string) {
-        cy.get('#field_teachingAssistantGroupName').clear().type(groupName);
-    }
-
-    /**
-     * Sets the customized group name for editors
-     * @param groupName the group name
-     */
-    setEditorGroup(groupName: string) {
-        cy.get('#field_editorGroupName').clear().type(groupName);
-    }
-
-    /**
-     * Sets the customized group name for editors
-     * @param groupName the group name
-     */
-    setInstructorGroup(groupName: string) {
-        cy.get('#field_instructorGroupName').clear().type(groupName);
-    }
-
-    /**
-     * Sets if complaints are enabled
-     * @param complaints if complaints should be enabled
-     */
-    setEnableComplaints(complaints: boolean) {
-        if (complaints) {
-            cy.get('#field_maxComplaintSettingEnabled').check();
-        } else {
-            cy.get('#field_maxComplaintSettingEnabled').uncheck();
-        }
-    }
-
-    /**
-     * Sets maximum amount of complaints
-     * @param maxComplaints the maximum complaints
-     */
-    setMaxComplaints(maxComplaints: number) {
-        cy.get('#field_maxComplaints').clear().type(maxComplaints.toString());
-    }
-
-    /**
-     * Sets maximum amount of team complaints
-     * @param maxTeamComplaints the maximum team complaints
-     */
-    setMaxTeamComplaints(maxTeamComplaints: number) {
-        cy.get('#field_maxTeamComplaints').clear().type(maxTeamComplaints.toString());
-    }
-
-    /**
-     * Sets the maximal complaints time in days
-     * @param maxComplaintsTimeDays the maximal complaints time in days
-     */
-    setMaxComplaintsTimeDays(maxComplaintsTimeDays: number) {
-        cy.get('#field_maxComplaintTimeDays').clear().type(maxComplaintsTimeDays.toString());
-    }
-
-    /**
-     * Sets the maximal complaint text limit
-     * @param maxComplaintTextLimit the maximal complaint text limit
-     */
-    setMaxComplaintTextLimit(maxComplaintTextLimit: number) {
-        cy.get('#field_maxComplaintTextLimit').clear().type(maxComplaintTextLimit.toString());
-    }
-
-    /**
-     * Sets the maximal complaint response text limit
-     * @param maxComplaintResponseTextLimit the maximal complaint response text limit
-     */
-    setMaxComplaintResponseTextLimit(maxComplaintResponseTextLimit: number) {
-        cy.get('#field_maxComplaintResponseTextLimit').clear().type(maxComplaintResponseTextLimit.toString());
-    }
-
-    /**
-     * Sets if more feedback requests are enabled
-     * @param moreFeedback if more feedback should be enabled
-     */
-    setEnableMoreFeedback(moreFeedback: boolean) {
-        if (moreFeedback) {
-            cy.get('#field_maxRequestMoreFeedbackSettingEnabled').check();
-        } else {
-            cy.get('#field_maxRequestMoreFeedbackSettingEnabled').uncheck();
-        }
-    }
-
-    /**
-     * Sets the maximal request more feedback time in days
-     * @param maxRequestMoreFeedbackTimeDays maximal request more feedback time in days
-     */
-    setMaxRequestMoreFeedbackTimeDays(maxRequestMoreFeedbackTimeDays: number) {
-        cy.get('#field_maxRequestMoreFeedbackTimeDays').clear().type(maxRequestMoreFeedbackTimeDays.toString());
-    }
-
-    /**
-     * Sets if course is an online course
-     * @param onlineCourse if should be online course
-     */
-    setOnlineCourse(onlineCourse: boolean) {
-        if (onlineCourse) {
-            cy.get('#field_onlineCourse').check();
-        } else {
-            cy.get('#field_onlineCourse').uncheck();
-        }
-    }
-
-    /**
-     * Sets if students can register for this course
-     * @param registration if registration should be possible
-     */
-    setRegistrationEnabled(registration: boolean) {
-        if (registration) {
-            cy.get('#field_registrationEnabled').check();
-        } else {
-            cy.get('#field_registrationEnabled').uncheck();
-        }
-    }
-
-    /**
-     * Submits the created exam.
-     * @returns the query chainable if a test needs to access the response
-     */
-    submit() {
-        cy.intercept(POST, COURSE_ADMIN_BASE).as('createCourseQuery');
-        cy.get('#save-entity').click();
-        return cy.wait('@createCourseQuery');
-    }
-
-    /**
-     * Updates the created exam.
-     * @returns the query chainable if a test needs to access the response
-     */
-    update() {
-        cy.intercept(PUT, `${COURSE_BASE}/*`).as('updateCourseQuery');
-        cy.get('#save-entity').click();
-        return cy.wait('@updateCourseQuery');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CourseManagementExercisesPage.ts b/src/test/cypress/support/pageobjects/course/CourseManagementExercisesPage.ts
deleted file mode 100644
index 9a7372d2030a..000000000000
--- a/src/test/cypress/support/pageobjects/course/CourseManagementExercisesPage.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { Exercise } from 'app/entities/exercise.model';
-
-import { DELETE, MODELING_EXERCISE_BASE, PROGRAMMING_EXERCISE_BASE, QUIZ_EXERCISE_BASE, TEXT_EXERCISE_BASE, UPLOAD_EXERCISE_BASE } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the course management exercises page.
- */
-export class CourseManagementExercisesPage {
-    getExercise(exerciseID: number) {
-        return cy.get(`#exercise-card-${exerciseID}`);
-    }
-
-    clickDeleteExercise(exerciseID: number) {
-        this.getExercise(exerciseID).find('#delete-exercise').click();
-    }
-
-    clickExampleSubmissionsButton() {
-        cy.get('#example-submissions-button').click();
-    }
-
-    getExerciseTitle() {
-        return cy.contains('Title').parent().parent().find('dd');
-    }
-
-    deleteTextExercise(exercise: Exercise) {
-        this.getExercise(exercise.id!).find('#delete-exercise').click();
-        cy.get('#confirm-entity-name').type(exercise.title!);
-        cy.intercept(DELETE, `${TEXT_EXERCISE_BASE}/*`).as('deleteTextExercise');
-        cy.get('#delete').click();
-        cy.wait('@deleteTextExercise');
-    }
-
-    deleteModelingExercise(exercise: Exercise) {
-        this.getExercise(exercise.id!).find('#delete-exercise').click();
-        cy.get('#confirm-entity-name').type(exercise.title!);
-        cy.intercept(DELETE, `${MODELING_EXERCISE_BASE}/*`).as('deleteModelingExercise');
-        cy.get('#delete').click();
-        cy.wait('@deleteModelingExercise');
-    }
-
-    deleteQuizExercise(exercise: Exercise) {
-        this.getExercise(exercise.id!).find(`#delete-quiz-${exercise.id}`).click();
-        cy.get('#confirm-entity-name').type(exercise.title!);
-        cy.intercept(DELETE, `${QUIZ_EXERCISE_BASE}/*`).as('deleteQuizExercise');
-        cy.get('#delete').click();
-        cy.wait('@deleteQuizExercise');
-    }
-
-    deleteProgrammingExercise(exercise: Exercise) {
-        this.getExercise(exercise.id!).find('#delete-exercise').click();
-        cy.get('#confirm-entity-name').type(exercise.title!);
-        cy.intercept(DELETE, `${PROGRAMMING_EXERCISE_BASE}/*`).as('deleteProgrammingExercise');
-        cy.get('#delete').click();
-        cy.wait('@deleteProgrammingExercise');
-    }
-
-    deleteFileUploadExercise(exercise: Exercise) {
-        this.getExercise(exercise.id!).find('#delete-exercise').click();
-        cy.get('#confirm-entity-name').type(exercise.title!);
-        cy.intercept(DELETE, `${UPLOAD_EXERCISE_BASE}/*`).as('deleteFileUploadExercise');
-        cy.get('#delete').click();
-        cy.wait('@deleteFileUploadExercise');
-    }
-
-    createProgrammingExercise() {
-        cy.get('#create-programming-exercise').click();
-    }
-
-    createModelingExercise() {
-        cy.get('#create-modeling-exercise').click();
-    }
-
-    createTextExercise() {
-        cy.get('#create-text-exercise').click();
-    }
-
-    createQuizExercise() {
-        cy.get('#create-quiz-button').click();
-    }
-
-    createFileUploadExercise() {
-        cy.get('#create-file-upload-exercise').click();
-    }
-
-    importProgrammingExercise() {
-        cy.get('#import-programming-exercise').click();
-    }
-
-    importModelingExercise() {
-        cy.get('#import-modeling-exercise').click();
-    }
-
-    importTextExercise() {
-        cy.get('#import-text-exercise').click();
-    }
-
-    importQuizExercise() {
-        cy.get('#import-quiz-exercise').click();
-    }
-
-    clickImportExercise(exerciseID: number) {
-        return cy.get(`.exercise-${exerciseID}`).find('.import').click();
-    }
-
-    startQuiz(quizID: number) {
-        cy.get(`#instructor-quiz-start-${quizID}`).click();
-    }
-
-    shouldContainExerciseWithName(exerciseID: number) {
-        this.getExercise(exerciseID).scrollIntoView().should('be.visible');
-    }
-
-    getModelingExerciseTitle(exerciseID: number) {
-        return cy.get(`#exercise-card-${exerciseID}`).find(`#modeling-exercise-${exerciseID}-title`);
-    }
-
-    getModelingExerciseMaxPoints(exerciseID: number) {
-        return cy.get(`#exercise-card-${exerciseID}`).find(`#modeling-exercise-${exerciseID}-maxPoints`);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CourseManagementPage.ts b/src/test/cypress/support/pageobjects/course/CourseManagementPage.ts
deleted file mode 100644
index d18929b71b62..000000000000
--- a/src/test/cypress/support/pageobjects/course/CourseManagementPage.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import { Course } from 'app/entities/course.model';
-
-import { COURSE_ADMIN_BASE, COURSE_BASE, DELETE, POST, PUT } from '../../constants';
-import { CypressCredentials } from '../../users';
-
-/**
- * A class which encapsulates UI selectors and actions for the course management page.
- */
-export class CourseManagementPage {
-    openCourseCreation() {
-        return cy.get('#create-course').click();
-    }
-
-    openCourseEdit() {
-        return cy.get('#edit-course').click();
-    }
-
-    /**
-     * @returns Returns the cypress chainable containing the root element of the course card of our created course.
-     * This can be used to find specific elements within this course card.
-     */
-    getCourse(courseID: number) {
-        return cy.get(`#course-${courseID}`);
-    }
-
-    /**
-     * Opens the exercises (of the first found course).
-     */
-    openExercisesOfCourse(courseID: number) {
-        this.getCourse(courseID).find('#course-card-open-exercises').click();
-        cy.url().should('include', '/exercises');
-    }
-
-    /**
-     * Opens the students overview page of a course.
-     * @param courseId the id of the course
-     */
-    openStudentOverviewOfCourse(courseId: number) {
-        cy.get(`#open-student-management-${courseId}`).click();
-    }
-
-    /**
-     * Opens a course.
-     * @param courseID
-     */
-    openCourse(courseID: number) {
-        return this.getCourse(courseID).find('#course-card-header').click();
-    }
-
-    deleteCourse(course: Course) {
-        cy.get('#delete-course').click();
-        cy.get('#delete').should('be.disabled');
-        cy.get('#confirm-entity-name').type(course.title!);
-        cy.intercept(DELETE, `${COURSE_ADMIN_BASE}/${course.id}`).as('deleteCourse');
-        cy.get('#delete').click();
-        cy.wait('@deleteCourse');
-    }
-
-    /**
-     * Adds the user to the student group of the course
-     * @param credentials the user that gets added to the student group of the course
-     * */
-    addStudentToCourse(credentials: CypressCredentials) {
-        cy.intercept(POST, `${COURSE_BASE}/*/students/${credentials.username}`).as('addStudentQuery');
-        cy.get('#detail-value-artemisApp\\.course\\.studentGroupName').children().first().click({ force: true });
-        this.confirmUserIntoGroup(credentials);
-        cy.wait('@addStudentQuery');
-    }
-
-    /**
-     * Adds the user to the tutor group of the course
-     * @param credentials the user that gets added to the tutor group of the course
-     * */
-    addTutorToCourse(credentials: CypressCredentials) {
-        cy.intercept(POST, `${COURSE_BASE}/*/tutors/${credentials.username}`).as('addTutorsQuery');
-        cy.get('#add-tutors').click();
-        this.confirmUserIntoGroup(credentials);
-        cy.wait('@addTutorsQuery');
-    }
-
-    /**
-     * Adds the user to the editor group of the course
-     * @param credentials the user that gets added to the editor group of the course
-     * */
-    addEditorToCourse(credentials: CypressCredentials) {
-        cy.intercept(POST, `${COURSE_BASE}/*/editors/${credentials.username}`).as('addEditorsQuery');
-        cy.get('#add-editors').click();
-        this.confirmUserIntoGroup(credentials);
-        cy.wait('@addEditorsQuery');
-    }
-
-    /**
-     * Adds the user to the instructor group of the course
-     * @param credentials the user that gets added to the instructor group of the course
-     * */
-    addInstructorToCourse(credentials: CypressCredentials) {
-        cy.intercept(POST, `${COURSE_BASE}/*/instructors/${credentials.username}`).as('addInstructorQuery');
-        cy.get('#add-instructors').click();
-        this.confirmUserIntoGroup(credentials);
-        cy.wait('@addInstructorQuery');
-    }
-
-    removeFirstUser() {
-        cy.get('#registered-students button[jhideletebutton]').click();
-        cy.get('.modal #delete').click();
-    }
-
-    clickEditCourse() {
-        cy.get('#edit-course').click();
-    }
-
-    updateCourse(course: Course) {
-        cy.intercept(PUT, `${COURSE_BASE}/${course.id}`).as('updateCourseQuery');
-        cy.get('#save-entity').click();
-        return cy.wait('@updateCourseQuery');
-    }
-
-    checkCourseHasNoIcon() {
-        cy.get('#delete-course-icon').should('not.exist');
-        cy.get('.no-image').should('exist');
-    }
-
-    removeIconFromCourse() {
-        cy.get('#delete-course-icon').click();
-        cy.get('#delete-course-icon').should('not.exist');
-        cy.get('.no-image').should('exist');
-    }
-
-    /**
-     * helper method to avoid code duplication
-     * */
-    private confirmUserIntoGroup(credentials: CypressCredentials) {
-        cy.get('#typeahead-basic ').type(credentials.username).type('{enter}');
-        cy.get('#ngb-typeahead-0')
-            .contains(new RegExp('\\(' + credentials.username + '\\)'))
-            .click();
-        cy.get('#bread-crumb-2').click();
-    }
-
-    /**
-     * Opens the exams of a course.
-     */
-    openExamsOfCourse(courseID: number) {
-        this.getCourse(courseID).find('#course-card-open-exams').click();
-        cy.url().should('include', '/exams');
-    }
-
-    openAssessmentDashboardOfCourse(courseID: number) {
-        this.getCourse(courseID).find('#course-card-open-assessment-dashboard').click();
-        cy.url().should('include', '/assessment-dashboard');
-    }
-
-    /**
-     * helper methods to get information about the course
-     * */
-
-    getRegisteredStudents() {
-        return cy.get('#registered-students');
-    }
-
-    getCourseHeaderTitle() {
-        return cy.get('#course-header-title');
-    }
-
-    getCourseHeaderDescription() {
-        return cy.get('#course-header-description');
-    }
-
-    getCourseTitle() {
-        return cy.get('#detail-value-artemisApp\\.course\\.title');
-    }
-
-    getCourseShortName() {
-        return cy.get('#detail-value-artemisApp\\.course\\.shortName');
-    }
-
-    getCourseStudentGroupName() {
-        return cy.get('#detail-value-artemisApp\\.course\\.studentGroupName');
-    }
-
-    getCourseTutorGroupName() {
-        return cy.get('#detail-value-artemisApp\\.course\\.teachingAssistantGroupName');
-    }
-
-    getCourseEditorGroupName() {
-        return cy.get('#detail-value-artemisApp\\.course\\.editorGroupName');
-    }
-
-    getCourseInstructorGroupName() {
-        return cy.get('#detail-value-artemisApp\\.course\\.instructorGroupName');
-    }
-
-    getCourseStartDate() {
-        return cy.get('#detail-value-artemisApp\\.course\\.startDate');
-    }
-
-    getCourseEndDate() {
-        return cy.get('#detail-value-artemisApp\\.course\\.endDate');
-    }
-
-    getCourseSemester() {
-        return cy.get('#detail-value-artemisApp\\.course\\.semester');
-    }
-
-    getCourseProgrammingLanguage() {
-        return cy.get('#detail-value-artemisApp\\.course\\.defaultProgrammingLanguage');
-    }
-
-    getCourseTestCourse() {
-        return cy.get('#detail-value-artemisApp\\.course\\.testCourse\\.title');
-    }
-
-    getCourseOnlineCourse() {
-        return cy.get('#detail-value-artemisApp\\.course\\.onlineCourse\\.title');
-    }
-
-    getCourseMaxComplaints() {
-        return cy.get('#detail-value-artemisApp\\.course\\.maxComplaints\\.title');
-    }
-
-    getCourseMaxTeamComplaints() {
-        return cy.get('#detail-value-artemisApp\\.course\\.maxTeamComplaints\\.title');
-    }
-
-    getMaxComplaintTimeDays() {
-        return cy.get('#detail-value-artemisApp\\.course\\.maxComplaintTimeDays\\.title');
-    }
-
-    getMaxRequestMoreFeedbackTimeDays() {
-        return cy.get('#detail-value-artemisApp\\.course\\.maxRequestMoreFeedbackTimeDays\\.title');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CourseMessages.ts b/src/test/cypress/support/pageobjects/course/CourseMessages.ts
deleted file mode 100644
index 721464317634..000000000000
--- a/src/test/cypress/support/pageobjects/course/CourseMessages.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { COURSE_BASE, DELETE, POST, PUT } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the course messages page.
- */
-export class CourseMessagesPage {
-    createChannelButton() {
-        cy.get('#channelButton').click();
-        cy.get('#createChannel').click();
-    }
-
-    browseChannelsButton() {
-        cy.get('#channelButton').click();
-        cy.get('#channelOverview').click();
-    }
-
-    browseExerciseChannelsButton() {
-        cy.get('#exerciseChannelButton').click();
-        cy.get('#exerciseChannelOverview').click();
-    }
-
-    browseLectureChannelsButton() {
-        cy.get('#lectureChannelButton').click();
-        cy.get('#lectureChannelOverview').click();
-    }
-
-    browseExamChannelsButton() {
-        cy.get('#examChannelButton').click();
-        cy.get('#examChannelOverview').click();
-    }
-
-    checkChannelsExists(name: string) {
-        cy.get('.channels-overview').find('.list-group-item').contains(name);
-    }
-
-    getChannelIdByName(name: string) {
-        return cy
-            .get('.channels-overview')
-            .find('.list-group-item')
-            .filter(`:contains("${name}")`)
-            .invoke('attr', 'id')
-            .then((id) => {
-                return id?.replace('channel-', '');
-            });
-    }
-
-    joinChannel(channelID: number) {
-        cy.intercept(POST, `${COURSE_BASE}/*/channels/*/register`).as('joinChannel');
-        cy.get(`#channel-${channelID}`).find(`#register${channelID}`).click({ force: true });
-        cy.wait('@joinChannel');
-    }
-
-    leaveChannel(channelID: number) {
-        cy.intercept(POST, `${COURSE_BASE}/*/channels/*/deregister`).as('leaveChannel');
-        cy.get(`#channel-${channelID}`).find(`#deregister${channelID}`).click({ force: true });
-        cy.wait('@leaveChannel');
-    }
-
-    checkBadgeJoined(channelID: number) {
-        return cy.get(`#channel-${channelID}`).find('.badge');
-    }
-
-    setName(name: string) {
-        cy.get('.modal-content').find('#name').clear().type(name);
-    }
-
-    setDescription(description: string) {
-        cy.get('.modal-content').find('#description').clear().type(description);
-    }
-
-    setPrivate() {
-        cy.get('.modal-content').find('label[for=private]').click();
-    }
-
-    setPublic() {
-        cy.get('.modal-content').find('label[for=public]').click();
-    }
-
-    setAnnouncementChannel() {
-        cy.get('.modal-content').find('label[for=isAnnouncementChannel]').click();
-    }
-
-    setUnrestrictedChannel() {
-        cy.get('.modal-content').find('label[for=isNotAnnouncementChannel]').click();
-    }
-
-    createChannel(isAnnouncementChannel: boolean, isPublic: boolean) {
-        cy.intercept(POST, `${COURSE_BASE}/*/channels`).as('createChannel');
-        cy.get('.modal-content').find('#submitButton').click();
-        cy.wait('@createChannel').then((interception) => {
-            const response = interception.response!.body;
-            cy.url().should('contain', `messages?conversationId=${response.id}`);
-            expect(response.isAnnouncementChannel).to.eq(isAnnouncementChannel);
-            expect(response.isPublic).to.eq(isPublic);
-        });
-    }
-
-    getError() {
-        return cy.get('.modal-body').find('.alert');
-    }
-
-    getName() {
-        return cy.get('h4.d-inline-block');
-    }
-
-    getTopic() {
-        return cy.get('#conversation-topic');
-    }
-
-    editName(newName: string) {
-        cy.get('#name-section').find('.action-button').click();
-        cy.get('.channels-overview').find('#name').clear().type(newName);
-        cy.get('#submitButton').click();
-    }
-
-    editTopic(newTopic: string) {
-        cy.get('#topic-section').find('.action-button').click();
-        cy.get('.channels-overview').find('#topic').clear().type(newTopic);
-        cy.get('#submitButton').click();
-    }
-
-    editDescription(newDescription: string) {
-        cy.get('#description-section').find('.action-button').click();
-        cy.get('.channels-overview').find('#description').type(newDescription);
-        cy.get('#submitButton').click();
-    }
-
-    closeEditPanel() {
-        cy.get('.conversation-detail-dialog').find('.btn-close').click();
-    }
-
-    writeMessage(message: string) {
-        cy.get('.markdown-editor').find('.ace_editor').click().type(message, { delay: 8 });
-    }
-
-    checkMessage(messageId: number, message: string) {
-        this.getSinglePost(messageId).find('.markdown-preview').contains(message);
-    }
-
-    editMessage(messageId: number, message: string) {
-        this.getSinglePost(messageId).find('.editIcon').click();
-        this.getSinglePost(messageId).find('.markdown-editor').find('.ace_editor').click().type(message, { delay: 8 });
-        cy.intercept(PUT, `${COURSE_BASE}/*/messages/*`).as('updateMessage');
-        this.getSinglePost(messageId).find('#save').click();
-        cy.wait('@updateMessage');
-    }
-
-    deleteMessage(messageId: number) {
-        cy.intercept(DELETE, `${COURSE_BASE}/*/messages/*`).as('deleteMessage');
-        this.getSinglePost(messageId).find('.deleteIcon').click();
-        this.getSinglePost(messageId).find('.deleteIcon').click();
-        cy.wait('@deleteMessage');
-    }
-
-    getSinglePost(postID: number) {
-        return cy.get(`#item-${postID}`);
-    }
-
-    save(force = false) {
-        cy.intercept(POST, `${COURSE_BASE}/*/messages`).as('createMessage');
-        cy.get('#save').click({ force });
-        return cy.wait('@createMessage');
-    }
-
-    createGroupChatButton() {
-        cy.get('#createGroupChat').click();
-    }
-
-    createGroupChat() {
-        cy.intercept(POST, `${COURSE_BASE}/*/group-chats`).as('createGroupChat');
-        cy.get('#submitButton').click();
-        return cy.wait('@createGroupChat');
-    }
-
-    updateGroupChat() {
-        cy.intercept(POST, `${COURSE_BASE}/*/group-chats/*/register`).as('updateGroupChat');
-        cy.get('#submitButton').click();
-        cy.wait('@updateGroupChat');
-    }
-
-    addUserToGroupChat(user: string) {
-        cy.get('#users-selector0-user-input').type(user);
-        cy.get('#ngb-typeahead-0')
-            .contains(new RegExp('\\(' + user + '\\)'))
-            .click();
-    }
-
-    addUserToGroupChatButton() {
-        cy.get('.addUsers').click();
-    }
-
-    listMembersButton(courseID: number, conversationID: number) {
-        cy.visit(`/courses/${courseID}/messages?conversationId=${conversationID}`);
-        cy.get('.members').click();
-    }
-
-    checkMemberList(name: string) {
-        cy.get('jhi-conversation-members').contains(name);
-    }
-
-    openSettingsTab() {
-        cy.get('.settings-tab').click();
-    }
-
-    leaveGroupChat() {
-        cy.get('.leave-conversation').click();
-    }
-
-    checkGroupChatExists(name: string, exist: boolean) {
-        if (exist) {
-            cy.get('.conversation-list').should('contain.text', name);
-        } else {
-            cy.get('.conversation-list').should('not.contain.text', name);
-        }
-    }
-
-    acceptCodeOfConductButton() {
-        cy.get('#acceptCodeOfConductButton').click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CourseOverviewPage.ts b/src/test/cypress/support/pageobjects/course/CourseOverviewPage.ts
deleted file mode 100644
index f8abe30dae09..000000000000
--- a/src/test/cypress/support/pageobjects/course/CourseOverviewPage.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { BASE_API, GET } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the course overview page (/courses/*).
- */
-export class CourseOverviewPage {
-    readonly participationRequestId = 'participateInExerciseQuery';
-
-    search(term: string): void {
-        cy.get('input[formcontrolname="searchFilter"]').type(term);
-    }
-
-    startExercise(exerciseId: number, refreshInterval?: number) {
-        cy.reloadUntilFound('#start-exercise-' + exerciseId, refreshInterval);
-        cy.get('#start-exercise-' + exerciseId).click();
-    }
-
-    openRunningExercise(exerciseId: number) {
-        cy.reloadUntilFound('#open-exercise-' + exerciseId);
-        cy.get('#open-exercise-' + exerciseId).click();
-    }
-
-    getExercise(exerciseTitle: string) {
-        return cy.contains('#test-sidebar-card-medium', exerciseTitle);
-    }
-
-    openExerciseOverview(exerciseTitle: string) {
-        this.getExercise(exerciseTitle).click();
-    }
-
-    getExercises() {
-        return cy.get('#test-sidebar-card-medium');
-    }
-
-    openRunningProgrammingExercise(exerciseID: number) {
-        cy.intercept(GET, `${BASE_API}/programming-exercise-participations/*/student-participation-with-latest-result-and-feedbacks`).as('initialQuery');
-        this.openRunningExercise(exerciseID);
-        cy.wait('@initialQuery');
-    }
-
-    openExamsTab() {
-        cy.get('#exam-tab').click();
-    }
-
-    openExam(examId: number) {
-        cy.get('#exam-' + examId).click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/course/CoursesPage.ts b/src/test/cypress/support/pageobjects/course/CoursesPage.ts
deleted file mode 100644
index ffffee9b859c..000000000000
--- a/src/test/cypress/support/pageobjects/course/CoursesPage.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the courses page (/courses).
- */
-export class CoursesPage {
-    openCourse(courseId: number) {
-        cy.get(`#course-${courseId}-header`, { timeout: 30000 }).click();
-        cy.url().should('include', '/exercises');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamCreationPage.ts b/src/test/cypress/support/pageobjects/exam/ExamCreationPage.ts
deleted file mode 100644
index e8be5a3a7a6c..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamCreationPage.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { COURSE_BASE, POST, PUT } from '../../constants';
-import { enterDate } from '../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the exam creation page.
- */
-export class ExamCreationPage {
-    /**
-     * Sets the title of the exam.
-     * @param title the exam title
-     */
-    setTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    /**
-     * Sets exam to test mode
-     */
-    setTestMode() {
-        cy.get('#exam-mode-picker #test-mode').click();
-    }
-
-    /**
-     * @param date the date from when the exam should be visible
-     */
-    setVisibleDate(date: dayjs.Dayjs) {
-        enterDate('#visibleDate', date);
-    }
-
-    /**
-     * @param date the date when the exam starts
-     */
-    setStartDate(date: dayjs.Dayjs) {
-        enterDate('#startDate', date);
-    }
-
-    /**
-     * @param date the date when the exam will end
-     */
-    setEndDate(date: dayjs.Dayjs) {
-        enterDate('#endDate', date);
-    }
-
-    /**
-     * @param time the exam working time
-     */
-    setWorkingTime(time: number) {
-        cy.get('#workingTimeInMinutes').clear().type(time.toString());
-    }
-
-    /**
-     * Sets the number of exercises in the exam.
-     * @param amount the amount of exercises
-     */
-    setNumberOfExercises(amount: number) {
-        cy.get('#numberOfExercisesInExam').clear().type(amount.toString());
-    }
-
-    /**
-     * Sets the maximum achievable points in the exam.
-     * @param examMaxPoints the max points
-     */
-    setExamMaxPoints(examMaxPoints: number) {
-        cy.get('#examMaxPoints').clear().type(examMaxPoints.toString());
-    }
-
-    /**
-     * Sets the start text of the exam.
-     * @param text the start text
-     */
-    setStartText(text: string) {
-        this.enterText('#startText', text);
-    }
-
-    /**
-     * Sets the end text of the exam.
-     * @param text the end text
-     */
-    setEndText(text: string) {
-        this.enterText('#endText', text);
-    }
-
-    /**
-     * Sets the confirmation start text of the exam.
-     * @param text the confirmation start text
-     */
-    setConfirmationStartText(text: string) {
-        this.enterText('#confirmationStartText', text);
-    }
-
-    /**
-     * Sets the confirmation end text of the exam.
-     * @param text the confirmation end text
-     */
-    setConfirmationEndText(text: string) {
-        this.enterText('#confirmationEndText', text);
-    }
-
-    /**
-     * Submits the created exam.
-     * @returns the query chainable if a test needs to access the response
-     */
-    submit() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams`).as('createExamQuery');
-        cy.get('#save-exam').click();
-        return cy.wait('@createExamQuery');
-    }
-
-    /**
-     * Updates the created exam.
-     * @returns the query chainable if a test needs to access the response
-     */
-    update() {
-        cy.intercept(PUT, `${COURSE_BASE}/*/exams`).as('updateExamQuery');
-        cy.get('#save-exam').click();
-        return cy.wait('@updateExamQuery');
-    }
-
-    private enterText(selector: string, text: string) {
-        cy.get(selector).find('.ace_text-input').focus().clear().type(text);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamDetailsPage.ts b/src/test/cypress/support/pageobjects/exam/ExamDetailsPage.ts
deleted file mode 100644
index 79bf50ff997c..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamDetailsPage.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the exam details page.
- */
-export class ExamDetailsPage {
-    /**
-     * Deletes this exam.
-     * @param examTitle the exam title to confirm the deletion
-     */
-    deleteExam(examTitle: string) {
-        cy.get('#exam-delete').click();
-        cy.get('#delete').should('be.disabled');
-        cy.get('#confirm-entity-name').type(examTitle);
-        cy.get('#delete').should('not.be.disabled').click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts b/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts
deleted file mode 100644
index 8f88dad63292..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Exam } from 'app/entities/exam.model';
-
-import multipleChoiceTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json';
-import { examAPIRequests, exerciseAPIRequest } from '../../artemis';
-import { AdditionalData, COURSE_BASE, ExerciseType, POST, PUT } from '../../constants';
-import { convertModelAfterMultiPart, generateUUID } from '../../utils';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { Exercise } from 'app/entities/exercise.model';
-import { Visibility } from 'app/entities/programming-exercise-test-case.model';
-
-/**
- * A class which encapsulates UI selectors and actions for the exam exercise group creation page.
- */
-export class ExamExerciseGroupCreationPage {
-    typeTitle(title: string) {
-        cy.get('#title').clear().type(title);
-    }
-
-    isMandatoryBoxShouldBeChecked() {
-        cy.get('#isMandatory').should('be.checked');
-    }
-
-    clickSave() {
-        cy.intercept({ method: POST, url: `${COURSE_BASE}/*/exams/*/exerciseGroups` }).as('createExerciseGroup');
-        cy.get('#save-group').click();
-        return cy.wait('@createExerciseGroup');
-    }
-
-    update() {
-        cy.intercept({ method: PUT, url: `${COURSE_BASE}/*/exams/*/exerciseGroups` }).as('updateExerciseGroup');
-        cy.get('#save-group').click();
-        cy.wait('@updateExerciseGroup');
-    }
-
-    addGroupWithExercise(exam: Exam, exerciseType: ExerciseType, additionalData: AdditionalData = {}): Promise<Exercise> {
-        return new Promise((resolve) => {
-            this.handleAddGroupWithExercise(exam, 'Exercise ' + generateUUID(), exerciseType, additionalData, (response) => {
-                let exercise = { ...response.body, additionalData };
-                if (exerciseType == ExerciseType.QUIZ) {
-                    const quiz = convertModelAfterMultiPart(response) as QuizExercise;
-                    additionalData!.quizExerciseID = quiz.quizQuestions![0].id;
-                    exercise = { ...quiz, additionalData };
-                }
-
-                if (exerciseType === ExerciseType.PROGRAMMING) {
-                    const RETRY_NUMBER = 0;
-                    exerciseAPIRequest.changeProgrammingExerciseTestVisibility(exercise, Visibility.Always, RETRY_NUMBER);
-                }
-
-                resolve(exercise);
-            });
-        });
-    }
-
-    handleAddGroupWithExercise(exam: Exam, title: string, exerciseType: ExerciseType, additionalData: AdditionalData, processResponse: (data: any) => void) {
-        examAPIRequests.addExerciseGroupForExam(exam).then((groupResponse) => {
-            switch (exerciseType) {
-                case ExerciseType.TEXT:
-                    exerciseAPIRequest.createTextExercise({ exerciseGroup: groupResponse.body }, title).then((response) => {
-                        processResponse(response);
-                    });
-                    break;
-                case ExerciseType.MODELING:
-                    exerciseAPIRequest.createModelingExercise({ exerciseGroup: groupResponse.body }, title).then((response) => {
-                        processResponse(response);
-                    });
-                    break;
-                case ExerciseType.QUIZ:
-                    exerciseAPIRequest.createQuizExercise({ exerciseGroup: groupResponse.body }, [multipleChoiceTemplate], title).then((response) => {
-                        processResponse(response);
-                    });
-                    break;
-                case ExerciseType.PROGRAMMING:
-                    exerciseAPIRequest
-                        .createProgrammingExercise({ exerciseGroup: groupResponse.body, title, assessmentType: additionalData.progExerciseAssessmentType })
-                        .then((response) => {
-                            processResponse(response);
-                        });
-                    break;
-            }
-        });
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupsPage.ts b/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupsPage.ts
deleted file mode 100644
index 1534a7f2f737..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamExerciseGroupsPage.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the exam exercise groups page.
- */
-export class ExamExerciseGroupsPage {
-    clickCreateNewExerciseGroup() {
-        cy.get('#create-new-group').click();
-    }
-
-    shouldHaveTitle(groupID: number, groupTitle: string) {
-        cy.get(`#group-${groupID} .group-title`).contains(groupTitle);
-    }
-
-    shouldNotExist(groupID: number) {
-        cy.get(`#group-${groupID}`).should('not.exist');
-    }
-
-    clickEditGroup(groupID: number) {
-        cy.get(`#group-${groupID} .edit-group`).click();
-    }
-
-    clickDeleteGroup(groupID: number, groupName: string) {
-        cy.get(`#group-${groupID} .delete-group`).click();
-        cy.get('#delete').should('be.disabled');
-        cy.get('#confirm-entity-name').type(groupName);
-        cy.get('#delete').should('not.be.disabled').click();
-    }
-
-    shouldShowNumberOfExerciseGroups(numberOfGroups: number) {
-        cy.get('#number-groups').should('contain.text', numberOfGroups);
-    }
-
-    clickAddExerciseGroup() {
-        cy.get('#create-new-group').click();
-    }
-
-    clickAddTextExercise(groupID: number) {
-        cy.get(`#group-${groupID}`).find('.add-text-exercise').click();
-    }
-
-    clickAddModelingExercise(groupID: number) {
-        cy.get(`#group-${groupID}`).find('.add-modeling-exercise').click();
-    }
-
-    clickAddQuizExercise(groupID: number) {
-        cy.get(`#group-${groupID}`).find('.add-quiz-exercise').click();
-    }
-
-    clickAddProgrammingExercise(groupID: number) {
-        cy.get(`#group-${groupID}`).find('.add-programming-exercise').click();
-    }
-
-    visitPageViaUrl(courseId: number, examId: number) {
-        cy.visit(`course-management/${courseId}/exams/${examId}/exercise-groups`);
-    }
-
-    shouldContainExerciseWithTitle(groupID: number, exerciseTitle: string) {
-        cy.get(`#group-${groupID}`).find('#exercises').contains(exerciseTitle).scrollIntoView().should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts b/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts
deleted file mode 100644
index a3d819025f8d..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamManagementPage.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the exam management page.
- */
-export class ExamManagementPage {
-    /**
-     * Searches for an exam with the provided title.
-     * @param examTitle the title of the exam.
-     * @returns the row element of the found exam
-     */
-    getExamRowRoot(examTitle: string) {
-        return this.getExamSelector(examTitle).parents('tr');
-    }
-
-    /** Opens the exam with this exam id. */
-    openExam(examId: number) {
-        cy.get(`#exam-${examId}-title`).click();
-    }
-
-    /**
-     * Clicks the create new exam button.
-     */
-    createNewExam() {
-        cy.get('#create-exam').click();
-    }
-
-    /**
-     * Returns the title element of the exam row.
-     * @param examTitle the title to search for
-     * @returns the element
-     */
-    getExamSelector(examTitle: string) {
-        return cy.get('#exams-table').contains(examTitle);
-    }
-
-    /**
-     * Opens the exercise groups page.
-     */
-    openExerciseGroups(examId: number) {
-        cy.get(`#exercises-button-${examId}-groups`).click();
-    }
-
-    /**
-     * Opens the student registration page.
-     */
-    openStudentRegistration(examId: number) {
-        cy.get(`#student-button-${examId}`).click();
-    }
-
-    /**
-     * Opens the student exams page.
-     */
-    openStudentExams(examId: number) {
-        cy.get(`#student-exams-${examId}`).click();
-    }
-
-    /**
-     * Opens the exam assessment dashboard
-     * @param courseID the id of the course
-     * @param examID the id of the exam
-     * @param timeout how long to wait for the assessment dashboard button
-     */
-    openAssessmentDashboard(courseID: number, examID: number, timeout = 60000) {
-        cy.visit(`/course-management/${courseID}/exams`);
-        cy.get(`#exercises-button-${examID}`, { timeout }).click();
-    }
-
-    /**
-     * Opens the test run page.
-     */
-    openTestRun() {
-        cy.get(`#testrun-button`).click();
-    }
-
-    verifySubmitted(courseID: number, examID: number, username: string) {
-        cy.visit(`/course-management/${courseID}/exams/${examID}/student-exams`);
-        cy.get('#student-exam').find('.datatable-body-row').filter(`:contains("${username}")`).find('.submitted').contains('Yes');
-    }
-
-    checkQuizSubmission(courseID: number, examID: number, username: string, score: string) {
-        cy.visit(`/course-management/${courseID}/exams/${examID}/student-exams`);
-        cy.get('#student-exam').find('.datatable-body-row').filter(`:contains("${username}")`).find('.view-submission').click();
-        cy.get('.summery').click();
-        cy.get('#exercise-result-score').contains(score);
-    }
-
-    clickEdit() {
-        cy.get('#editButton').click();
-    }
-
-    /**
-     * helper methods to get information of course
-     * */
-    getExamTitle() {
-        return cy.get('#detail-value-artemisApp\\.exam\\.title');
-    }
-
-    getExamVisibleDate() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.visibleDate');
-    }
-
-    getExamStartDate() {
-        return cy.get('#detail-value-artemisApp\\.exam\\.startDate');
-    }
-
-    getExamEndDate() {
-        return cy.get('#detail-value-artemisApp\\.exam\\.endDate');
-    }
-
-    getExamNumberOfExercises() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.numberOfExercisesInExam');
-    }
-
-    getExamMaxPoints() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.maxPoints\\.title');
-    }
-
-    getExamStartText() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.startText');
-    }
-
-    getExamEndText() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.endText');
-    }
-
-    getExamConfirmationStartText() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.confirmationStartText');
-    }
-
-    getExamConfirmationEndText() {
-        return cy.get('#detail-value-artemisApp\\.examManagement\\.confirmationEndText');
-    }
-
-    getExamWorkingTime() {
-        return cy.get('#detail-value-artemisApp\\.exam\\.workingTime');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamNavigationBar.ts b/src/test/cypress/support/pageobjects/exam/ExamNavigationBar.ts
deleted file mode 100644
index f939546775d5..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamNavigationBar.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the navigation bar in an open exam.
- */
-export class ExamNavigationBar {
-    /**
-     * Opens the exercise at the specified index.
-     * @param index 0-based index
-     */
-    openExerciseAtIndex(index: number) {
-        cy.get('#exam-exercise-' + index).click();
-    }
-
-    openExerciseOverview() {
-        cy.get('.exam-navigation .navigation-item.overview').click();
-    }
-
-    /**
-     * Presses the hand in early button in the navigation bar.
-     */
-    handInEarly() {
-        cy.get('#hand-in-early').click();
-    }
-
-    clickSave() {
-        cy.get('#save');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts b/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts
deleted file mode 100644
index 014ef3fbec4f..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamParticipation.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import {
-    courseList,
-    courseOverview,
-    examNavigation,
-    examStartEnd,
-    modelingExerciseEditor,
-    programmingExerciseEditor,
-    quizExerciseMultipleChoice,
-    textExerciseEditor,
-} from '../../artemis';
-import { AdditionalData, ExerciseType } from '../../constants';
-import { CypressCredentials } from '../../users';
-import { getExercise } from '../../utils';
-import { ProgrammingExerciseSubmission } from '../exercises/programming/OnlineEditorPage';
-
-/**
- * A class which encapsulates UI selectors and actions for the exam details page.
- */
-export class ExamParticipation {
-    /**
-     * Makes a submission in a provided exercise
-     * @param exerciseID the id of the exercise
-     * @param exerciseType the type of the exercise
-     * @param additionalData additional data such as the expected score
-     */
-    makeSubmission(exerciseID: number, exerciseType: ExerciseType, additionalData?: AdditionalData) {
-        switch (exerciseType) {
-            case ExerciseType.TEXT:
-                this.makeTextExerciseSubmission(exerciseID, additionalData!.textFixture!);
-                break;
-            case ExerciseType.MODELING:
-                this.makeModelingExerciseSubmission(exerciseID);
-                break;
-            case ExerciseType.QUIZ:
-                this.makeQuizExerciseSubmission(exerciseID, additionalData!.quizExerciseID!);
-                break;
-            case ExerciseType.PROGRAMMING:
-                this.makeProgrammingExerciseSubmission(exerciseID, additionalData!.submission!, additionalData!.practiceMode);
-                break;
-        }
-    }
-
-    makeTextExerciseSubmission(exerciseID: number, textFixture: string) {
-        cy.fixture(textFixture).then((submissionText) => {
-            textExerciseEditor.typeSubmission(exerciseID, submissionText);
-        });
-        cy.wait(1000);
-    }
-
-    private makeProgrammingExerciseSubmission(exerciseID: number, submission: ProgrammingExerciseSubmission, practiceMode = false) {
-        programmingExerciseEditor.toggleCompressFileTree(exerciseID);
-        programmingExerciseEditor.deleteFile(exerciseID, 'Client.java');
-        programmingExerciseEditor.deleteFile(exerciseID, 'BubbleSort.java');
-        programmingExerciseEditor.deleteFile(exerciseID, 'MergeSort.java');
-        programmingExerciseEditor.typeSubmission(exerciseID, submission);
-        if (practiceMode) {
-            programmingExerciseEditor.submitPractice(exerciseID);
-        } else {
-            programmingExerciseEditor.submit(exerciseID);
-        }
-        programmingExerciseEditor.getResultScoreFromExercise(exerciseID).contains(submission.expectedResult).and('be.visible');
-    }
-
-    makeModelingExerciseSubmission(exerciseID: number) {
-        modelingExerciseEditor.addComponentToModel(exerciseID, 1, false);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 2, false);
-        modelingExerciseEditor.addComponentToModel(exerciseID, 3, false);
-    }
-
-    makeQuizExerciseSubmission(exerciseID: number, quizExerciseID: number) {
-        quizExerciseMultipleChoice.tickAnswerOption(exerciseID, 0, quizExerciseID);
-        quizExerciseMultipleChoice.tickAnswerOption(exerciseID, 2, quizExerciseID);
-    }
-
-    openExam(student: CypressCredentials, course: Course, exam: Exam) {
-        cy.login(student, '/');
-        cy.visit('/courses');
-        courseList.openCourse(course.id!);
-        courseOverview.openExamsTab();
-        courseOverview.openExam(exam.id!);
-        cy.url().should('contain', `/exams/${exam.id}`);
-    }
-
-    startParticipation(student: CypressCredentials, course: Course, exam: Exam) {
-        this.openExam(student, course, exam);
-        examStartEnd.startExam(true);
-    }
-
-    selectExerciseOnOverview(index: number) {
-        cy.get(`.exercise-table tr:nth-child(${index}) a`).click();
-    }
-
-    clickSaveAndContinue() {
-        cy.get('#save').click();
-    }
-
-    checkExerciseTitle(exerciseID: number, title: string) {
-        getExercise(exerciseID).find('.exercise-title').contains(title);
-    }
-
-    checkExamTitle(title: string) {
-        cy.get('#exam-title').contains(title);
-    }
-
-    getResultScore() {
-        cy.reloadUntilFound('#exercise-result-score');
-        return cy.get('#exercise-result-score');
-    }
-
-    checkExamFinishedTitle(title: string) {
-        cy.get('#exam-finished-title').contains(title, { timeout: 40000 });
-    }
-
-    checkExamFullnameInputExists() {
-        cy.get('#fullname', { timeout: 20000 }).should('exist');
-    }
-
-    checkYourFullname(name: string) {
-        cy.get('#your-name', { timeout: 20000 }).contains(name);
-    }
-
-    handInEarly() {
-        examNavigation.handInEarly();
-        examStartEnd.finishExam().then((request: Interception) => {
-            expect(request.response!.statusCode).to.eq(200);
-        });
-    }
-
-    verifyExerciseTitleOnFinalPage(exerciseID: number, exerciseTitle: string) {
-        getExercise(exerciseID).find(`#exercise-group-title-${exerciseID}`).scrollIntoView();
-        cy.get(`#exercise-group-title-${exerciseID}`).contains(exerciseTitle).should('be.visible');
-    }
-
-    verifyTextExerciseOnFinalPage(textFixture: string) {
-        cy.fixture(textFixture).then((submissionText) => {
-            cy.get('textarea').should('have.value', submissionText);
-        });
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamStartEndPage.ts b/src/test/cypress/support/pageobjects/exam/ExamStartEndPage.ts
deleted file mode 100644
index 38c31ca197f1..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamStartEndPage.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { COURSE_BASE, GET, POST } from '../../constants';
-import { users } from '../../users';
-
-export class ExamStartEndPage {
-    enterFirstnameLastname() {
-        users.getAccountInfo((account: any) => cy.get('#fullname').type((account.firstName ?? '') + ' ' + (account.lastName ?? '')));
-    }
-
-    setConfirmCheckmark(timeout?: number) {
-        cy.get('#confirmBox', { timeout }).check();
-    }
-
-    pressStartWithWait() {
-        cy.intercept(GET, `${COURSE_BASE}/*/exams/*/student-exams/*/conduction`).as('startExam');
-        cy.get('#start-exam').click();
-        return cy.wait('@startExam');
-    }
-
-    pressStart() {
-        cy.get('#start-exam').click();
-    }
-
-    clickContinue() {
-        cy.get('#continue').click();
-    }
-
-    pressFinish() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams/*/student-exams/submit`).as('finishExam');
-        cy.get('#end-exam').click();
-        return cy.wait('@finishExam', { timeout: 10000 });
-    }
-
-    startExam(withWait = false) {
-        this.setConfirmCheckmark();
-        this.enterFirstnameLastname();
-        if (withWait) {
-            this.pressStartWithWait();
-        } else {
-            this.pressStart();
-        }
-    }
-
-    finishExam(timeout?: number) {
-        this.setConfirmCheckmark(timeout ? timeout : Cypress.config('defaultCommandTimeout'));
-        this.enterFirstnameLastname();
-        return this.pressFinish();
-    }
-
-    pressShowSummary() {
-        cy.intercept(GET, `${COURSE_BASE}/*/exams/*/student-exams/*/summary`).as('examSummaryDownload');
-        cy.get('#showExamSummaryButton').should('be.visible').should('not.have.attr', 'disabled', { timeout: 15000 }).click();
-        cy.wait('@examSummaryDownload');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/ExamTestRunPage.ts b/src/test/cypress/support/pageobjects/exam/ExamTestRunPage.ts
deleted file mode 100644
index afb5056cfd4c..000000000000
--- a/src/test/cypress/support/pageobjects/exam/ExamTestRunPage.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-
-import { examStartEnd } from '../../artemis';
-import { COURSE_BASE, DELETE, PATCH, POST } from '../../constants';
-import { CypressCredentials } from '../../users';
-
-/**
- * A class which encapsulates UI selectors and actions for the exam details page.
- */
-export class ExamTestRunPage {
-    /**
-     * Creates a test run
-     * @returns the query chainable if a test needs to access the response
-     */
-    confirmTestRun() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams/*/test-run`).as('createTestRunQuery');
-        cy.get('.modal-dialog #createTestRunButton').click();
-        return cy.wait('@createTestRunQuery');
-    }
-
-    startParticipation(user: CypressCredentials, course: Course, exam: Exam, testRunId: number) {
-        cy.login(user);
-        this.openTestRunPage(course, exam);
-        this.startTestRun(testRunId);
-        cy.url().should('contain', `/course-management/${course.id}/exams/${exam.id}/test-runs/${testRunId}/conduction`);
-        examStartEnd.startExam();
-    }
-
-    createTestRun() {
-        cy.get('#createTestRunButton').click();
-    }
-
-    saveTestRun() {
-        cy.intercept(PATCH, `${COURSE_BASE}/*/exams/*/student-exams/*/working-time`).as('updateTestRunQuery');
-        cy.get('#save').click();
-        return cy.wait('@updateTestRunQuery');
-    }
-
-    getTestRun(testRunId: number) {
-        return cy.get(`#testrun-${testRunId}`);
-    }
-
-    getTestRunRibbon() {
-        return cy.get('#testRunRibbon');
-    }
-
-    openTestRunPage(course: Course, exam: Exam) {
-        cy.visit('/course-management/' + course.id + '/exams/' + exam.id + '/test-runs');
-    }
-
-    setWorkingTimeHours(hours: number) {
-        cy.get('#workingTimeHours').clear().type(hours.toString());
-    }
-
-    setWorkingTimeMinutes(minutes: number) {
-        cy.get('#workingTimeMinutes').clear().type(minutes.toString());
-    }
-
-    setWorkingTimeSeconds(seconds: number) {
-        cy.get('#workingTimeSeconds').clear().type(seconds.toString());
-    }
-
-    getWorkingTime(testRunId: number) {
-        return this.getTestRun(testRunId).find('.working-time');
-    }
-
-    getStarted(testRunId: number) {
-        return this.getTestRun(testRunId).find('.started');
-    }
-
-    getSubmitted(testRunId: number) {
-        return this.getTestRun(testRunId).find('.submitted');
-    }
-
-    getTestRunIdElement(testRunId: number) {
-        return this.getTestRun(testRunId).find('.testrun-id');
-    }
-
-    changeWorkingTime(testRunId: number) {
-        cy.get(`#testrun-${testRunId}`).find('.manage-worktime').click();
-    }
-
-    startTestRun(testRunId: number) {
-        cy.get(`#testrun-${testRunId}`).find('.start-testrun').click();
-    }
-
-    deleteTestRun(testRunId: number) {
-        cy.get(`#testrun-${testRunId}`).find('.delete-testrun').click();
-        cy.get('#confirm-entity-name').type('Test Run');
-        cy.intercept(DELETE, `${COURSE_BASE}/*/exams/*/test-run/*`).as('deleteTestRunQuery');
-        cy.get('#delete').click();
-        return cy.wait('@deleteTestRunQuery');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exam/StudentExamManagementPage.ts b/src/test/cypress/support/pageobjects/exam/StudentExamManagementPage.ts
deleted file mode 100644
index 58f6cb5d2ed8..000000000000
--- a/src/test/cypress/support/pageobjects/exam/StudentExamManagementPage.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { COURSE_BASE, POST } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the student exam management page.
- */
-export class StudentExamManagementPage {
-    clickGenerateStudentExams() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams/*/generate-student-exams`).as('generateStudentExams');
-        this.getGenerateStudentExamsButton().click();
-        return cy.wait('@generateStudentExams');
-    }
-
-    clickRegisterCourseStudents() {
-        cy.intercept(POST, `${COURSE_BASE}/*/exams/*/register-course-students`).as('registerCourseStudents');
-        cy.get('#register-course-students').click();
-        return cy.wait('@registerCourseStudents');
-    }
-
-    getGenerateStudentExamsButton() {
-        return cy.get('#generateStudentExamsButton');
-    }
-
-    getRegisteredStudents() {
-        return cy.get('#registered-students');
-    }
-
-    checkExamStudent(username: string) {
-        return cy.get('#student-exam').find(`[href$="user-management/${username}"]`).should('have.length', 1);
-    }
-
-    getStudentExamRows() {
-        return cy.get('#student-exam').find('.datatable-body-row');
-    }
-
-    getStudentExamRow(username: string) {
-        return cy.get('#student-exam').find(`a[href$="user-management/${username}"]`).closest('.datatable-body-row');
-    }
-
-    getExamProperty(username: string, property: string) {
-        cy.get('.datatable-header-cell').each(($headerCell, index) => {
-            if ($headerCell.text().includes(property)) {
-                this.getStudentExamRow(username).within(() => {
-                    cy.get('.datatable-body-cell-label').eq(index).as('bodyCellLabel');
-                });
-            }
-        });
-        return cy.get('@bodyCellLabel');
-    }
-
-    checkExamProperty(username: string, property: string, value: string) {
-        this.getExamProperty(username, property).contains(value);
-    }
-
-    typeSearchText(text: string) {
-        cy.get('#typeahead-basic').focus().clear().type(text);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/AbstractExerciseFeedbackPage.ts b/src/test/cypress/support/pageobjects/exercises/AbstractExerciseFeedbackPage.ts
deleted file mode 100644
index f98a9e74100e..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/AbstractExerciseFeedbackPage.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Interception } from 'cypress/types/net-stubbing';
-
-import { BASE_API, POST } from '../../constants';
-
-/**
- * Parent class for all exercise feedback pages (/course/./exercise/./participate/.)
- */
-export abstract class AbstractExerciseFeedback {
-    readonly RESULT_SELECTOR = '#result';
-    readonly ADDITIONAL_FEEDBACK_SELECTOR = '#additional-feedback';
-    readonly COMPLAIN_BUTTON_SELECTOR = '#complain';
-
-    shouldShowAdditionalFeedback(points: number, feedbackText: string) {
-        if (Math.abs(points) === 1) {
-            cy.get(this.ADDITIONAL_FEEDBACK_SELECTOR).contains(`${points} Point: ${feedbackText}`).should('be.visible');
-        } else {
-            cy.get(this.ADDITIONAL_FEEDBACK_SELECTOR).contains(`${points} Points: ${feedbackText}`).should('be.visible');
-        }
-    }
-
-    shouldShowScore(percentage: number) {
-        cy.get(this.RESULT_SELECTOR).contains(`${percentage}%`);
-    }
-
-    complain(complaint: string) {
-        cy.reloadUntilFound(this.COMPLAIN_BUTTON_SELECTOR);
-        cy.get(this.COMPLAIN_BUTTON_SELECTOR).click();
-        cy.get('#complainTextArea').type(complaint, { parseSpecialCharSequences: false });
-        cy.intercept(POST, `${BASE_API}/complaints`).as('postComplaint');
-        cy.get('#submit-complaint').click();
-        return cy.wait('@postComplaint').then((request: Interception) => {
-            expect(request.response!.statusCode).to.eq(201);
-        });
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/ExerciseResultPage.ts b/src/test/cypress/support/pageobjects/exercises/ExerciseResultPage.ts
deleted file mode 100644
index dde4299f3265..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/ExerciseResultPage.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { BASE_API, GET } from '../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the exercise result page.
- */
-export class ExerciseResultPage {
-    shouldShowProblemStatement(problemStatement: string) {
-        cy.get('#problem-statement').contains(problemStatement).should('be.visible');
-    }
-
-    shouldShowExerciseTitle(title: string) {
-        cy.get('#exercise-header').contains(title).should('be.visible');
-    }
-
-    shouldShowScore(percentage: number) {
-        cy.reloadUntilFound('jhi-course-exercise-details #submission-result-graded');
-        cy.contains('.tab-bar-exercise-details', `${percentage}%`).should('be.visible');
-    }
-
-    clickOpenExercise(exerciseId: number) {
-        cy.intercept(GET, `${BASE_API}/results/*/rating`).as('getResults');
-        cy.get('#open-exercise-' + exerciseId).click();
-        return cy.wait('@getResults');
-    }
-
-    clickOpenCodeEditor(exerciseId: number) {
-        cy.get('#open-exercise-' + exerciseId).click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadEditorPage.ts b/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadEditorPage.ts
deleted file mode 100644
index b5762a614587..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadEditorPage.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { EXERCISE_BASE, POST, PUT } from '../../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the file upload editor page.
- */
-export class FileUploadEditorPage {
-    attachFile(filePath: string) {
-        cy.get('#fileUploadInput').attachFile(filePath);
-    }
-
-    attachFileExam(filePath: string) {
-        cy.get('#fileUploadInput').attachFile(filePath);
-        cy.get('#file-upload-submit').click();
-    }
-
-    /**
-     * Saves the file upload submission and continues to the next exercise in the exam. This button is only available in exam mode!
-     */
-    saveAndContinue() {
-        cy.intercept(PUT, `${EXERCISE_BASE}/*/file-upload-submissions`).as('savedSubmission');
-        cy.get('#save').click();
-        return cy.wait('@savedSubmission');
-    }
-
-    submit() {
-        cy.intercept(POST, `${EXERCISE_BASE}/*/file-upload-submissions`).as('fileUploadSubmission');
-        cy.get('#submit').click();
-        return cy.wait('@fileUploadSubmission');
-    }
-
-    shouldShowExerciseTitleInHeader(exerciseTitle: string) {
-        cy.get('#participation-header').contains(exerciseTitle).should('be.visible');
-    }
-
-    shouldShowProblemStatement() {
-        cy.get('#problem-statement').should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts
deleted file mode 100644
index 21cfaecba175..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Dayjs } from 'dayjs/esm';
-
-import { UPLOAD_EXERCISE_BASE } from '../../../constants';
-import { POST } from '../../../constants';
-import { enterDate } from '../../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the file upload exercise creation page.
- */
-export class FileUploadExerciseCreationPage {
-    /**
-     * @param title the title of the text exercise
-     */
-    typeTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    setReleaseDate(date: Dayjs) {
-        enterDate('#pick-releaseDate', date);
-    }
-
-    setDueDate(date: Dayjs) {
-        enterDate('#pick-dueDate', date);
-    }
-
-    setAssessmentDueDate(date: Dayjs) {
-        enterDate('#pick-assessmentDueDate', date);
-    }
-
-    typeMaxPoints(maxPoints: number) {
-        cy.get('#field_points').type(maxPoints.toString());
-    }
-
-    setFilePattern(pattern: string) {
-        this.typeText('#field_filePattern', pattern);
-    }
-
-    typeProblemStatement(statement: string) {
-        this.typeText('#field_problemStatement', statement);
-    }
-
-    typeExampleSolution(statement: string) {
-        this.typeText('#field_exampleSolution', statement);
-    }
-
-    typeAssessmentInstructions(statement: string) {
-        this.typeText('#gradingInstructions', statement);
-    }
-
-    create() {
-        cy.intercept(POST, UPLOAD_EXERCISE_BASE).as('fileUploadExerciseCreation');
-        cy.get('#save-entity').click();
-        return cy.wait('@fileUploadExerciseCreation');
-    }
-
-    private typeText(selector: string, text: string) {
-        cy.get(selector).find('.ace_content').type(text);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseFeedbackPage.ts b/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseFeedbackPage.ts
deleted file mode 100644
index edb314a9f10e..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/file-upload/FileUploadExerciseFeedbackPage.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AbstractExerciseFeedback } from '../AbstractExerciseFeedbackPage';
-
-/**
- * A class which encapsulates UI selectors and actions for a file upload exercise feedback page.
- */
-export class FileUploadExerciseFeedbackPage extends AbstractExerciseFeedback {
-    shouldShowTextFeedback(feedbackIndex: number, feedback: string) {
-        cy.get('#text-feedback-' + feedbackIndex)
-            .contains(feedback)
-            .should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/modeling/CreateModelingExercisePage.ts b/src/test/cypress/support/pageobjects/exercises/modeling/CreateModelingExercisePage.ts
deleted file mode 100644
index ab31ee707a7b..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/modeling/CreateModelingExercisePage.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Dayjs } from 'dayjs/esm';
-
-import { MODELING_EXERCISE_BASE, POST } from '../../../constants';
-import { enterDate } from '../../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the Modeling Exercise Creation Page.
- * Path: /course-management/{courseID}/modeling-exercises/{exerciseID}
- */
-export class CreateModelingExercisePage {
-    setTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    addCategories(categories: string[]) {
-        categories.forEach((category) => {
-            cy.get('#field_categories').type(category).type('{enter}');
-        });
-    }
-
-    setPoints(points: number) {
-        cy.get('#field_points').clear().type(points.toString());
-    }
-
-    save() {
-        cy.intercept(MODELING_EXERCISE_BASE).as('createModelingExercise');
-        cy.get('#save-entity').click();
-        return cy.wait('@createModelingExercise');
-    }
-
-    import() {
-        cy.intercept(POST, `${MODELING_EXERCISE_BASE}/import/*`).as('modelingExerciseImport');
-        cy.get('#save-entity').click();
-        return cy.wait('@modelingExerciseImport');
-    }
-
-    /**
-     * Sets the release Date field
-     * @param date should be in Format: YYYY-MM-DDTHH:mm:ss.SSS
-     * */
-    setReleaseDate(date: Dayjs) {
-        enterDate('#pick-releaseDate', date);
-    }
-
-    /**
-     * Sets the Due Date field
-     * @param date should be in Format: YYYY-MM-DDTHH:mm:ss.SSS
-     * */
-    setDueDate(date: Dayjs) {
-        enterDate('#pick-dueDate', date);
-    }
-
-    /**
-     * Sets the Assessment Due Date field
-     * @param date should be in Format: YYYY-MM-DDTHH:mm:ss.SSS
-     * */
-    setAssessmentDueDate(date: Dayjs) {
-        enterDate('#pick-assessmentDueDate', date);
-    }
-
-    includeInOverallScore() {
-        cy.get('#modeling-includeInScore-picker').children().eq(0).children().eq(2).click({ force: true });
-    }
-
-    pickDifficulty(options: { hard?: boolean; medium?: boolean; easy?: boolean }) {
-        if (options.hard) {
-            this.getDiffifultyBar().children().eq(3).click();
-        } else if (options.medium) {
-            this.getDiffifultyBar().children().eq(2).click();
-        } else if (options.easy) {
-            this.getDiffifultyBar().children().eq(1).click();
-        } else {
-            this.getDiffifultyBar().children().eq(0).click();
-        }
-    }
-
-    private getDiffifultyBar() {
-        return cy.get('#modeling-difficulty-picker').children().eq(0);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/modeling/ModelingEditor.ts b/src/test/cypress/support/pageobjects/exercises/modeling/ModelingEditor.ts
deleted file mode 100644
index 1e052f6144aa..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/modeling/ModelingEditor.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { EXERCISE_BASE, MODELING_EDITOR_CANVAS, PUT } from '../../../constants';
-import { getExercise } from '../../../utils';
-
-import scrollBehaviorOptions = Cypress.scrollBehaviorOptions;
-
-/**
- * This provides functions for interacting with the modeling editor
- * */
-export class ModelingEditor {
-    /**
-     * Adds a Modeling Component to the Example Solution
-     * */
-    addComponentToModel(exerciseID: number, componentNumber: number, scrollBehavior: scrollBehaviorOptions = 'center', x?: number, y?: number) {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-        // @ts-ignore https://github.com/4teamwork/cypress-drag-drop/issues/103
-        getExercise(exerciseID)
-            .find('#modeling-editor-sidebar')
-            .children()
-            .eq(componentNumber)
-            .drag(`#exercise-${exerciseID} ${MODELING_EDITOR_CANVAS}`, { target: { x, y }, scrollBehavior, timeout: 1000 });
-        getExercise(exerciseID).find(MODELING_EDITOR_CANVAS).trigger('pointerup');
-    }
-
-    getModelingCanvas() {
-        return cy.get('#modeling-editor-canvas');
-    }
-
-    addComponentToExampleSolutionModel(componentNumber: number, scrollBehavior: scrollBehaviorOptions = 'center') {
-        cy.get('#modeling-editor-sidebar').children().eq(componentNumber).drag(MODELING_EDITOR_CANVAS, { scrollBehavior, timeout: 1000 });
-        cy.get(MODELING_EDITOR_CANVAS).trigger('mouseup').trigger('pointerup');
-    }
-
-    submit() {
-        cy.intercept(PUT, `${EXERCISE_BASE}/*/modeling-submissions`).as('createModelingSubmission');
-        cy.get('#submit-modeling-submission').first().click();
-        return cy.wait('@createModelingSubmission');
-    }
-
-    clickCreateNewExampleSubmission() {
-        cy.get('#new-modeling-example-submission').click();
-    }
-
-    clickCreateExampleSubmission() {
-        cy.get('#create-example-submission').click();
-    }
-
-    showExampleAssessment() {
-        cy.get('#show-modeling-example-assessment').click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/modeling/ModelingExerciseFeedbackPage.ts b/src/test/cypress/support/pageobjects/exercises/modeling/ModelingExerciseFeedbackPage.ts
deleted file mode 100644
index d89dde814633..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/modeling/ModelingExerciseFeedbackPage.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { AbstractExerciseFeedback } from '../AbstractExerciseFeedbackPage';
-
-/**
- * A class which encapsulates UI selectors and actions for a text exercise feedback page.
- */
-export class ModelingExerciseFeedbackPage extends AbstractExerciseFeedback {
-    shouldShowComponentFeedback(component: number, points: number, feedback: string) {
-        cy.get('#component-feedback-table').children().eq(1).children().eq(component).should('contain.text', feedback).and('contain.text', `${points}`);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/programming/CodeAnalysisGradingPage.ts b/src/test/cypress/support/pageobjects/exercises/programming/CodeAnalysisGradingPage.ts
deleted file mode 100644
index 06c6c17c6983..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/programming/CodeAnalysisGradingPage.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { PATCH, PROGRAMMING_EXERCISE_BASE } from '../../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for static code analysis grading configuration page.
- */
-export class CodeAnalysisGradingPage {
-    visit(courseId: number, exerciseId: number) {
-        cy.visit(`course-management/${courseId}/programming-exercises/${exerciseId}/grading/code-analysis`);
-    }
-
-    makeEveryScaCategoryInfluenceGrading() {
-        // Using ids here would make the test more instable. Its unlikely that this selector will break in the future.
-        cy.get('select').each((category) => {
-            cy.wrap(category).select('GRADED');
-        });
-    }
-
-    saveChanges() {
-        cy.intercept(PATCH, `${PROGRAMMING_EXERCISE_BASE}/*/static-code-analysis-categories`).as('scaConfigurationRequest');
-        cy.get('#save-table-button').click();
-        return cy.wait('@scaConfigurationRequest');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/programming/OnlineEditorPage.ts b/src/test/cypress/support/pageobjects/exercises/programming/OnlineEditorPage.ts
deleted file mode 100644
index 78df0503d47b..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/programming/OnlineEditorPage.ts
+++ /dev/null
@@ -1,217 +0,0 @@
-import { courseList, courseOverview } from '../../../artemis';
-import { DELETE } from '../../../constants';
-import { BASE_API, POST } from '../../../constants';
-import { CypressCredentials } from '../../../users';
-import { getExercise } from '../../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the Online Editor Page.
- */
-export class OnlineEditorPage {
-    /**
-     * @param exerciseID the ID of the exercise
-     * @returns the root element of the file browser. Useful for further querying.
-     */
-    findFileBrowser(exerciseID: number) {
-        return getExercise(exerciseID).find('#cardFiles');
-    }
-
-    /**
-     * Writes all the content in the corresponding files in the online editor. NOTE: This does not create non-existing files.
-     * It only opens existing files and writes the content there!
-     * @param exerciseID the ID of the exercise
-     * @param submission object which contains the information about which files need to be edited with what content
-     */
-    typeSubmission(exerciseID: number, submission: ProgrammingExerciseSubmission) {
-        for (const newFile of submission.files) {
-            if (submission.createFilesInRootFolder) {
-                this.createFileInRootFolder(exerciseID, newFile.name);
-            } else {
-                this.createFileInRootPackage(exerciseID, newFile.name, submission.packageName!);
-            }
-            cy.fixture(newFile.path)
-                .then(($fileContent) => {
-                    const clipboardData = new DataTransfer();
-                    const format = 'text/plain';
-                    clipboardData.setData(format, $fileContent);
-                    const pasteEvent = new ClipboardEvent('paste', { clipboardData });
-                    const editorElement = getExercise(exerciseID).find('.view-lines').first();
-                    editorElement
-                        .click()
-                        .then((element) => {
-                            element[0].dispatchEvent(pasteEvent);
-                        })
-                        .wait(500);
-                })
-                .wait(500);
-        }
-        cy.wait(500);
-    }
-
-    /**
-     * Deletes a file in the filebrowser.
-     * @param exerciseID the ID of the exercise
-     * @param name the file name
-     */
-    deleteFile(exerciseID: number, name: string) {
-        cy.intercept(DELETE, `${BASE_API}/repository/*/**`).as('deleteFile');
-        this.findFile(exerciseID, name).find('#file-browser-file-delete').click();
-        cy.get('#delete-file').click();
-        cy.wait('@deleteFile').its('response.statusCode').should('eq', 200);
-        this.findFileBrowser(exerciseID).contains(name).should('not.exist');
-    }
-
-    /**
-     * @param exerciseID the ID of the exercise
-     * @param name the file name
-     * @returns the root element of a file in the filebrowser
-     */
-    private findFile(exerciseID: number, name: string) {
-        return this.findFileBrowser(exerciseID).contains(name).parents('#file-browser-file');
-    }
-
-    /**
-     * Opens a file in the file browser by clicking on it.
-     */
-    openFileWithName(exerciseID: number, name: string) {
-        this.findFile(exerciseID, name).click().wait(2000);
-    }
-
-    /**
-     * Submits the currently saved files by clicking on the submit button and expect GRADED result label.
-     * @param exerciseID the ID of the exercise
-     */
-    submit(exerciseID: number) {
-        getExercise(exerciseID).find('#submit_button').click();
-        getExercise(exerciseID).find('#result-score-badge', { timeout: 200000 }).should('contain.text', 'GRADED').and('be.visible');
-    }
-
-    /**
-     * Submits the currently saved files by clicking on the submit button and expect PRACTICE result label.
-     * @param exerciseID the ID of the exercise
-     */
-    submitPractice(exerciseID: number) {
-        getExercise(exerciseID).find('#submit_button').click();
-        getExercise(exerciseID).find('#result-score-badge', { timeout: 200000 }).should('contain.text', 'PRACTICE').and('be.visible');
-    }
-
-    /**
-     * Creates a file at root level in the file browser.
-     * @param exerciseID the ID of the exercise
-     * @param fileName the name of the new file (e.g. "Policy.java")
-     */
-    createFileInRootFolder(exerciseID: number, fileName: string) {
-        const postRequestId = 'createFile' + fileName;
-        const requestPath = `${BASE_API}/repository/*/file?file=${fileName}`;
-        getExercise(exerciseID).find('[id="create_file_root"]').click().wait(500);
-        cy.intercept(POST, requestPath).as(postRequestId);
-        getExercise(exerciseID).find('#file-browser-create-node').type(fileName).wait(500).type('{enter}');
-        cy.wait('@' + postRequestId)
-            .its('response.statusCode')
-            .should('eq', 200);
-        this.findFileBrowser(exerciseID).contains(fileName).should('be.visible').wait(500);
-    }
-
-    /**
-     * Creates a file at root level (in the main package) in the file browser.
-     * @param exerciseID the ID of the exercise
-     * @param fileName the name of the new file (e.g. "Policy.java")
-     * @param packageName the name of the package (e.g. "de.test")
-     */
-    createFileInRootPackage(exerciseID: number, fileName: string, packageName: string) {
-        const packagePath = packageName.replace(/\./g, '/');
-        const filePath = `src/${packagePath}/${fileName}`;
-        const postRequestId = 'createFile' + fileName;
-        const requestPath = `${BASE_API}/repository/*/file?file=${filePath}`;
-        getExercise(exerciseID).find('[id="file-browser-folder-create-file"]').eq(2).click().wait(500);
-        cy.intercept(POST, requestPath).as(postRequestId);
-        getExercise(exerciseID).find('#file-browser-create-node').type(fileName).wait(500).type('{enter}');
-        cy.wait('@' + postRequestId)
-            .its('response.statusCode')
-            .should('eq', 200);
-        this.findFileBrowser(exerciseID).contains(fileName).should('be.visible').wait(500);
-    }
-
-    /**
-     * @returns the root element of the result panel. This can be used for further querying inside this panel
-     */
-    getResultPanel() {
-        return cy.get('#result');
-    }
-
-    /**
-     * @returns the element containing the result score percentage.
-     */
-    getResultScore() {
-        cy.reloadUntilFound('#result-score');
-        return cy.get('#result-score');
-    }
-
-    /**
-     * @param exerciseID the ID of the exercise
-     * @returns the element containing the result score percentage.
-     */
-    getResultScoreFromExercise(exerciseID: number) {
-        return getExercise(exerciseID).find('#result-score');
-    }
-
-    /**
-     * @returns the root element of the panel, which shows the CI build output.
-     */
-    getBuildOutput() {
-        return cy.get('#cardBuildOutput');
-    }
-
-    toggleCompressFileTree(exerciseID: number) {
-        return getExercise(exerciseID).find('#compress_tree').click();
-    }
-
-    /**
-     * General method for entering, submitting and verifying something in the online editor.
-     */
-    makeSubmissionAndVerifyResults(exerciseID: number, submission: ProgrammingExerciseSubmission, verifyOutput: () => void) {
-        // Decompress the file tree to access the parent folder
-        this.toggleCompressFileTree(exerciseID);
-        // We delete all existing files, so we can create new files and don't have to delete their already existing content
-        for (const deleteFile of submission.deleteFiles) {
-            this.deleteFile(exerciseID, deleteFile);
-        }
-        this.typeSubmission(exerciseID, submission);
-        this.submit(exerciseID);
-        verifyOutput();
-    }
-
-    /**
-     * Starts the participation in the test programming exercise.
-     */
-    startParticipation(courseId: number, exerciseId: number, credentials: CypressCredentials) {
-        // For shorter intervals, the reload may come before the app can render the elements.
-        const reloadInterval = 4000;
-        cy.login(credentials, '/');
-        cy.url().should('include', '/courses');
-        cy.log('Participating in the programming exercise as a student...');
-        courseList.openCourse(courseId!);
-        cy.url().should('include', '/exercises');
-        courseOverview.startExercise(exerciseId, reloadInterval);
-        cy.reloadUntilFound('#open-exercise-' + exerciseId, reloadInterval);
-        courseOverview.openRunningProgrammingExercise(exerciseId);
-    }
-}
-
-/**
- * A class which encapsulates a programming exercise submission taken from the k6 resources.
- *
- * @param files An array of containers, which contain the file path of the changed file as well as its name.
- */
-export class ProgrammingExerciseSubmission {
-    deleteFiles: string[];
-    createFilesInRootFolder: boolean;
-    files: ProgrammingExerciseFile[];
-    expectedResult: string;
-    packageName?: string;
-}
-
-class ProgrammingExerciseFile {
-    name: string;
-    path: string;
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
deleted file mode 100644
index aba55301646a..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { POST, PROGRAMMING_EXERCISE_BASE, ProgrammingLanguage } from '../../../constants';
-import { Dayjs } from 'dayjs/esm';
-
-const OWL_DATEPICKER_ARIA_LABEL_DATE_FORMAT = 'MMMM D, YYYY';
-
-/**
- * A class which encapsulates UI selectors and actions for the programming exercise creation page.
- */
-export class ProgrammingExerciseCreationPage {
-    /**
-     * @param title the title of the programming exercise
-     */
-    setTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    /**
-     * @param shortName the short name of the programming exercise
-     */
-    setShortName(shortName: string) {
-        cy.get('#field_shortName').clear().type(shortName);
-    }
-
-    /**
-     * @param programmingLanguage the programming language of the programming exercise
-     */
-    setProgrammingLanguage(programmingLanguage: ProgrammingLanguage) {
-        cy.get('#field_programmingLanguage').select(programmingLanguage);
-    }
-
-    /**
-     * @param packageName the package name of the programming exercise
-     */
-    setPackageName(packageName: string) {
-        cy.get('#field_packageName').clear().type(packageName);
-    }
-
-    /**
-     * @param points Achievable points in the exercise
-     */
-    setPoints(points: number) {
-        cy.get('#field_points').clear().type(points.toString());
-    }
-
-    /**
-     * Allows the usage of the online editor.
-     */
-    checkAllowOnlineEditor() {
-        cy.get('#field_allowOnlineEditor').check();
-    }
-
-    /**
-     * Generates the programming exercise.
-     * @returns the chainable of the request to make further verifications
-     */
-    generate() {
-        cy.intercept(POST, `${PROGRAMMING_EXERCISE_BASE}/setup`).as('createProgrammingExercise');
-        cy.get('#save-entity').click();
-        // Creating a programming exercise can take quite a while, so we increase the default timeout here
-        return cy.wait('@createProgrammingExercise', { timeout: 60000 });
-    }
-
-    import() {
-        cy.intercept(POST, `${PROGRAMMING_EXERCISE_BASE}/import/*`).as('programmingExerciseImport');
-        cy.get('#save-entity').click();
-        // Creating a programming exercise can take quite a while, so we increase the default timeout here
-        return cy.wait('@programmingExerciseImport', { timeout: 60000 });
-    }
-
-    /**
-     * Sets the Due Date field by using the owl datepicker
-     * @param date
-     * */
-    setDueDate(date: Dayjs) {
-        cy.get('#programming-exercise-due-date-picker').click();
-
-        // Makes sure that popup is visible before we choose a date
-        cy.get('.owl-dt-popup').should('be.visible');
-
-        const ariaLabelDate = date.format(OWL_DATEPICKER_ARIA_LABEL_DATE_FORMAT);
-        cy.get(`td[aria-label="${ariaLabelDate}"]`).click();
-
-        // There is a race condition, where an event listener already attaches and is ready to process the actual click on a date element
-        // but no event listener has been attached yet to close the modal. Thus, we need to keep clicking until the calendar modal is closed.
-        // Another idea would be to use cy.wait(), however it's not recommended by the developers.
-        // Cypress-pipe does not retry any Cypress commands so we need to click on the element using jQuery method "$el.trigger('click')" and not "cy.click()"
-        // See https://www.cypress.io/blog/2019/01/22/when-can-the-test-click for more information
-        const click = ($el: JQuery<HTMLElement>) => $el.trigger('click');
-
-        cy.get('.owl-dt-control-content.owl-dt-control-button-content')
-            .should('be.visible')
-            .contains('Set')
-            .pipe(click)
-            .should(($el) => {
-                expect($el).to.not.be.visible;
-            });
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseFeedbackPage.ts b/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseFeedbackPage.ts
deleted file mode 100644
index 966f558dafa9..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/programming/ProgrammingExerciseFeedbackPage.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { AbstractExerciseFeedback } from '../AbstractExerciseFeedbackPage';
-import { OnlineEditorPage } from './OnlineEditorPage';
-
-/**
- * A class which encapsulates UI selectors and actions for a programming exercise feedback page.
- */
-export class ProgrammingExerciseFeedbackPage extends AbstractExerciseFeedback {
-    shouldShowAdditionalFeedback(points: number, feedbackText: string) {
-        cy.reloadUntilFound(this.ADDITIONAL_FEEDBACK_SELECTOR);
-        cy.get(this.ADDITIONAL_FEEDBACK_SELECTOR).contains(`${points} Points: ${feedbackText}`).should('be.visible');
-    }
-
-    shouldShowCodeFeedback(exerciseID: number, filename: string, feedback: string, points: string, editorPage: OnlineEditorPage) {
-        editorPage.openFileWithName(exerciseID, filename);
-        this.findVisibleInlineFeedback().contains(feedback).should('be.visible');
-        this.findVisibleInlineFeedback().contains(`${points}P`).should('be.visible');
-    }
-
-    private findVisibleInlineFeedback() {
-        return cy.get('[id*="code-editor-inline-feedback-"]').should('be.visible');
-    }
-
-    shouldShowRepositoryLockedWarning() {
-        cy.get('#repository-locked-warning').should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/programming/ScaFeedbackModal.ts b/src/test/cypress/support/pageobjects/exercises/programming/ScaFeedbackModal.ts
deleted file mode 100644
index 14306c2a3fd5..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/programming/ScaFeedbackModal.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the static code analysis feedback modal in the online editor.
- */
-export class ScaFeedbackModal {
-    shouldShowPointChart() {
-        cy.get('#feedback-chart').should('be.visible');
-    }
-
-    shouldShowCodeIssue(feedbackText: string, pointReduction: string) {
-        // This is a workaround to avoid Cypress only returning the first element matching the id
-        cy.get('.feedback-list')
-            .contains(feedbackText)
-            .scrollIntoView()
-            .should('be.visible')
-            .parents('.feedback-item')
-            .find('.feedback-item__credits')
-            .scrollIntoView()
-            .should('contain.text', `-${pointReduction}P`)
-            .and('be.visible');
-    }
-
-    closeModal() {
-        cy.get('.feedback-header__close').click();
-        cy.get('.result-detail-container').should('not.exist');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/quiz/DragAndDropQuiz.ts b/src/test/cypress/support/pageobjects/exercises/quiz/DragAndDropQuiz.ts
deleted file mode 100644
index 07a3ec72439e..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/quiz/DragAndDropQuiz.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { EXERCISE_BASE, MODELING_EDITOR_CANVAS, POST } from '../../../constants';
-
-export class DragAndDropQuiz {
-    createDnDQuiz(title: string) {
-        cy.get('#quiz-import-apollon-dnd-question').should('be.visible').click();
-        cy.get('#create-apollon-diagram').should('be.visible').click();
-        cy.get('#field_diagram_title').type(title);
-        cy.get('#save-dnd-quiz').click();
-    }
-
-    dragItemIntoDragArea(itemIndex: number) {
-        cy.get('#drag-item-' + itemIndex).drag('#drop-location');
-    }
-
-    setTitle(title: string) {
-        cy.get('#field_title').type(title);
-    }
-
-    /**
-     * Drags an element to the modeling editor canvas
-     *
-     * @param x drop location on X-axis
-     * @param y drop location on Y-axis
-     */
-    dragUsingCoordinates(x: number, y: number) {
-        cy.get('#modeling-editor-sidebar').children().eq(2).drag(MODELING_EDITOR_CANVAS, { target: { x, y } });
-        cy.wait(200);
-        cy.get(MODELING_EDITOR_CANVAS).trigger('pointerup');
-    }
-
-    /**
-     * Returns minimum and maximum X value of drop location elements
-     *
-     * @param $els selected drop location elements
-     */
-    getXAxis($els: JQuery<HTMLElement>) {
-        let minX = Number.MAX_SAFE_INTEGER;
-        let maxX = Number.MIN_SAFE_INTEGER;
-        $els.each((index, el) => {
-            const rect = el.getBoundingClientRect();
-            if (rect.x < minX) {
-                minX = rect.x;
-            }
-            if (rect.x + rect.width > maxX) {
-                maxX = rect.x + rect.width;
-            }
-        });
-        return { minX, maxX };
-    }
-
-    activateInteractiveMode() {
-        const modelingEditorSidebar = cy.get('#modeling-editor-sidebar');
-        const container = modelingEditorSidebar.children().eq(0);
-        const interactiveButton = container.children().eq(1);
-        interactiveButton.click();
-    }
-
-    markElementAsInteractive(nthElementOnCanvas: number, nthChildOfElement: number) {
-        cy.get(MODELING_EDITOR_CANVAS).children().children().children().eq(nthElementOnCanvas).children().eq(0).children().eq(nthChildOfElement).click();
-    }
-
-    generateQuizExercise() {
-        cy.get('#generate-quiz-exercise').click();
-        cy.get('#quiz-save').should('be.visible');
-        cy.wait(100);
-        cy.get('#quiz-save').click();
-    }
-
-    waitForQuizExerciseToBeGenerated() {
-        cy.get('#jhi-text-exercise-heading-edit').should('be.visible');
-    }
-
-    previewQuiz() {
-        cy.get('#preview-quiz').click();
-    }
-
-    waitForQuizPreviewToLoad() {
-        cy.get('.drag-and-drop-area').should('be.visible');
-        cy.wait(200);
-    }
-
-    submit() {
-        cy.intercept(POST, `${EXERCISE_BASE}/*/submissions/live`).as('createQuizExercise');
-        cy.get('#submit-quiz').contains('Submit').click();
-        return cy.wait('@createQuizExercise');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/quiz/MultipleChoiceQuiz.ts b/src/test/cypress/support/pageobjects/exercises/quiz/MultipleChoiceQuiz.ts
deleted file mode 100644
index d94e033d0306..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/quiz/MultipleChoiceQuiz.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { EXERCISE_BASE, POST } from '../../../constants';
-import { getExercise } from '../../../utils';
-
-export class MultipleChoiceQuiz {
-    tickAnswerOption(exerciseID: number, optionNumber: number, quizQuestionId = 0) {
-        getExercise(exerciseID)
-            .find('#question' + quizQuestionId)
-            .find('#answer-option-' + optionNumber)
-            .find('#mc-answer-selection-' + optionNumber)
-            .click();
-    }
-
-    submit() {
-        cy.intercept(POST, `${EXERCISE_BASE}/*/submissions/live`).as('createQuizExercise');
-        cy.get('#submit-quiz').scrollIntoView();
-        cy.get('#submit-quiz').click();
-        return cy.wait('@createQuizExercise');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts
deleted file mode 100644
index c102704a3e0b..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { Dayjs } from 'dayjs/esm';
-
-import { BASE_API, POST, QUIZ_EXERCISE_BASE } from '../../../constants';
-import { enterDate } from '../../../utils';
-
-export class QuizExerciseCreationPage {
-    setTitle(title: string) {
-        cy.get('#field_title').type(title);
-    }
-
-    setVisibleFrom(date: Dayjs) {
-        enterDate('#pick-releaseDate', date);
-    }
-
-    addMultipleChoiceQuestion(title: string, points = 1) {
-        cy.get('#quiz-add-mc-question').click();
-        cy.get('#mc-question-title').type(title);
-        cy.get('#score').clear().type(points.toString());
-        cy.fixture('exercise/quiz/multiple_choice/question.txt').then((fileContent) => {
-            cy.get('.ace_text-input').focus().clear().type(fileContent);
-        });
-    }
-
-    addShortAnswerQuestion(title: string) {
-        cy.get('#quiz-add-short-answer-question').click();
-        cy.get('#short-answer-question-title').type(title);
-        cy.fixture('exercise/quiz/short_answer/question.txt').then((fileContent) => {
-            cy.get('.ace_text-input').focus().clear().type(fileContent);
-            cy.get('#short-answer-show-visual').click();
-        });
-    }
-
-    addDragAndDropQuestion(title: string) {
-        cy.get('#quiz-add-dnd-question').click();
-        cy.get('#drag-and-drop-question-title').type(title);
-        this.uploadDragAndDropBackground().then(() => {
-            cy.wait(2000);
-            cy.get('.click-layer').trigger('mousedown', { x: 50, y: 50 }).trigger('mousemove', { x: 500, y: 300 }).trigger('mouseup');
-        });
-        this.createDragAndDropItem('Rick Astley');
-        cy.get('#drag-item-0').drag('#drop-location');
-        cy.fixture('exercise/quiz/drag_and_drop/question.txt').then((fileContent) => {
-            cy.get('.ace_text-input').focus().clear().type(fileContent);
-        });
-    }
-
-    createDragAndDropItem(text: string) {
-        cy.get('#add-text-drag-item').click();
-        cy.get('#drag-item-0-text').clear().type(text);
-    }
-
-    uploadDragAndDropBackground() {
-        cy.get('#background-image-input-form').children().eq(0).attachFile('exercise/quiz/drag_and_drop/background.jpg');
-        cy.intercept(POST, `${BASE_API}/fileUpload*`).as('uploadBackground');
-        cy.get('#background-image-input-form').children().eq(1).click();
-        return cy.wait('@uploadBackground');
-    }
-
-    /**
-     * @return <Chainable>  the response of the request
-     */
-    saveQuiz() {
-        cy.intercept(POST, QUIZ_EXERCISE_BASE).as('createQuizExercise');
-        cy.get('#quiz-save').click();
-        return cy.wait('@createQuizExercise');
-    }
-
-    import() {
-        cy.intercept(POST, `${QUIZ_EXERCISE_BASE}/import/*`).as('quizExerciseImport');
-        cy.get('#quiz-save').click();
-        return cy.wait('@quizExerciseImport');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/quiz/ShortAnswerQuiz.ts b/src/test/cypress/support/pageobjects/exercises/quiz/ShortAnswerQuiz.ts
deleted file mode 100644
index a4003d260067..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/quiz/ShortAnswerQuiz.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { EXERCISE_BASE, POST } from '../../../constants';
-
-export class ShortAnswerQuiz {
-    getQuizBody() {
-        return cy.get('#question0').children().first();
-    }
-
-    typeAnswer(line: number, column: number, quizQuestionId: number, answer: string) {
-        this.getQuizBody().find(`#solution-${line}-${column}-${quizQuestionId}`).type(answer);
-    }
-
-    submit() {
-        cy.intercept(POST, `${EXERCISE_BASE}/*/submissions/live`).as('createQuizExercise');
-        cy.get('#submit-quiz').scrollIntoView();
-        cy.get('#submit-quiz').click();
-        return cy.wait('@createQuizExercise');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/text/TextEditorPage.ts b/src/test/cypress/support/pageobjects/exercises/text/TextEditorPage.ts
deleted file mode 100644
index aa53321732c2..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/text/TextEditorPage.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { EXERCISE_BASE, PUT } from '../../../constants';
-import { getExercise } from '../../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the text editor page.
- */
-export class TextEditorPage {
-    typeSubmission(exerciseID: number, submission: string) {
-        getExercise(exerciseID).find('#text-editor').type(submission, { parseSpecialCharSequences: false });
-    }
-
-    clearSubmission(exerciseID: number) {
-        getExercise(exerciseID).find('#text-editor').clear();
-    }
-
-    checkCurrentContent(exerciseID: number, expectedContent: string) {
-        cy.fixture(expectedContent).then((text) => {
-            getExercise(exerciseID).find('#text-editor').should('have.value', text);
-        });
-    }
-
-    /**
-     * Saves the text submission and continues to the next exercise in the exam. This button is only available in exam mode!
-     */
-    saveAndContinue() {
-        cy.intercept(PUT, `${EXERCISE_BASE}/*/text-submissions`).as('savedSubmission');
-        cy.get('#save').click();
-        return cy.wait('@savedSubmission');
-    }
-
-    submit() {
-        cy.intercept(PUT, `${EXERCISE_BASE}/*/text-submissions`).as('textSubmission');
-        cy.get('#submit button').click();
-        return cy.wait('@textSubmission');
-    }
-
-    shouldShowExerciseTitleInHeader(exerciseTitle: string) {
-        cy.get('#participation-header').contains(exerciseTitle).should('be.visible');
-    }
-
-    shouldShowProblemStatement() {
-        cy.get('#problem-statement').should('be.visible');
-    }
-
-    shouldShowNumberOfWords(numberOfWords: number) {
-        cy.get('#word-count').should('contain.text', numberOfWords).and('be.visible');
-    }
-
-    shouldShowNumberOfCharacters(numberOfWords: number) {
-        cy.get('#character-count').should('contain.text', numberOfWords).and('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/text/TextExerciseCreationPage.ts
deleted file mode 100644
index 20c01d7f6b52..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseCreationPage.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { Dayjs } from 'dayjs/esm';
-
-import { TEXT_EXERCISE_BASE } from '../../../constants';
-import { POST } from '../../../constants';
-import { enterDate } from '../../../utils';
-
-/**
- * A class which encapsulates UI selectors and actions for the text exercise creation page.
- */
-export class TextExerciseCreationPage {
-    /**
-     * @param title the title of the text exercise
-     */
-    typeTitle(title: string) {
-        cy.get('#field_title').clear().type(title);
-    }
-
-    setReleaseDate(date: Dayjs) {
-        enterDate('#pick-releaseDate', date);
-    }
-
-    setDueDate(date: Dayjs) {
-        enterDate('#pick-dueDate', date);
-    }
-
-    setAssessmentDueDate(date: Dayjs) {
-        enterDate('#pick-assessmentDueDate', date);
-    }
-
-    typeMaxPoints(maxPoints: number) {
-        cy.get('#field_points').type(maxPoints.toString());
-    }
-
-    typeProblemStatement(statement: string) {
-        this.typeText('#problemStatement', statement);
-    }
-
-    typeExampleSolution(statement: string) {
-        this.typeText('#exampleSolution', statement);
-    }
-
-    typeAssessmentInstructions(statement: string) {
-        this.typeText('#gradingInstructions', statement);
-    }
-
-    create() {
-        cy.intercept(POST, TEXT_EXERCISE_BASE).as('textExerciseCreation');
-        cy.get('#save-entity').click();
-        return cy.wait('@textExerciseCreation');
-    }
-
-    import() {
-        cy.intercept(POST, `${TEXT_EXERCISE_BASE}/import/*`).as('textExerciseImport');
-        cy.get('#save-entity').click();
-        return cy.wait('@textExerciseImport');
-    }
-
-    private typeText(selector: string, text: string) {
-        cy.get(selector).find('.ace_content').type(text);
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionCreationPage.ts b/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionCreationPage.ts
deleted file mode 100644
index 812c7d63b998..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionCreationPage.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { EXERCISE_BASE, POST } from '../../../constants';
-
-/**
- * A class which encapsulates UI selectors and actions for the text exercise example submission creation page.
- */
-export class TextExerciseExampleSubmissionCreationPage {
-    getInstructionsRootElement() {
-        return cy.get('#instructions');
-    }
-
-    typeExampleSubmission(example: string) {
-        cy.get('#example-text-submission-input').type(example, { parseSpecialCharSequences: false });
-    }
-
-    clickCreateNewExampleSubmission() {
-        cy.intercept(POST, `${EXERCISE_BASE}/*/example-submissions`).as('createExampleSubmission');
-        cy.get('#create-example-submission').click();
-        return cy.wait('@createExampleSubmission');
-    }
-
-    showsExerciseTitle(exerciseTitle: string) {
-        this.getInstructionsRootElement().contains(exerciseTitle).should('be.visible');
-    }
-
-    showsProblemStatement(problemStatement: string) {
-        this.getInstructionsRootElement().contains(problemStatement).should('be.visible');
-    }
-
-    showsExampleSolution(exampleSolution: string) {
-        this.getInstructionsRootElement().contains(exampleSolution).should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionsPage.ts b/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionsPage.ts
deleted file mode 100644
index 33be82d683c5..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseExampleSubmissionsPage.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * A class which encapsulates UI selectors and actions for the text exercise example submissions page.
- */
-export class TextExerciseExampleSubmissionsPage {
-    clickCreateExampleSubmission() {
-        cy.get('#create-example-submission').click();
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseFeedbackPage.ts b/src/test/cypress/support/pageobjects/exercises/text/TextExerciseFeedbackPage.ts
deleted file mode 100644
index 2ebb6d738ee7..000000000000
--- a/src/test/cypress/support/pageobjects/exercises/text/TextExerciseFeedbackPage.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { AbstractExerciseFeedback } from '../AbstractExerciseFeedbackPage';
-
-/**
- * A class which encapsulates UI selectors and actions for a text exercise feedback page.
- */
-export class TextExerciseFeedbackPage extends AbstractExerciseFeedback {
-    shouldShowTextFeedback(feedbackIndex: number, feedback: string) {
-        cy.get('#text-feedback-' + feedbackIndex)
-            .contains(feedback)
-            .should('be.visible');
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/lecture/LectureCreationPage.ts b/src/test/cypress/support/pageobjects/lecture/LectureCreationPage.ts
deleted file mode 100644
index 7415fef89ade..000000000000
--- a/src/test/cypress/support/pageobjects/lecture/LectureCreationPage.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Dayjs } from 'dayjs/esm';
-
-import { BASE_API, POST } from '../../constants';
-
-export class LectureCreationPage {
-    setTitle(title: string) {
-        cy.get('#field_title').type(title);
-    }
-
-    save() {
-        cy.intercept(POST, `${BASE_API}/lectures`).as('createLecture');
-        cy.get('#save-entity').click();
-        return cy.wait('@createLecture');
-    }
-
-    typeDescription(description: string) {
-        cy.get('.ace_content').type(description, { parseSpecialCharSequences: false });
-    }
-
-    setVisibleDate(date: Dayjs) {
-        cy.get('#visible-date').find('#date-input-field').type(date.toString());
-    }
-
-    setStartDate(date: Dayjs) {
-        cy.get('#start-date').find('#date-input-field').type(date.toString());
-    }
-
-    setEndDate(date: Dayjs) {
-        cy.get('#end-date').find('#date-input-field').type(' ').clear().type(date.toString());
-    }
-}
diff --git a/src/test/cypress/support/pageobjects/lecture/LectureManagementPage.ts b/src/test/cypress/support/pageobjects/lecture/LectureManagementPage.ts
deleted file mode 100644
index 215e2122afbc..000000000000
--- a/src/test/cypress/support/pageobjects/lecture/LectureManagementPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Lecture } from 'app/entities/lecture.model';
-
-import { BASE_API, DELETE, POST } from '../../constants';
-
-export class LectureManagementPage {
-    clickCreateLecture() {
-        cy.get('#jh-create-entity').click();
-    }
-
-    deleteLecture(lecture: Lecture) {
-        this.getLecture(lecture.id!).find('#delete-lecture').click();
-        cy.get('#delete').should('be.disabled');
-        cy.get('#confirm-entity-name').type(lecture.title!);
-        cy.intercept(DELETE, `${BASE_API}/lectures/*`).as('deleteLecture');
-        cy.get('#delete').click();
-        return cy.wait('@deleteLecture');
-    }
-
-    getLectures() {
-        return cy.get('#lectures');
-    }
-
-    getLecture(lectureId: number) {
-        return cy.get(`#lecture-${lectureId}`);
-    }
-
-    getLectureContainer() {
-        return cy.get('#lecture-preview');
-    }
-
-    openUnitsPage(lectureId: number) {
-        this.getLecture(lectureId).find('#units').click();
-    }
-
-    openCreateUnit(type: UnitType) {
-        this.getUnitCreationCard().find(type).click();
-    }
-
-    getUnitCreationCard() {
-        return cy.get('#unit-creation');
-    }
-
-    addTextUnit(name: string, text: string, releaseDate = dayjs()) {
-        this.openCreateUnit(UnitType.TEXT);
-        cy.get('#name').type(name);
-        cy.get('#pick-releaseDate').find('#date-input-field').type(releaseDate.toString());
-        cy.get('.ace_content').type(text, { parseSpecialCharSequences: false });
-        return this.submitUnit();
-    }
-
-    addExerciseUnit(exerciseId: number) {
-        this.openCreateUnit(UnitType.EXERCISE);
-        const exerciseRow = '#exercise-' + exerciseId;
-        cy.reloadUntilFound(exerciseRow);
-        cy.get(exerciseRow).click();
-        return this.submitUnit('#createButton');
-    }
-
-    submitUnit(buttonId = '#submitButton') {
-        cy.intercept(POST, `${BASE_API}/lectures/*/*`).as('createUnit');
-        cy.get(buttonId).click();
-        return cy.wait('@createUnit');
-    }
-}
-
-enum UnitType {
-    TEXT = '#createTextUnitButton',
-    EXERCISE = '#createExerciseUnitButton',
-    VIDEO = '#createVideoUnitButton',
-    FILE = '#createFileUploadUnitButton',
-}
diff --git a/src/test/cypress/support/requests/ArtemisRequests.ts b/src/test/cypress/support/requests/ArtemisRequests.ts
deleted file mode 100644
index 6172cd6fc253..000000000000
--- a/src/test/cypress/support/requests/ArtemisRequests.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { CommunicationAPIRequests } from './CommunicationAPIRequests';
-import { CourseManagementAPIRequests } from './CourseManagementAPIRequests';
-import { ExamAPIRequests } from './ExamAPIRequests';
-import { ExerciseAPIRequests } from './ExerciseAPIRequests';
-import { UserManagementAPIRequests } from './UserManagementAPIRequest';
-
-/**
- * A class which encapsulates all cypress requests, which can be sent to Artemis.
- */
-export class ArtemisRequests {
-    communication = new CommunicationAPIRequests();
-    courseManagement = new CourseManagementAPIRequests();
-    exam = new ExamAPIRequests();
-    exercise = new ExerciseAPIRequests();
-    userManagement = new UserManagementAPIRequests();
-}
diff --git a/src/test/cypress/support/requests/CommunicationAPIRequests.ts b/src/test/cypress/support/requests/CommunicationAPIRequests.ts
deleted file mode 100644
index c405b574d7cf..000000000000
--- a/src/test/cypress/support/requests/CommunicationAPIRequests.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { Course } from 'app/entities/course.model';
-import { Exercise } from 'app/entities/exercise.model';
-import { Lecture } from 'app/entities/lecture.model';
-import { ChannelDTO, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
-import { GroupChat } from 'app/entities/metis/conversation/group-chat.model';
-import { Post } from 'app/entities/metis/post.model';
-
-import { COURSE_BASE, GET, POST, PUT } from '../constants';
-import { CypressCredentials } from '../users';
-import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
-import Chainable = Cypress.Chainable;
-
-/**
- * A class which encapsulates all API requests related to communications.
- */
-export class CommunicationAPIRequests {
-    /**
-     * Creates a new course post.
-     *
-     * @param course - The course to which the post belongs.
-     * @param content - The content of the post.
-     * @param channel - The channel the post belongs to
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCoursePost(course: Course, content: string, channel: ChannelDTO) {
-        const body = {
-            content,
-            course: {
-                id: course.id,
-                title: course.title,
-            },
-            conversation: {
-                id: channel.id,
-                type: channel.type,
-            },
-            displayPriority: 'NONE',
-            visibleForStudents: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/messages`, body });
-    }
-
-    /**
-     * Creates a new course message channel.
-     *
-     * @param course - The course to which the message channel belongs.
-     * @param name - The name of the message channel.
-     * @param description - The description of the message channel.
-     * @param isAnnouncementChannel - Set to true if the channel is an announcement channel.
-     * @param isPublic - Set to true if the channel is public.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseMessageChannel(course: Course, name: string, description: string, isAnnouncementChannel: boolean, isPublic: boolean) {
-        const body = {
-            description,
-            isAnnouncementChannel,
-            isPublic,
-            name,
-            type: 'channel',
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/channels`, body });
-    }
-
-    /**
-     * Get course-wide channels of a course
-     *
-     * @param courseId - The id of the course
-     * @returns A Cypress.Chainable<ChannelDTO[]> with the course-wide channels of the course
-     */
-    getCourseWideChannels(courseId: number): Chainable<ChannelDTO[]> {
-        return cy
-            .request({ method: GET, url: `${COURSE_BASE}/${courseId}/conversations` })
-            .then((response) => response.body.filter((conv: ConversationDTO) => getAsChannelDTO(conv)?.isCourseWide === true));
-    }
-
-    /**
-     * Retrieves the exercise channel for a given course and exercise.
-     *
-     * @param courseId - The ID of the course.
-     * @param exerciseId - The ID of the exercise.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    getExerciseChannel(courseId: number, exerciseId: number) {
-        return cy.request({ method: GET, url: `${COURSE_BASE}/${courseId}/exercises/${exerciseId}/channel` });
-    }
-
-    /**
-     * Retrieves the lecture channel for a given course and lecture.
-     *
-     * @param courseId - The ID of the course.
-     * @param lectureId - The ID of the lecture.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    getLectureChannel(courseId: number, exerciseId: number) {
-        return cy.request({ method: GET, url: `${COURSE_BASE}/${courseId}/lectures/${exerciseId}/channel` });
-    }
-
-    /**
-     * Creates a new course message group chat.
-     *
-     * @param course - The course to which the group chat belongs.
-     * @param users - An array of usernames of users to add to the group chat.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseMessageGroupChat(course: Course, users: Array<string>) {
-        const body = users;
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/group-chats`, body });
-    }
-
-    /**
-     * Creates a new course message.
-     *
-     * @param course - The course to which the message belongs.
-     * @param targetId - The ID of the conversation target (channel or group chat).
-     * @param type - The type of conversation target (e.g., 'channel' or 'groupChat').
-     * @param message - The content of the message.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseMessage(course: Course, targetId: number, type: string, message: string) {
-        const body = {
-            content: message,
-            conversation: {
-                id: targetId,
-                type,
-            },
-            displayPriority: 'NONE',
-            visibleForStudents: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/messages`, body });
-    }
-
-    /**
-     * Creates a new course message.
-     *
-     * @param course - The course to which the message belongs.
-     * @param targetId - The ID of the conversation target channel.
-     * @param message - The content of the message.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseWideMessage(course: Course, targetId: number, message: string) {
-        const body = {
-            content: message,
-            conversation: {
-                id: targetId,
-                type: 'channel',
-            },
-            displayPriority: 'NONE',
-            visibleForStudents: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/messages`, body });
-    }
-
-    /**
-     * Updates the name of a course message group chat.
-     *
-     * @param course - The course to which the group chat belongs.
-     * @param groupChat - The group chat to update.
-     * @param name - The new name of the group chat.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    updateCourseMessageGroupChatName(course: Course, groupChat: GroupChat, name: string) {
-        const body = {
-            name,
-            type: 'groupChat',
-        };
-        return cy.request({ method: PUT, url: `${COURSE_BASE}/${course.id}/group-chats/${groupChat.id}`, body });
-    }
-
-    /**
-     * Joins a user into a channel.
-     *
-     * @param course - The course to which the channel belongs.
-     * @param channelId - The id of the channel to join.
-     * @param user - The user's credentials.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    joinUserIntoChannel(course: Course, channelId: number, user: CypressCredentials) {
-        const body = [user.username];
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/channels/${channelId}/register`, body });
-    }
-
-    /**
-     * Creates a new course post reply.
-     *
-     * @param course - The course to which the post belongs.
-     * @param post - The post to which the reply is made.
-     * @param content - The content of the post reply.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseMessageReply(course: Course, post: Post, content: string) {
-        const body = {
-            content,
-            post,
-            resolvesPost: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/answer-messages`, body });
-    }
-
-    /**
-     * Creates a new course exercise post.
-     *
-     * @param course - The course to which the post belongs.
-     * @param exercise - The exercise to which the post is associated.
-     * @param title - The title of the post.
-     * @param content - The content of the post.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseExercisePost(course: Course, exercise: Exercise, title: string, content: string) {
-        const body = {
-            content,
-            displayPriority: 'NONE',
-            exercise: {
-                id: exercise.id,
-                title: exercise.title,
-                type: exercise.type,
-            },
-            tags: [],
-            title,
-            visibleForStudents: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${course.id}/posts`, body });
-    }
-
-    /**
-     * Creates a new course lecture post.
-     *
-     * @param course - The course to which the post belongs.
-     * @param lecture - The lecture to which the post is associated.
-     * @param title - The title of the post.
-     * @param content - The content of the post.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createCourseLecturePost(course: Course, lecture: Lecture, title: string, content: string) {
-        const body = {
-            content,
-            displayPriority: 'NONE',
-            lecture: {
-                id: lecture.id,
-                title: lecture.title,
-            },
-            tags: [],
-            title,
-            visibleForStudents: true,
-        };
-        return cy.request({ method: POST, url: `${COURSE_BASE}${course.id}/posts`, body });
-    }
-}
diff --git a/src/test/cypress/support/requests/CourseManagementAPIRequests.ts b/src/test/cypress/support/requests/CourseManagementAPIRequests.ts
deleted file mode 100644
index 60fc4002baed..000000000000
--- a/src/test/cypress/support/requests/CourseManagementAPIRequests.ts
+++ /dev/null
@@ -1,181 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model';
-
-import lectureTemplate from '../../fixtures/lecture/template.json';
-import { BASE_API, COURSE_ADMIN_BASE, COURSE_BASE, DELETE, POST } from '../constants';
-import { CypressCredentials } from '../users';
-import { generateUUID, titleLowercase } from '../utils';
-
-/**
- * A class which encapsulates all API requests related to course management.
- */
-export class CourseManagementAPIRequests {
-    /**
-     * Creates a course with the specified title and short name.
-     * @param options An object containing the options for creating the course
-     *   - customizeGroups: whether the predefined groups should be used (so we don't have to wait more than a minute between course and programming exercise creation)
-     *   - courseName: the title of the course (will generate default name if not provided)
-     *   - courseShortName: the short name (will generate default name if not provided)
-     *   - start: the start date of the course (default: now() - 2 hours)
-     *   - end: the end date of the course (default: now() + 2 hours)
-     *   - iconFileName: the course icon file name (default: undefined)
-     *   - iconFile: the course icon file blob (default: undefined)
-     *   - allowCommunication: if communication should be enabled for the course
-     *   - allowMessaging: if messaging should be enabled for the course
-     * @returns <Chainable> request response
-     */
-    createCourse(
-        options: {
-            customizeGroups?: boolean;
-            courseName?: string;
-            courseShortName?: string;
-            start?: dayjs.Dayjs;
-            end?: dayjs.Dayjs;
-            iconFileName?: string;
-            iconFile?: Blob;
-            allowCommunication?: boolean;
-            allowMessaging?: boolean;
-        } = {},
-    ): Cypress.Chainable<Cypress.Response<Course>> {
-        const {
-            customizeGroups = false,
-            courseName = 'Course ' + generateUUID(),
-            courseShortName = 'cypress' + generateUUID(),
-            start = dayjs().subtract(2, 'hours'),
-            end = dayjs().add(2, 'hours'),
-            iconFileName,
-            iconFile,
-            allowCommunication = true,
-            allowMessaging = true,
-        } = options;
-
-        const course = new Course();
-        course.title = courseName;
-        course.shortName = courseShortName;
-        course.testCourse = true;
-        course.startDate = start;
-        course.endDate = end;
-
-        if (allowCommunication && allowMessaging) {
-            course.courseInformationSharingConfiguration = CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING;
-            course.courseInformationSharingMessagingCodeOfConduct = 'Code of Conduct';
-        } else if (allowCommunication) {
-            course.courseInformationSharingConfiguration = CourseInformationSharingConfiguration.COMMUNICATION_ONLY;
-        } else {
-            course.courseInformationSharingConfiguration = CourseInformationSharingConfiguration.DISABLED;
-        }
-
-        const allowGroupCustomization: boolean = Cypress.env('allowGroupCustomization');
-        if (customizeGroups && allowGroupCustomization) {
-            course.studentGroupName = Cypress.env('studentGroupName');
-            course.teachingAssistantGroupName = Cypress.env('tutorGroupName');
-            course.editorGroupName = Cypress.env('editorGroupName');
-            course.instructorGroupName = Cypress.env('instructorGroupName');
-        }
-
-        const formData = new FormData();
-        formData.append('course', new File([JSON.stringify(course)], 'course', { type: 'application/json' }));
-
-        if (iconFile) {
-            formData.append('file', iconFile, iconFileName);
-        }
-
-        return cy.request({
-            url: COURSE_ADMIN_BASE,
-            method: POST,
-            body: formData,
-        });
-    }
-
-    /**
-     * Deletes the course with the specified id.
-     *
-     * @param course the course
-     * @param admin the admin user
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteCourse(course: Course, admin: CypressCredentials) {
-        if (course) {
-            cy.login(admin);
-            // Sometimes the server fails with a ConstraintViolationError if we delete the course immediately after a login
-            cy.wait(500);
-            return cy.request({ method: DELETE, url: `${COURSE_ADMIN_BASE}/${course.id}`, retryOnStatusCodeFailure: true });
-        }
-    }
-
-    /**
-     * Adds the specified student to the course.
-     *
-     * @param course - The course to which the student will be added.
-     * @param user - The user (student) to be added to the course.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    addStudentToCourse(course: Course, user: CypressCredentials) {
-        return this.addUserToCourse(course.id!, user.username, 'students');
-    }
-
-    /**
-     * Adds the specified user to the tutor group in the course.
-     *
-     * @param course - The course to which the tutor will be added.
-     * @param user - The user (tutor) to be added to the course.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    addTutorToCourse(course: Course, user: CypressCredentials) {
-        return this.addUserToCourse(course.id!, user.username, 'tutors');
-    }
-
-    /**
-     * Adds the specified user to the instructor group in the course.
-     *
-     * @param course - The course to which the instructor will be added.
-     * @param user - The user (instructor) to be added to the course.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    addInstructorToCourse(course: Course, user: CypressCredentials) {
-        return this.addUserToCourse(course.id!, user.username, 'instructors');
-    }
-
-    private addUserToCourse(courseId: number, username: string, roleIdentifier: string) {
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${courseId}/${roleIdentifier}/${username}` });
-    }
-
-    /**
-     * Deletes a lecture with the specified lecture ID.
-     *
-     * @param lectureId - The ID of the lecture to be deleted.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteLecture(lectureId: number) {
-        return cy.request({
-            url: `${BASE_API}/lectures/${lectureId}`,
-            method: DELETE,
-        });
-    }
-
-    /**
-     * Creates a new lecture for the specified course with various options.
-     *
-     * @param course - The course to which the lecture belongs.
-     * @param title - The title of the lecture (optional, default: auto-generated).
-     * @param startDate - The start date and time of the lecture (optional, default: current date and time).
-     * @param endDate - The end date and time of the lecture (optional, default: current date and time + 10 minutes).
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createLecture(course: Course, title = 'Lecture ' + generateUUID(), startDate = dayjs(), endDate = dayjs().add(10, 'minutes')) {
-        const body = {
-            ...lectureTemplate,
-            course,
-            title,
-            startDate,
-            endDate,
-            channelName: 'lecture-' + titleLowercase(title),
-        };
-        return cy.request({
-            url: `${BASE_API}/lectures`,
-            method: POST,
-            body,
-        });
-    }
-}
diff --git a/src/test/cypress/support/requests/ExamAPIRequests.ts b/src/test/cypress/support/requests/ExamAPIRequests.ts
deleted file mode 100644
index 86c92cbbc762..000000000000
--- a/src/test/cypress/support/requests/ExamAPIRequests.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import examTemplate from '../../fixtures/exam/template.json';
-import { COURSE_BASE, DELETE, Exercise, POST } from '../constants';
-import { CypressCredentials } from '../users';
-import { dayjsToString, generateUUID, titleLowercase } from '../utils';
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import dayjs from 'dayjs/esm';
-
-/**
- * A class which encapsulates all API requests related to exams.
- */
-export class ExamAPIRequests {
-    /**
-     * Creates an exam for the specified course with various options.
-     * @param options - An object containing the options for creating the exam.
-     *   - course: The course to which the exam belongs (optional, default: undefined).
-     *   - title: The title of the exam (optional, default: auto-generated).
-     *   - testExam: Set to true to create a test exam (optional, default: false).
-     *   - visibleDate: The date when the exam becomes visible (optional, default: current date).
-     *   - startDate: The start date of the exam (optional, default: current date + 1 day).
-     *   - endDate: The end date of the exam (optional, default: current date + 2 days).
-     *   - examMaxPoints: The maximum points achievable in the exam (optional, default: undefined).
-     *   - numberOfExercisesInExam: The number of exercises in the exam (optional, default: undefined).
-     *   - numberOfCorrectionRoundsInExam: The number of correction rounds for the exam (optional, default: undefined).
-     *   - workingTime: The allowed working time for the exam in seconds (optional, default: 86400 seconds or 1 day).
-     *   - examStudentReviewStart: The date when students can start reviewing their exam (optional, default: undefined).
-     *   - examStudentReviewEnd: The date when students can no longer review their exam (optional, default: undefined).
-     *   - publishResultsDate: The date when exam results will be published (optional, default: undefined).
-     *   - gracePeriod: The grace period in seconds for late submissions (optional, default: undefined).
-     *   - channelName: The channel name for the exam (optional, default: auto-generated based on title).
-     * @returns A Cypress.Chainable<Cypress.Response<Exam>> representing the API request response.
-     */
-    createExam(options: {
-        course?: Course;
-        title?: string;
-        testExam?: boolean;
-        visibleDate?: dayjs.Dayjs;
-        startDate?: dayjs.Dayjs;
-        endDate?: dayjs.Dayjs;
-        examMaxPoints?: number;
-        numberOfExercisesInExam?: number;
-        numberOfCorrectionRoundsInExam?: number;
-        workingTime?: number;
-        examStudentReviewStart?: dayjs.Dayjs;
-        examStudentReviewEnd?: dayjs.Dayjs;
-        publishResultsDate?: dayjs.Dayjs;
-        gracePeriod?: number;
-        channelName?: string;
-    }): Cypress.Chainable<Cypress.Response<Exam>> {
-        const tempTitle = 'exam' + generateUUID();
-
-        const {
-            course,
-            title = tempTitle,
-            testExam = false,
-            visibleDate = dayjsToString(dayjs().subtract(1, 'day')),
-            startDate = dayjsToString(dayjs().add(1, 'day')),
-            endDate = dayjsToString(dayjs().add(2, 'day')),
-            examMaxPoints = 10,
-            numberOfExercisesInExam = 1,
-            numberOfCorrectionRoundsInExam = 1,
-            workingTime = 86400,
-            examStudentReviewStart = null,
-            examStudentReviewEnd = null,
-            publishResultsDate = null,
-            gracePeriod = 30,
-        } = options;
-
-        const exam = {
-            ...examTemplate,
-            course,
-            title,
-            testExam,
-            visibleDate,
-            startDate,
-            endDate,
-            examMaxPoints,
-            numberOfExercisesInExam,
-            numberOfCorrectionRoundsInExam,
-            workingTime,
-            examStudentReviewStart,
-            examStudentReviewEnd,
-            publishResultsDate,
-            gracePeriod,
-            channelName: titleLowercase(title),
-        } as Exam;
-
-        if (testExam) {
-            exam.numberOfCorrectionRoundsInExam = 0;
-        }
-
-        return cy.request({
-            url: `${COURSE_BASE}/${exam.course!.id}/exams`,
-            method: POST,
-            body: exam,
-        });
-    }
-
-    /**
-     * Deletes the exam with the given parameters
-     * @param exam the exam object
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     * */
-    deleteExam(exam: Exam) {
-        return cy.request({ method: DELETE, url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}` });
-    }
-
-    /**
-     * Register the student for the exam
-     * @param exam the exam object
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    registerStudentForExam(exam: Exam, student: CypressCredentials) {
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/students/${student.username}` });
-    }
-
-    /**
-     * Creates an exam with the provided settings.
-     * @param exam the exam object
-     * @param exerciseArray an array of exercises
-     * @param workingTime the working time in seconds
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createExamTestRun(exam: Exam, exerciseArray: Array<Exercise>, workingTime = 1080) {
-        const courseId = exam.course!.id;
-        const examId = exam.id!;
-        const body = {
-            exam,
-            exerciseArray,
-            workingTime,
-        };
-        return cy.request({ url: `${COURSE_BASE}/${courseId}/exams/${examId}/test-run`, method: POST, body });
-    }
-
-    /**
-     * Add exercise group to exam
-     * @param exam the exam to which the group is added
-     * @param title the title of the group
-     * @param mandatory if the exercise group is mandatory
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     * */
-    addExerciseGroupForExam(exam: Exam, title = 'Group ' + generateUUID(), mandatory = true) {
-        const exerciseGroup = new ExerciseGroup();
-        exerciseGroup.exam = exam;
-        exerciseGroup.title = title;
-        exerciseGroup.isMandatory = mandatory;
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/exerciseGroups`, body: exerciseGroup });
-    }
-
-    /**
-     * Generate all missing individual exams
-     * @param exam the exam for which the missing exams are generated
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    generateMissingIndividualExams(exam: Exam) {
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/generate-missing-student-exams` });
-    }
-
-    /**
-     * Prepares individual exercises for exam start
-     * @param exam the exam for which the exercises are prepared
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    prepareExerciseStartForExam(exam: Exam) {
-        return cy.request({ method: POST, url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/student-exams/start-exercises` });
-    }
-}
diff --git a/src/test/cypress/support/requests/ExerciseAPIRequests.ts b/src/test/cypress/support/requests/ExerciseAPIRequests.ts
deleted file mode 100644
index eb1fc38eeec9..000000000000
--- a/src/test/cypress/support/requests/ExerciseAPIRequests.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-import dayjs from 'dayjs/esm';
-
-import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { Exercise } from 'app/entities/exercise.model';
-import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { Participation } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-
-import fileUploadExerciseTemplate from '../../fixtures/exercise/file-upload/template.json';
-import modelingExerciseSubmissionTemplate from '../../fixtures/exercise/modeling/submission.json';
-import modelingExerciseTemplate from '../../fixtures/exercise/modeling/template.json';
-import cProgrammingExerciseTemplate from '../../fixtures/exercise/programming/c/template.json';
-import javaAssessmentSubmission from '../../fixtures/exercise/programming/java/assessment/submission.json';
-import javaProgrammingExerciseTemplate from '../../fixtures/exercise/programming/java/template.json';
-import pythonProgrammingExerciseTemplate from '../../fixtures/exercise/programming/python/template.json';
-import multipleChoiceSubmissionTemplate from '../../fixtures/exercise/quiz/multiple_choice/submission.json';
-import shortAnswerSubmissionTemplate from '../../fixtures/exercise/quiz/short_answer/submission.json';
-import quizTemplate from '../../fixtures/exercise/quiz/template.json';
-import textExerciseTemplate from '../../fixtures/exercise/text/template.json';
-import {
-    BASE_API,
-    COURSE_BASE,
-    DELETE,
-    EXERCISE_BASE,
-    ExerciseType,
-    GET,
-    MODELING_EXERCISE_BASE,
-    PATCH,
-    POST,
-    PROGRAMMING_EXERCISE_BASE,
-    PUT,
-    ProgrammingExerciseAssessmentType,
-    ProgrammingLanguage,
-    QUIZ_EXERCISE_BASE,
-    TEXT_EXERCISE_BASE,
-    UPLOAD_EXERCISE_BASE,
-} from '../constants';
-import { dayjsToString, generateUUID, titleLowercase } from '../utils';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-
-type PatchProgrammingExerciseTestVisibilityDto = {
-    id: number;
-    weight: number;
-    bonusPoints: number;
-    bonusMultiplier: number;
-    visibility: Visibility;
-}[];
-
-const MAX_RETRIES: number = 10;
-const RETRY_DELAY: number = 3000;
-
-/**
- * A class which encapsulates all API requests related to exercises.
- */
-export class ExerciseAPIRequests {
-    /**
-     * Creates a programming exercise with the specified title and other data
-     * @param options An object containing the options for creating the programming exercise
-     *   - course: The course the exercise will be added to
-     *   - exerciseGroup: The exercise group the exercise will be added to
-     *   - scaMaxPenalty: The max percentage (0-100) static code analysis can reduce from the points
-     *                    If sca should be disabled, pass null or omit this property
-     *   - recordTestwiseCoverage: Enable testwise coverage analysis for this exercise
-     *   - releaseDate: When the programming exercise should be available
-     *   - dueDate: When the programming exercise should be due
-     *   - title: The title of the programming exercise
-     *   - programmingShortName: The short name of the programming exercise
-     *   - programmingLanguage: The programming language for the exercise
-     *   - packageName: The package name of the programming exercise
-     *   - assessmentDate: The due date of the assessment
-     *   - assessmentType: The assessment type of the exercise
-     * @returns <Chainable> request response
-     */
-    createProgrammingExercise(options: {
-        course?: Course;
-        exerciseGroup?: ExerciseGroup;
-        scaMaxPenalty?: number | null;
-        recordTestwiseCoverage?: boolean;
-        releaseDate?: dayjs.Dayjs;
-        dueDate?: dayjs.Dayjs;
-        title?: string;
-        programmingShortName?: string;
-        programmingLanguage?: ProgrammingLanguage;
-        packageName?: string;
-        assessmentDate?: dayjs.Dayjs;
-        assessmentType?: ProgrammingExerciseAssessmentType;
-    }): Cypress.Chainable<Cypress.Response<ProgrammingExercise>> {
-        const {
-            course,
-            exerciseGroup,
-            scaMaxPenalty = null,
-            recordTestwiseCoverage = false,
-            releaseDate = dayjs(),
-            dueDate = dayjs().add(1, 'day'),
-            title = 'Programming ' + generateUUID(),
-            programmingShortName = 'programming' + generateUUID(),
-            programmingLanguage = ProgrammingLanguage.JAVA,
-            packageName = 'de.test',
-            assessmentDate = dayjs().add(2, 'days'),
-            assessmentType = ProgrammingExerciseAssessmentType.AUTOMATIC,
-        } = options;
-
-        let programmingExerciseTemplate = {};
-
-        if (programmingLanguage == ProgrammingLanguage.PYTHON) {
-            programmingExerciseTemplate = pythonProgrammingExerciseTemplate;
-        } else if (programmingLanguage == ProgrammingLanguage.C) {
-            programmingExerciseTemplate = cProgrammingExerciseTemplate;
-        } else if (programmingLanguage == ProgrammingLanguage.JAVA) {
-            programmingExerciseTemplate = javaProgrammingExerciseTemplate;
-        }
-
-        const exercise = {
-            ...programmingExerciseTemplate,
-            title,
-            shortName: programmingShortName,
-            packageName,
-            channelName: 'exercise-' + titleLowercase(title),
-            assessmentType: ProgrammingExerciseAssessmentType[assessmentType],
-            ...(course ? { course } : {}),
-            ...(exerciseGroup ? { exerciseGroup } : {}),
-        } as ProgrammingExercise;
-
-        if (!exerciseGroup) {
-            exercise.releaseDate = releaseDate;
-            exercise.dueDate = dueDate;
-            exercise.assessmentDueDate = assessmentDate;
-        }
-
-        if (scaMaxPenalty) {
-            exercise.staticCodeAnalysisEnabled = true;
-            exercise.maxStaticCodeAnalysisPenalty = scaMaxPenalty;
-        }
-
-        exercise.programmingLanguage = programmingLanguage;
-        exercise.testwiseCoverageEnabled = recordTestwiseCoverage;
-
-        return cy.request({
-            url: `${PROGRAMMING_EXERCISE_BASE}/setup`,
-            method: POST,
-            body: exercise,
-        });
-    }
-
-    /**
-     * Retrieves the test cases for passed exercise and adjusts their visibility according.
-     * <br>
-     * Note: test cases are not available before the tests of the solution have completely run through
-     *       -> we need to do retries until the tests have been executed
-     *
-     * @param programmingExercise for which the test cases shall be set to {@link newVisibility}
-     * @param newVisibility that is applied for all found test cases
-     * @param retryNumber
-     */
-    changeProgrammingExerciseTestVisibility(programmingExercise: ProgrammingExercise, newVisibility: Visibility, retryNumber: number) {
-        if (retryNumber >= MAX_RETRIES) {
-            throw new Error('Could not find test cases (tests for solution might not be finished yet)');
-        }
-
-        cy.request({
-            url: `${PROGRAMMING_EXERCISE_BASE}/${programmingExercise.id}/test-cases`,
-            method: GET,
-        }).then((response) => {
-            const testCases = response.body as ProgrammingExerciseTestCase[];
-
-            if (retryNumber > 0) {
-                cy.log(`Could not find test cases yet, retrying... (${retryNumber} / ${MAX_RETRIES})`);
-            }
-
-            cy.wait(RETRY_DELAY);
-
-            if (testCases.length > 0) {
-                this.updateProgrammingExerciseTestCaseVisibility(programmingExercise.id!, testCases, newVisibility);
-            } else {
-                this.changeProgrammingExerciseTestVisibility(programmingExercise, newVisibility, retryNumber + 1);
-            }
-        });
-    }
-
-    /**
-     * Submits the example submission to the specified repository.
-     *
-     * @param repositoryId - The repository ID. The repository ID is equal to the participation ID.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    makeProgrammingExerciseSubmission(repositoryId: number) {
-        // TODO: For now it is enough to submit the one prepared json file, but in the future this method should support different package names and submissions.
-        return cy.request({
-            url: `${BASE_API}/repository/${repositoryId}/files?commit=yes`,
-            method: PUT,
-            body: javaAssessmentSubmission,
-        });
-    }
-
-    /**
-     * Adds a text exercise to an exercise group in an exam or to a course.
-     *
-     * @param body - An object containing either the course or exercise group the exercise will be added to.
-     * @param title - The title for the text exercise (optional, default: auto-generated).
-     * @returns A Cypress.Chainable<Cypress.Response<TextExercise>> representing the API request response.
-     */
-    createTextExercise(body: { course: Course } | { exerciseGroup: ExerciseGroup }, title = 'Text ' + generateUUID()): Cypress.Chainable<Cypress.Response<TextExercise>> {
-        const template = {
-            ...textExerciseTemplate,
-            title,
-            channelName: 'exercise-' + titleLowercase(title),
-        };
-        const textExercise = Object.assign({}, template, body);
-        return cy.request({ method: POST, url: TEXT_EXERCISE_BASE, body: textExercise });
-    }
-
-    /**
-     * Deletes a text exercise with the specified exercise ID.
-     *
-     * @param exerciseId - The ID of the text exercise to be deleted.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteTextExercise(exerciseId: number) {
-        return cy.request({
-            url: `${TEXT_EXERCISE_BASE}/${exerciseId}`,
-            method: DELETE,
-        });
-    }
-
-    /**
-     * Makes a text exercise submission for the specified exercise ID with the given text content.
-     *
-     * @param exerciseId - The ID of the text exercise for which the submission is made.
-     * @param text - The text content of the submission.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    makeTextExerciseSubmission(exerciseId: number, text: string) {
-        return cy.request({
-            url: `${EXERCISE_BASE}/${exerciseId}/text-submissions`,
-            method: PUT,
-            body: { submissionExerciseType: 'text', text },
-        });
-    }
-
-    /**
-     * Creates a file upload exercise.
-     *
-     * @param body - An object containing either the course or exercise group the exercise will be added to.
-     * @param title - The title for the exercise (optional, default: auto-generated).
-     * @returns A Cypress.Chainable<Cypress.Response<FileUploadExercise>> representing the API request response.
-     */
-    createFileUploadExercise(
-        body: { course: Course } | { exerciseGroup: ExerciseGroup },
-        title = 'Upload ' + generateUUID(),
-    ): Cypress.Chainable<Cypress.Response<FileUploadExercise>> {
-        const template = {
-            ...fileUploadExerciseTemplate,
-            title,
-            channelName: 'exercise-' + titleLowercase(title),
-        };
-        const uploadExercise = Object.assign({}, template, body);
-        return cy.request({ method: POST, url: UPLOAD_EXERCISE_BASE, body: uploadExercise });
-    }
-
-    /**
-     * Deletes a file upload exercise with the specified exercise ID.
-     *
-     * @param exerciseID - The ID of the file upload exercise to be deleted.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteFileUploadExercise(exerciseID: number) {
-        return cy.request({
-            url: `${UPLOAD_EXERCISE_BASE}/${exerciseID}`,
-            method: DELETE,
-        });
-    }
-
-    /**
-     * Makes a file upload exercise submission for the specified exercise ID with the given file.
-     *
-     * @param exerciseId - The ID of the file upload exercise for which the submission is made.
-     * @param file - The file content of the submission.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    makeFileUploadExerciseSubmission(exerciseId: number, file: string) {
-        return cy.request({
-            url: `${EXERCISE_BASE}/${exerciseId}/file-upload-submissions`,
-            method: POST,
-            body: { submissionExerciseType: 'file-upload', file },
-        });
-    }
-
-    /**
-     * Creates a modeling exercise.
-     *
-     * @param body - An object containing either the course or exercise group the exercise will be added to.
-     * @param title - The title for the exercise (optional, default: auto-generated).
-     * @param releaseDate - The release date of the exercise (optional, default: current date).
-     * @param dueDate - The due date of the exercise (optional, default: current date + 1 day).
-     * @param assessmentDueDate - The assessment due date of the exercise (optional, default: current date + 2 days).
-     * @returns A Cypress.Chainable<Cypress.Response<ModelingExercise>> representing the API request response.
-     */
-    createModelingExercise(
-        body: { course: Course } | { exerciseGroup: ExerciseGroup },
-        title = 'Modeling ' + generateUUID(),
-        releaseDate = dayjs(),
-        dueDate = dayjs().add(1, 'days'),
-        assessmentDueDate = dayjs().add(2, 'days'),
-    ): Cypress.Chainable<Cypress.Response<ModelingExercise>> {
-        const templateCopy = {
-            ...modelingExerciseTemplate,
-            title,
-            channelName: 'exercise-' + titleLowercase(title),
-        };
-        const dates = {
-            releaseDate: dayjsToString(releaseDate),
-            dueDate: dayjsToString(dueDate),
-            assessmentDueDate: dayjsToString(assessmentDueDate),
-        };
-        let newModelingExercise;
-        if (body.hasOwnProperty('course')) {
-            newModelingExercise = Object.assign({}, templateCopy, dates, body);
-        } else {
-            newModelingExercise = Object.assign({}, templateCopy, body);
-        }
-        return cy.request({
-            url: MODELING_EXERCISE_BASE,
-            method: POST,
-            body: newModelingExercise,
-        });
-    }
-
-    /**
-     * Updates the assessment due date of a modeling exercise.
-     *
-     * @param exercise - The modeling exercise to update.
-     * @param due - The new assessment due date (optional, default: current date).
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    updateModelingExerciseAssessmentDueDate(exercise: ModelingExercise, due = dayjs()) {
-        exercise.assessmentDueDate = due;
-        return this.updateExercise(exercise, ExerciseType.MODELING);
-    }
-
-    /**
-     * Deletes a modeling exercise with the specified exercise ID.
-     *
-     * @param exerciseID - The ID of the modeling exercise to be deleted.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteModelingExercise(exerciseID: number) {
-        return cy.request({
-            url: `${MODELING_EXERCISE_BASE}/${exerciseID}`,
-            method: DELETE,
-        });
-    }
-
-    /**
-     * Makes a modeling exercise submission for the specified exercise ID and participation.
-     *
-     * @param exerciseID - The ID of the modeling exercise for which the submission is made.
-     * @param participation - The participation data for the submission.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    makeModelingExerciseSubmission(exerciseID: number, participation: Participation) {
-        return cy.request({
-            url: `${EXERCISE_BASE}/${exerciseID}/modeling-submissions`,
-            method: PUT,
-            body: {
-                ...modelingExerciseSubmissionTemplate,
-                id: participation.submissions![0].id,
-                participation,
-            },
-        });
-    }
-
-    /**
-     * Updates the due date of a modeling exercise.
-     *
-     * @param exercise - The modeling exercise to update.
-     * @param due - The new due date (optional, default: current date).
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    updateModelingExerciseDueDate(exercise: ModelingExercise, due = dayjs()) {
-        exercise.dueDate = due;
-        return this.updateExercise(exercise, ExerciseType.MODELING);
-    }
-
-    /**
-     * Creates a quiz exercise.
-     *
-     * @param body - An object containing either the course or exercise group the exercise will be added to.
-     * @param quizQuestions - A list of quiz question objects that make up the quiz (e.g., multiple choice, short answer, or drag and drop).
-     * @param title - The title for the quiz exercise (optional, default: auto-generated).
-     * @param releaseDate - The release date of the quiz exercise (optional, default: current date + 1 year).
-     * @param duration - The duration in seconds that students get to complete the quiz (optional, default: 600 seconds).
-     * @returns A Cypress.Chainable<Cypress.Response<QuizExercise>> representing the API request response.
-     */
-    createQuizExercise(
-        body: { course: Course } | { exerciseGroup: ExerciseGroup },
-        quizQuestions: [any],
-        title = 'Quiz ' + generateUUID(),
-        releaseDate = dayjs().add(1, 'year'),
-        duration = 600,
-    ): Cypress.Chainable<Cypress.Response<QuizExercise>> {
-        const quizExercise: any = {
-            ...quizTemplate,
-            title,
-            quizQuestions,
-            duration,
-            channelName: 'exercise-' + titleLowercase(title),
-        };
-        let newQuizExercise;
-        const dates = {
-            releaseDate: dayjsToString(releaseDate),
-        };
-        if (body.hasOwnProperty('course')) {
-            newQuizExercise = Object.assign({}, quizExercise, dates, body);
-        } else {
-            newQuizExercise = Object.assign({}, quizExercise, body);
-        }
-
-        const formData = new FormData();
-        formData.append('exercise', new File([JSON.stringify(newQuizExercise)], 'exercise', { type: 'application/json' }));
-
-        return cy.request({
-            url: QUIZ_EXERCISE_BASE,
-            method: POST,
-            body: formData,
-        });
-    }
-
-    /**
-     * Deletes a quiz exercise with the specified exercise ID.
-     *
-     * @param exerciseId - The ID of the quiz exercise to be deleted.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    deleteQuizExercise(exerciseId: number) {
-        return cy.request({
-            url: `${QUIZ_EXERCISE_BASE}/${exerciseId}`,
-            method: DELETE,
-        });
-    }
-
-    /**
-     * Sets a quiz exercise as visible.
-     *
-     * @param quizId - The ID of the quiz exercise to be set as visible.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    setQuizVisible(quizId: number) {
-        return cy.request({
-            url: `${QUIZ_EXERCISE_BASE}/${quizId}/set-visible`,
-            method: PUT,
-        });
-    }
-
-    /**
-     * Starts a quiz exercise immediately.
-     *
-     * @param quizId - The ID of the quiz exercise to be started immediately.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    startQuizNow(quizId: number) {
-        return cy.request({
-            url: `${QUIZ_EXERCISE_BASE}/${quizId}/start-now`,
-            method: PUT,
-        });
-    }
-
-    /**
-     * Evaluates the quiz exercises in an exam.
-     *
-     * @param exam - The exam for which to evaluate the quiz exercises.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    evaluateExamQuizzes(exam: Exam) {
-        return cy.request({
-            url: `${COURSE_BASE}/${exam.course!.id}/exams/${exam.id}/student-exams/evaluate-quiz-exercises`,
-            method: POST,
-        });
-    }
-
-    /**
-     * Creates a submission for a quiz with only one multiple-choice quiz question.
-     *
-     * @param quizExercise - The response body of a quiz exercise.
-     * @param tickOptions - A list describing which of the 0..n boxes are to be ticked in the submission.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createMultipleChoiceSubmission(quizExercise: any, tickOptions: number[]) {
-        const submittedAnswers = [
-            {
-                ...multipleChoiceSubmissionTemplate.submittedAnswers[0],
-                quizQuestion: quizExercise.quizQuestions![0],
-                selectedOptions: tickOptions.map((option) => quizExercise.quizQuestions[0].answerOptions[option]),
-            },
-        ];
-        const multipleChoiceSubmission = {
-            ...multipleChoiceSubmissionTemplate,
-            submittedAnswers,
-        };
-        return cy.request({
-            url: `${EXERCISE_BASE}/${quizExercise.id}/submissions/live`,
-            method: POST,
-            body: multipleChoiceSubmission,
-        });
-    }
-
-    /**
-     * Creates a submission for a quiz with only one short-answer quiz question.
-     *
-     * @param quizExercise - The response body of the quiz exercise.
-     * @param textAnswers - A list containing the answers to be filled into the gaps. In numerical order.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    createShortAnswerSubmission(quizExercise: any, textAnswers: string[]) {
-        const submittedTexts = textAnswers.map((answer, index) => {
-            return {
-                text: answer,
-                spot: {
-                    id: quizExercise.quizQuestions[0].spots[index].id,
-                    spotNr: quizExercise.quizQuestions[0].spots[index].spotNr,
-                    width: quizExercise.quizQuestions[0].spots[index].width,
-                    invalid: quizExercise.quizQuestions[0].spots[index].invalid,
-                },
-            };
-        });
-        const submittedAnswers = [
-            {
-                ...shortAnswerSubmissionTemplate.submittedAnswers[0],
-                quizQuestion: quizExercise.quizQuestions[0],
-                submittedTexts,
-            },
-        ];
-        const shortAnswerSubmission = {
-            ...shortAnswerSubmissionTemplate,
-            submittedAnswers,
-        };
-        return cy.request({
-            url: `${EXERCISE_BASE}/${quizExercise.id}/submissions/live`,
-            method: POST,
-            body: shortAnswerSubmission,
-        });
-    }
-
-    /**
-     * Gets the participation data for an exercise with the specified exercise ID.
-     *
-     * @param exerciseId - The ID of the exercise for which to retrieve the participation data.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    getExerciseParticipation(exerciseId: number) {
-        return cy.request({
-            url: `${EXERCISE_BASE}/${exerciseId}/participation`,
-            method: GET,
-        });
-    }
-
-    /**
-     * Starts a participation for an exercise with the specified exercise ID.
-     *
-     * @param exerciseId - The ID of the exercise for which to start the participation.
-     * @returns A Cypress.Chainable<Cypress.Response<any>> representing the API request response.
-     */
-    startExerciseParticipation(exerciseId: number) {
-        return cy.request({
-            url: `${EXERCISE_BASE}/${exerciseId}/participations`,
-            method: POST,
-        });
-    }
-
-    private updateProgrammingExerciseTestCaseVisibility(programmingExerciseId: number, programmingExerciseTestCases: ProgrammingExerciseTestCase[], newVisibility: Visibility) {
-        const updatedTestCaseSettings: PatchProgrammingExerciseTestVisibilityDto = [];
-
-        for (const testCase of programmingExerciseTestCases) {
-            updatedTestCaseSettings.push({
-                id: testCase.id!,
-                weight: testCase.weight!,
-                bonusPoints: testCase.bonusPoints!,
-                bonusMultiplier: testCase.bonusMultiplier!,
-                visibility: newVisibility,
-            });
-        }
-
-        return cy.request({
-            url: `${PROGRAMMING_EXERCISE_BASE}/${programmingExerciseId}/update-test-cases`,
-            method: PATCH,
-            body: updatedTestCaseSettings,
-        });
-    }
-
-    private updateExercise(exercise: Exercise, type: ExerciseType) {
-        let url: string;
-        switch (type) {
-            case ExerciseType.PROGRAMMING:
-                url = PROGRAMMING_EXERCISE_BASE;
-                break;
-            case ExerciseType.TEXT:
-                url = TEXT_EXERCISE_BASE;
-                break;
-            case ExerciseType.MODELING:
-                url = MODELING_EXERCISE_BASE;
-                break;
-            case ExerciseType.QUIZ:
-            default:
-                throw new Error(`Exercise type '${type}' is not supported yet!`);
-        }
-        return cy.request({
-            url,
-            method: PUT,
-            body: exercise,
-        });
-    }
-}
diff --git a/src/test/cypress/support/requests/UserManagementAPIRequest.ts b/src/test/cypress/support/requests/UserManagementAPIRequest.ts
deleted file mode 100644
index a3f224f5d5f0..000000000000
--- a/src/test/cypress/support/requests/UserManagementAPIRequest.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { BASE_API, GET, POST } from '../constants';
-import { UserRole } from '../users';
-
-/**
- * A class which encapsulates all API requests related to user management.
- */
-export class UserManagementAPIRequests {
-    /**
-     * Creates a new user
-     * @param username the username of the new user
-     * @param password the password of the new user
-     * @param role the role of the new user
-     */
-    createUser(username: string, password: string, role: UserRole) {
-        const user = {
-            login: username,
-            password,
-            firstName: username,
-            lastName: username,
-            email: username + '@example.com',
-            authorities: [role],
-        };
-        return cy.request({
-            url: `${BASE_API}/admin/users`,
-            method: POST,
-            body: user,
-        });
-    }
-
-    getUser(username: string) {
-        return cy.request({
-            url: `${BASE_API}/admin/users/${username}`,
-            method: GET,
-            failOnStatusCode: false,
-        });
-    }
-}
diff --git a/src/test/cypress/support/users.ts b/src/test/cypress/support/users.ts
deleted file mode 100644
index 94d89a08140c..000000000000
--- a/src/test/cypress/support/users.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { BASE_API, GET, USER_ID_SELECTOR } from './constants';
-
-export enum UserRole {
-    Instructor = 'ROLE_INSTRUCTOR',
-    Tutor = 'ROLE_TA',
-    Student = 'ROLE_USER',
-}
-
-export const USER_ID = {
-    studentOne: 100,
-    studentTwo: 102,
-    studentThree: 104,
-    studentFour: 106,
-    instructor: 103,
-    tutor: 101,
-};
-
-export const USER_ROLE = {
-    studentOne: UserRole.Student,
-    studentTwo: UserRole.Student,
-    studentThree: UserRole.Student,
-    studentFour: UserRole.Student,
-    instructor: UserRole.Instructor,
-    tutor: UserRole.Tutor,
-};
-
-/**
- * Class to encompass user management logic for cypress tests.
- */
-export class CypressUserManagement {
-    /**
-     * @returns admin credentials.
-     */
-    public getAdmin(): CypressCredentials {
-        const adminUsername = Cypress.env('adminUsername') ?? 'admin';
-        const adminPassword = Cypress.env('adminPassword') ?? 'admin';
-        return { username: adminUsername, password: adminPassword };
-    }
-
-    /**
-     * @returns the first testing account with student rights.
-     */
-    public getStudentOne(): CypressCredentials {
-        return this.getUserWithId(USER_ID.studentOne);
-    }
-
-    /**
-     * @returns the second testing account with student rights.
-     */
-    public getStudentTwo(): CypressCredentials {
-        return this.getUserWithId(USER_ID.studentTwo);
-    }
-
-    /**
-     * @returns the third testing account with student rights.
-     */
-    public getStudentThree(): CypressCredentials {
-        return this.getUserWithId(USER_ID.studentThree);
-    }
-
-    /**
-     * @returns the fourth testing account with student rights.
-     */
-    public getStudentFour(): CypressCredentials {
-        return this.getUserWithId(USER_ID.studentFour);
-    }
-
-    /**
-     * @returns an instructor account.
-     */
-    public getInstructor(): CypressCredentials {
-        return this.getUserWithId(USER_ID.instructor);
-    }
-
-    /**
-     * @returns a tutor account.
-     */
-    public getTutor(): CypressCredentials {
-        return this.getUserWithId(USER_ID.tutor);
-    }
-
-    public getUserWithId(userId: number): CypressCredentials {
-        const username = this.getUsernameTemplate().replace(USER_ID_SELECTOR, userId.toString());
-        const password = this.getPasswordTemplate().replace(USER_ID_SELECTOR, userId.toString());
-        return { username, password };
-    }
-
-    /**
-     * @returns the username template.
-     */
-    private getUsernameTemplate(): string {
-        return Cypress.env('username') ?? 'user_' + USER_ID_SELECTOR;
-    }
-
-    /**
-     * @returns the password template.
-     */
-    private getPasswordTemplate(): string {
-        return Cypress.env('password') ?? 'password_' + USER_ID_SELECTOR;
-    }
-
-    /**
-     * Provides the entire account info for the user that is currently logged in
-     * Use like this: artemis.users.getAccountInfo((account) => { someFunction(account); });
-     * */
-    public getAccountInfo(func: (response: any) => void) {
-        cy.request({ method: GET, url: `${BASE_API}/public/account`, log: false }).then((response) => {
-            func(response.body);
-        });
-    }
-
-    public getUserInfo(username: string, func: (response: any) => void) {
-        cy.request({ method: GET, url: `${BASE_API}/admin/users/${username}`, log: false }).then((response) => {
-            func(response.body);
-        });
-    }
-}
-
-// Users
-export const users = new CypressUserManagement();
-export const admin = users.getAdmin();
-export const instructor = users.getInstructor();
-export const tutor = users.getTutor();
-export const studentOne = users.getStudentOne();
-export const studentTwo = users.getStudentTwo();
-export const studentThree = users.getStudentThree();
-export const studentFour = users.getStudentFour();
-
-/**
- * Container class for user credentials.
- */
-export interface CypressCredentials {
-    username: string;
-    password: string;
-}
diff --git a/src/test/cypress/support/utils.ts b/src/test/cypress/support/utils.ts
deleted file mode 100644
index 0f3cbf51c7df..000000000000
--- a/src/test/cypress/support/utils.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { TIME_FORMAT } from './constants';
-import dayjs from 'dayjs/esm';
-import utc from 'dayjs/esm/plugin/utc';
-import { v4 as uuidv4 } from 'uuid';
-
-// Add utc plugin to use the utc timezone
-dayjs.extend(utc);
-
-/**
- * This file contains all of the global utility functions not directly related to cypress.
- */
-
-/**
- * Generates a unique identifier.
- * */
-export function generateUUID() {
-    const uuid = uuidv4().replace(/-/g, '');
-    return uuid.substr(0, 9);
-}
-
-/**
- * Allows to enter date into the UI
- * */
-export function enterDate(selector: string, date: dayjs.Dayjs) {
-    const dateInputField = cy.get(selector).find('#date-input-field');
-    dateInputField.should('not.be.disabled');
-    dateInputField.clear().type(dayjsToString(date), { force: true });
-}
-
-/**
- * Allows to check a specified input field for a value
- * */
-export function checkField(field: string, value: any) {
-    cy.get(field).should('have.value', value);
-}
-
-/**
- * Formats the day object with the time format which the server uses. Also makes sure that day uses the utc timezone.
- * @param day the day object
- * @returns a formatted string representing the date with utc timezone
- */
-export function dayjsToString(day: dayjs.Dayjs) {
-    // We need to add the Z at the end. Otherwise, the server can't parse it.
-    return day.utc().format(TIME_FORMAT) + 'Z';
-}
-
-/**
- * Converts the response object obtained from a multipart request to an entity object.
- * @param response - The Cypress.Response<T> object obtained from a multipart request.
- * @returns The entity object parsed from the response.
- */
-export function convertModelAfterMultiPart<T>(response: Cypress.Response<T>): T {
-    // Cypress currently has some issues with our multipart request, parsing this not as an object but as an ArrayBuffer
-    // Once this is fixed (and hence the expect statements below fail), we can remove the additional parsing
-    expect(response.body).not.to.be.an('object');
-    expect(response.body).to.be.an('ArrayBuffer');
-
-    return parseArrayBufferAsJsonObject(response.body as ArrayBuffer);
-}
-
-/**
- * This function is necessary to make the server and the client date comparable.
- * The server sometimes has 3 digit on the milliseconds and sometimes only 1 digit.
- * With this function we always cut the date string after the first digit.
- * @param date the date as a string
- * @returns a date string with only one digit for the milliseconds
- */
-export function trimDate(date: string) {
-    return date.slice(0, 19);
-}
-
-/**
- * Converts a snake_case word to Title Case (each word's first letter capitalized and spaces in between).
- * @param str - The snake_case word to be converted to Title Case.
- * @returns The word in Title Case.
- */
-export function titleCaseWord(str: string) {
-    str = str.replace('_', ' ');
-    const sentence = str.toLowerCase().split(' ');
-    for (let i = 0; i < sentence.length; i++) {
-        sentence[i] = sentence[i][0].toUpperCase() + sentence[i].slice(1);
-    }
-    return sentence.join(' ');
-}
-
-/**
- * Converts a title to lowercase and replaces spaces with hyphens.
- * @param title - The title to be converted to lowercase with hyphens.
- * @returns The converted title in lowercase with hyphens.
- */
-export function titleLowercase(title: string) {
-    return title.replace(' ', '-').toLowerCase();
-}
-
-/**
- * Retrieves the DOM element representing the exercise with the specified ID.
- * @param exerciseId - The ID of the exercise for which to retrieve the DOM element.
- * @returns A Cypress.Chainable that yields the DOM element representing the exercise.
- */
-export function getExercise(exerciseId: number) {
-    return cy.get(`#exercise-${exerciseId}`);
-}
-
-/**
- * Converts a boolean value to its related icon class.
- * @param boolean - The boolean value to be converted.
- * @returns The corresponding ".checked" or ".unchecked" string.
- */
-export function convertBooleanToCheckIconClass(boolean: boolean) {
-    return boolean ? '.checked' : '.unchecked';
-}
-
-/**
- * Parses an ArrayBuffer as a JSON object.
- * @param buffer - The ArrayBuffer to be parsed as a JSON object.
- * @returns The parsed JSON object.
- */
-function parseArrayBufferAsJsonObject(buffer: ArrayBuffer) {
-    const bodyString = Cypress.Blob.arrayBufferToBinaryString(buffer);
-    return JSON.parse(bodyString);
-}
diff --git a/src/test/cypress/tsconfig.json b/src/test/cypress/tsconfig.json
deleted file mode 100644
index 65dece962d13..000000000000
--- a/src/test/cypress/tsconfig.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "extends": "../../../tsconfig.json",
-    "include": ["**/**/**/*.ts"],
-    "exclude": ["node_modules"],
-    "compilerOptions": {
-        "ignoreDeprecations": "5.0",
-        "target": "es2019",
-        "sourceMap": false,
-        "types": ["cypress", "@4tw/cypress-drag-drop", "node", "cypress-wait-until", "cypress-file-upload"]
-    }
-}
diff --git a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java
index c72bb2a37e0f..d2b41249721c 100644
--- a/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/AbstractSpringIntegrationIndependentTest.java
@@ -2,6 +2,7 @@
 
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_CORE;
 import static de.tum.in.www1.artemis.config.Constants.PROFILE_SCHEDULING;
+import static de.tum.in.www1.artemis.config.Constants.PROFILE_THEIA;
 import static tech.jhipster.config.JHipsterConstants.SPRING_PROFILE_TEST;
 
 import java.util.Set;
@@ -34,7 +35,7 @@
  */
 @ResourceLock("AbstractSpringIntegrationIndependentTest")
 // NOTE: we use a common set of active profiles to reduce the number of application launches during testing. This significantly saves time and memory!
-@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "athena", "apollon", "lti", "aeolus", PROFILE_CORE })
+@ActiveProfiles({ SPRING_PROFILE_TEST, "artemis", PROFILE_SCHEDULING, "athena", "apollon", "lti", "aeolus", PROFILE_THEIA, PROFILE_CORE })
 @TestPropertySource(properties = { "artemis.user-management.use-external=false" })
 public abstract class AbstractSpringIntegrationIndependentTest extends AbstractArtemisIntegrationTest {
 
diff --git a/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java
index 13dee755daa6..fb2ad2dec51d 100644
--- a/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/FileIntegrationTest.java
@@ -68,7 +68,7 @@ class FileIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
     @BeforeEach
     void initTestCase() {
-        userUtilService.addUsers(TEST_PREFIX, 1, 1, 0, 1);
+        userUtilService.addUsers(TEST_PREFIX, 1, 1, 1, 1);
     }
 
     @Test
@@ -307,4 +307,41 @@ private AttachmentUnit uploadAttachmentUnit(Lecture lecture, MockMultipartFile f
                 AttachmentUnit.class, expectedStatus);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR")
+    void testGetAttachmentFileAsEditor() throws Exception {
+        Lecture lecture = lectureUtilService.createCourseWithLecture(true);
+
+        Attachment attachment = LectureFactory.generateAttachmentWithFile(ZonedDateTime.now(), lecture.getId(), false);
+        attachment.setId(1L);
+        attachment.setLecture(lecture);
+
+        Long courseId = lecture.getCourse().getId();
+        Long attachmentId = attachment.getId();
+
+        lectureRepo.save(lecture);
+        attachmentRepo.save(attachment);
+
+        request.get("/api/files/courses/" + courseId + "/attachments/" + attachmentId, HttpStatus.OK, byte[].class);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR")
+    void testGetAttachmentUnitFileAsEditor() throws Exception {
+        Lecture lecture = lectureUtilService.createCourseWithLecture(true);
+
+        AttachmentUnit attachmentUnit = lectureUtilService.createAttachmentUnit(true);
+        attachmentUnit.setLecture(lecture);
+        Attachment attachment = attachmentUnit.getAttachment();
+
+        lectureRepo.save(lecture);
+        attachmentRepo.save(attachment);
+        attachmentUnitRepo.save(attachmentUnit);
+
+        Long courseId = lecture.getCourse().getId();
+        Long attachmentUnitId = attachmentUnit.getId();
+
+        request.get("/api/files/courses/" + courseId + "/attachment-units/" + attachmentUnitId, HttpStatus.OK, byte[].class);
+    }
+
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
index 56e3d0339bda..2c8e7c82b389 100644
--- a/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/assessment/ResultServiceIntegrationTest.java
@@ -33,6 +33,7 @@
 import de.tum.in.www1.artemis.domain.GradingCriterion;
 import de.tum.in.www1.artemis.domain.GradingInstruction;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
+import de.tum.in.www1.artemis.domain.ProgrammingExerciseTestCase;
 import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.Result;
 import de.tum.in.www1.artemis.domain.Submission;
@@ -72,6 +73,7 @@
 import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.TextExerciseRepository;
 import de.tum.in.www1.artemis.web.rest.dto.ResultWithPointsPerGradingCriterionDTO;
+import de.tum.in.www1.artemis.web.rest.dto.feedback.FeedbackDetailDTO;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
 class ResultServiceIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest {
@@ -722,4 +724,91 @@ void testGetAssessmentCountByCorrectionRoundForProgrammingExercise() {
         assertThat(assessments[0].inTime()).isEqualTo(1);    // correction round 1
         assertThat(assessments[1].inTime()).isEqualTo(1);    // correction round 2
     }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAllFeedbackDetailsForExercise() throws Exception {
+        ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course);
+        StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1");
+        Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation);
+        ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1");
+        testCase.setId(1L);
+
+        Feedback feedback = new Feedback();
+        feedback.setPositive(false);
+        feedback.setDetailText("Some feedback");
+        feedback.setTestCase(testCase);
+        participationUtilService.addFeedbackToResult(feedback, result);
+
+        List<FeedbackDetailDTO> response = request.getList("/api/exercises/" + programmingExercise.getId() + "/feedback-details", HttpStatus.OK, FeedbackDetailDTO.class);
+
+        assertThat(response).isNotEmpty();
+        FeedbackDetailDTO feedbackDetail = response.getFirst();
+        assertThat(feedbackDetail.count()).isEqualTo(1);
+        assertThat(feedbackDetail.relativeCount()).isEqualTo(100.0);
+        assertThat(feedbackDetail.detailText()).isEqualTo("Some feedback");
+        assertThat(feedbackDetail.testCaseName()).isEqualTo("test1");
+        assertThat(feedbackDetail.taskNumber()).isEqualTo(1);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAllFeedbackDetailsForExerciseWithMultipleFeedback() throws Exception {
+        ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course);
+        StudentParticipation participation = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student1");
+        StudentParticipation participation2 = participationUtilService.createAndSaveParticipationForExercise(programmingExercise, TEST_PREFIX + "student2");
+        Result result = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation);
+        Result result2 = participationUtilService.addResultToParticipation(AssessmentType.AUTOMATIC, null, participation2);
+        ProgrammingExerciseTestCase testCase = programmingExerciseUtilService.addTestCaseToProgrammingExercise(programmingExercise, "test1");
+        testCase.setId(1L);
+
+        Feedback feedback1 = new Feedback();
+        feedback1.setPositive(false);
+        feedback1.setDetailText("Some feedback");
+        feedback1.setTestCase(testCase);
+        participationUtilService.addFeedbackToResult(feedback1, result);
+
+        Feedback feedback2 = new Feedback();
+        feedback2.setPositive(false);
+        feedback2.setDetailText("Some feedback");
+        feedback2.setTestCase(testCase);
+        participationUtilService.addFeedbackToResult(feedback2, result2);
+
+        Feedback feedback3 = new Feedback();
+        feedback3.setPositive(false);
+        feedback3.setDetailText("Some different feedback");
+        feedback3.setTestCase(testCase);
+        participationUtilService.addFeedbackToResult(feedback3, result);
+
+        List<FeedbackDetailDTO> response = request.getList("/api/exercises/" + programmingExercise.getId() + "/feedback-details", HttpStatus.OK, FeedbackDetailDTO.class);
+
+        assertThat(response).hasSize(2);
+
+        FeedbackDetailDTO firstFeedbackDetail = response.stream().filter(feedbackDetail -> "Some feedback".equals(feedbackDetail.detailText())).findFirst().orElseThrow();
+
+        FeedbackDetailDTO secondFeedbackDetail = response.stream().filter(feedbackDetail -> "Some different feedback".equals(feedbackDetail.detailText())).findFirst()
+                .orElseThrow();
+
+        assertThat(firstFeedbackDetail.count()).isEqualTo(2);
+        assertThat(firstFeedbackDetail.relativeCount()).isEqualTo(100.0);
+        assertThat(firstFeedbackDetail.detailText()).isEqualTo("Some feedback");
+        assertThat(firstFeedbackDetail.testCaseName()).isEqualTo("test1");
+        assertThat(firstFeedbackDetail.taskNumber()).isEqualTo(1);
+
+        assertThat(secondFeedbackDetail.count()).isEqualTo(1);
+        assertThat(secondFeedbackDetail.relativeCount()).isEqualTo(50.0);
+        assertThat(secondFeedbackDetail.detailText()).isEqualTo("Some different feedback");
+        assertThat(secondFeedbackDetail.testCaseName()).isEqualTo("test1");
+        assertThat(secondFeedbackDetail.taskNumber()).isEqualTo(1);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
+    void testGetAllFeedbackDetailsForExercise_NoParticipation() throws Exception {
+        ProgrammingExercise programmingExercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course);
+        List<FeedbackDetailDTO> response = request.getList("/api/exercises/" + programmingExercise.getId() + "/feedback-details", HttpStatus.OK, FeedbackDetailDTO.class);
+
+        assertThat(response).isEmpty();
+    }
+
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserLocalVcIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java
similarity index 64%
rename from src/test/java/de/tum/in/www1/artemis/authentication/UserLocalVcIntegrationTest.java
rename to src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java
index b419cbf57260..29630b917676 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/UserLocalVcIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/UserAccountLocalVcsIntegrationTest.java
@@ -9,7 +9,7 @@
 import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest;
 import de.tum.in.www1.artemis.user.UserTestService;
 
-class UserLocalVcIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest {
+class UserAccountLocalVcsIntegrationTest extends AbstractSpringIntegrationLocalCILocalVCTest {
 
     private static final String TEST_PREFIX = "userlvc"; // shorter prefix as user's name is limited to 50 chars
 
@@ -31,4 +31,16 @@ void teardown() throws Exception {
     void addAndDeleteSshPublicKeyByUser() throws Exception {
         userTestService.addAndDeleteSshPublicKey();
     }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void getAndCreateParticipationVcsAccessTokenByUser() throws Exception {
+        userTestService.getAndCreateParticipationVcsAccessToken();
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void createAndDeleteUserVcsAccessTokenByUser() throws Exception {
+        userTestService.createAndDeleteUserVcsAccessToken();
+    }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java b/src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java
new file mode 100644
index 000000000000..41852515b971
--- /dev/null
+++ b/src/test/java/de/tum/in/www1/artemis/config/TheiaConfigurationTest.java
@@ -0,0 +1,41 @@
+package de.tum.in.www1.artemis.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest;
+import de.tum.in.www1.artemis.domain.enumeration.ProgrammingLanguage;
+
+class TheiaConfigurationTest extends AbstractSpringIntegrationIndependentTest {
+
+    @Autowired
+    private TheiaConfiguration theiaConfiguration;
+
+    @Test
+    void testAutowired() {
+        assertThat(theiaConfiguration).isNotNull();
+    }
+
+    @Test
+    void testAmountOfLanguageImages() {
+        assertThat(theiaConfiguration.getImagesForAllLanguages()).hasSize(2);
+    }
+
+    @Test
+    void testFlavorsForLanguage() {
+        Map<String, String> images = theiaConfiguration.getImagesForLanguage(ProgrammingLanguage.valueOf("JAVA"));
+        assertThat(images).hasSize(2);
+        assertThat(images).containsKey("Java-17");
+        assertThat(images).containsValue("ghcr.io/ls1intum/theia/java-17:latest");
+        assertThat(images.get("Java-Non-Existent")).isEqualTo("this-is-not-a-valid-image");
+    }
+
+    @Test
+    void testNonExistentLanguage() {
+        assertThat(theiaConfiguration.getImagesForLanguage(null)).isNull();
+    }
+}
diff --git a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java
index 98f3ad4db3eb..3f248a9e598c 100644
--- a/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java
+++ b/src/test/java/de/tum/in/www1/artemis/connector/IrisRequestMockProvider.java
@@ -30,6 +30,7 @@
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisHealthStatusDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.PyrisModelDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.chat.exercise.PyrisExerciseChatPipelineExecutionDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionPipelineExecutionDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.lectureingestionwebhook.PyrisWebhookLectureIngestionExecutionDTO;
 
 @Component
@@ -96,6 +97,20 @@ public void mockRunResponse(Consumer<PyrisExerciseChatPipelineExecutionDTO> resp
         // @formatter:on
     }
 
+    public void mockRunCompetencyExtractionResponseAnd(Consumer<PyrisCompetencyExtractionPipelineExecutionDTO> executionDTOConsumer) {
+        // @formatter:off
+        mockServer
+            .expect(ExpectedCount.once(), requestTo(pipelinesApiURL + "/competency-extraction/default/run"))
+            .andExpect(method(HttpMethod.POST))
+            .andRespond(request -> {
+                var mockRequest = (MockClientHttpRequest) request;
+                var dto = mapper.readValue(mockRequest.getBodyAsString(), PyrisCompetencyExtractionPipelineExecutionDTO.class);
+                executionDTOConsumer.accept(dto);
+                return MockRestResponseCreators.withRawStatus(HttpStatus.ACCEPTED.value()).createResponse(request);
+            });
+        // @formatter:on
+    }
+
     public void mockIngestionWebhookRunResponse(Consumer<PyrisWebhookLectureIngestionExecutionDTO> responseConsumer) {
         mockServer.expect(ExpectedCount.once(), requestTo(webhooksApiURL + "/lectures/fullIngestion")).andExpect(method(HttpMethod.POST)).andRespond(request -> {
             var mockRequest = (MockClientHttpRequest) request;
diff --git a/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java b/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java
index 1097afd3a46b..effc5d69160a 100644
--- a/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/connectors/LtiServiceTest.java
@@ -118,16 +118,14 @@ void addLtiQueryParamsNewUser() {
         verify(response).addHeader(any(), any());
 
         String initialize = uriComponents.getQueryParams().getFirst("initialize");
-        String ltiSuccessLoginRequired = uriComponents.getQueryParams().getFirst("ltiSuccessLoginRequired");
         assertThat(initialize).isEmpty();
-        assertThat(ltiSuccessLoginRequired).isNull();
     }
 
     @Test
     void addLtiQueryParamsExistingUser() {
         when(userRepository.getUser()).thenReturn(user);
         user.setActivated(true);
-        when(jwtCookieService.buildLogoutCookie()).thenReturn(mock(ResponseCookie.class));
+        when(jwtCookieService.buildLoginCookie(true)).thenReturn(mock(ResponseCookie.class));
 
         UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.newInstance();
         HttpServletResponse response = mock(HttpServletResponse.class);
@@ -136,12 +134,10 @@ void addLtiQueryParamsExistingUser() {
 
         UriComponents uriComponents = uriComponentsBuilder.build();
 
-        verify(jwtCookieService).buildLogoutCookie();
+        verify(jwtCookieService).buildLoginCookie(true);
         verify(response).addHeader(any(), any());
 
         String initialize = uriComponents.getQueryParams().getFirst("initialize");
-        String ltiSuccessLoginRequired = uriComponents.getQueryParams().getFirst("ltiSuccessLoginRequired");
-        assertThat(ltiSuccessLoginRequired).isEqualTo(user.getLogin());
         assertThat(initialize).isNull();
     }
 
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
index 3086bb22234e..5181383dbf1f 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamStartTest.java
@@ -36,7 +36,6 @@
 import de.tum.in.www1.artemis.domain.User;
 import de.tum.in.www1.artemis.domain.enumeration.DiagramType;
 import de.tum.in.www1.artemis.domain.exam.Exam;
-import de.tum.in.www1.artemis.domain.exam.ExamUser;
 import de.tum.in.www1.artemis.domain.exam.ExerciseGroup;
 import de.tum.in.www1.artemis.domain.exam.StudentExam;
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
@@ -124,7 +123,6 @@ void initTestCase() throws GitAPIException {
         User student1 = userUtilService.getUserByLogin(TEST_PREFIX + "student1");
         User student2 = userUtilService.getUserByLogin(TEST_PREFIX + "student2");
         registeredUsers = Set.of(student1, student2);
-        exam.setExamUsers(Set.of(new ExamUser()));
         // setting dates
         exam.setStartDate(ZonedDateTime.now().plusHours(2));
         exam.setEndDate(ZonedDateTime.now().plusHours(3));
@@ -137,6 +135,7 @@ void tearDown() throws Exception {
             programmingExerciseTestService.tearDown();
         }
 
+        // TODO: why do we remove the student exams here? This is not really necessary
         // Cleanup of Bidirectional Relationships
         for (StudentExam studentExam : createdStudentExams) {
             exam.removeStudentExam(studentExam);
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
index e7910012719e..dba05fa055cd 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/AbstractIrisIntegrationTest.java
@@ -21,7 +21,6 @@
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.ProgrammingExercise;
 import de.tum.in.www1.artemis.domain.iris.IrisTemplate;
-import de.tum.in.www1.artemis.domain.iris.session.IrisExerciseChatSession;
 import de.tum.in.www1.artemis.domain.iris.settings.IrisSubSettings;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
@@ -111,15 +110,13 @@ protected IrisTemplate createDummyTemplate() {
     }
 
     /**
-     * Verify that the given messages were sent through the websocket for the given chat session,
-     * and that there were exactly `matchers.length` messages sent.
+     * Verify that the given messages were sent through the websocket for the given user and topic.
      *
-     * @param session  The chat session
-     * @param matchers Argument matchers which describe the messages that should have been sent
+     * @param userLogin   The user login
+     * @param topicSuffix The chat session
+     * @param matchers    Argument matchers which describe the messages that should have been sent
      */
-    protected void verifyWebsocketActivityWasExactly(IrisExerciseChatSession session, ArgumentMatcher<?>... matchers) {
-        var userLogin = session.getUser().getLogin();
-        var topicSuffix = "" + session.getId();
+    protected void verifyWebsocketActivityWasExactly(String userLogin, String topicSuffix, ArgumentMatcher<?>... matchers) {
         for (ArgumentMatcher<?> callDescriptor : matchers) {
             verifyMessageWasSentOverWebsocket(userLogin, topicSuffix, callDescriptor);
         }
@@ -133,7 +130,7 @@ protected void verifyWebsocketActivityWasExactly(IrisExerciseChatSession session
      * @param topicSuffix The topic suffix, e.g. "sessions/123"
      * @param matcher     Argument matcher which describes the message that should have been sent
      */
-    private void verifyMessageWasSentOverWebsocket(String userLogin, String topicSuffix, ArgumentMatcher<?> matcher) {
+    protected void verifyMessageWasSentOverWebsocket(String userLogin, String topicSuffix, ArgumentMatcher<?> matcher) {
         // @formatter:off
         verify(websocketMessagingService, timeout(TIMEOUT_MS).times(1))
                 .sendMessageToUser(
@@ -147,7 +144,7 @@ private void verifyMessageWasSentOverWebsocket(String userLogin, String topicSuf
     /**
      * Verify that exactly `numberOfCalls` messages were sent through the websocket for the given user and topic.
      */
-    private void verifyNumberOfCallsToWebsocket(String userLogin, String topicSuffix, int numberOfCalls) {
+    protected void verifyNumberOfCallsToWebsocket(String userLogin, String topicSuffix, int numberOfCalls) {
         // @formatter:off
         verify(websocketMessagingService, times(numberOfCalls))
                 .sendMessageToUser(
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java
index 13297c1f2cb1..aefc058fee7f 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatMessageIntegrationTest.java
@@ -48,8 +48,8 @@
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
 import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState;
 import de.tum.in.www1.artemis.service.iris.IrisMessageService;
+import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO;
 import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService;
-import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO;
 
 class IrisChatMessageIntegrationTest extends AbstractIrisIntegrationTest {
 
@@ -139,8 +139,8 @@ void sendOneMessage() throws Exception {
 
         await().until(pipelineDone::get);
 
-        verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS),
-                messageDTO("Hello World"));
+        verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend.getContent()),
+                statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World"));
     }
 
     @Test
@@ -164,8 +164,8 @@ void sendSuggestions() throws Exception {
 
         await().until(pipelineDone::get);
 
-        verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS),
-                suggestionsDTO("suggestion1", "suggestion2", "suggestion3"));
+        verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend.getContent()),
+                statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), suggestionsDTO("suggestion1", "suggestion2", "suggestion3"));
     }
 
     @Test
@@ -306,7 +306,8 @@ void resendMessage() throws Exception {
         var irisMessage = irisMessageService.saveMessage(messageToSend, irisSession, IrisMessageSender.USER);
         request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.OK);
         await().until(() -> irisSessionRepository.findByIdWithMessagesElseThrow(irisSession.getId()).getMessages().size() == 2);
-        verifyWebsocketActivityWasExactly(irisSession, statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World"));
+        verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS),
+                messageDTO("Hello World"));
     }
 
     // User needs to be Admin to change settings
@@ -337,8 +338,8 @@ void sendMessageRateLimitReached() throws Exception {
             var irisMessage = irisMessageService.saveMessage(messageToSend2, irisSession, IrisMessageSender.USER);
             request.postWithoutResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages/" + irisMessage.getId() + "/resend", null, HttpStatus.TOO_MANY_REQUESTS);
 
-            verifyWebsocketActivityWasExactly(irisSession, messageDTO(messageToSend1.getContent()), statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS),
-                    messageDTO("Hello World"));
+            verifyWebsocketActivityWasExactly(irisSession.getUser().getLogin(), String.valueOf(irisSession.getId()), messageDTO(messageToSend1.getContent()),
+                    statusDTO(IN_PROGRESS, NOT_STARTED), statusDTO(DONE, IN_PROGRESS), messageDTO("Hello World"));
         }
         finally {
             // Reset to not interfere with other tests
@@ -375,10 +376,10 @@ private ArgumentMatcher<Object> messageDTO(List<IrisMessageContent> content) {
 
             @Override
             public boolean matches(Object argument) {
-                if (!(argument instanceof IrisWebsocketDTO websocketDTO)) {
+                if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) {
                     return false;
                 }
-                if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.MESSAGE) {
+                if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.MESSAGE) {
                     return false;
                 }
                 return Objects.equals(websocketDTO.message().getContent().stream().map(IrisMessageContent::getContentAsString).toList(),
@@ -397,10 +398,10 @@ private ArgumentMatcher<Object> statusDTO(PyrisStageState... stageStates) {
 
             @Override
             public boolean matches(Object argument) {
-                if (!(argument instanceof IrisWebsocketDTO websocketDTO)) {
+                if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) {
                     return false;
                 }
-                if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.STATUS) {
+                if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) {
                     return false;
                 }
                 if (websocketDTO.stages() == null) {
@@ -424,10 +425,10 @@ private ArgumentMatcher<Object> suggestionsDTO(String... suggestions) {
 
             @Override
             public boolean matches(Object argument) {
-                if (!(argument instanceof IrisWebsocketDTO websocketDTO)) {
+                if (!(argument instanceof IrisChatWebsocketDTO websocketDTO)) {
                     return false;
                 }
-                if (websocketDTO.type() != IrisWebsocketDTO.IrisWebsocketMessageType.STATUS) {
+                if (websocketDTO.type() != IrisChatWebsocketDTO.IrisWebsocketMessageType.STATUS) {
                     return false;
                 }
                 if (websocketDTO.suggestions() == null) {
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java
index 0a1bb785ab2d..4ce540f175c8 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisChatWebsocketTest.java
@@ -18,9 +18,9 @@
 import de.tum.in.www1.artemis.domain.iris.message.IrisTextMessageContent;
 import de.tum.in.www1.artemis.service.WebsocketMessagingService;
 import de.tum.in.www1.artemis.service.iris.IrisRateLimitService;
+import de.tum.in.www1.artemis.service.iris.dto.IrisChatWebsocketDTO;
 import de.tum.in.www1.artemis.service.iris.session.IrisExerciseChatSessionService;
 import de.tum.in.www1.artemis.service.iris.websocket.IrisChatWebsocketService;
-import de.tum.in.www1.artemis.service.iris.websocket.IrisWebsocketDTO;
 
 @ActiveProfiles("iris")
 class IrisChatWebsocketTest extends AbstractIrisIntegrationTest {
@@ -53,9 +53,9 @@ void sendMessage() {
         var message = irisSession.newMessage();
         message.addContent(createMockContent(), createMockContent());
         message.setMessageDifferentiator(101010);
-        irisChatWebsocketService.sendMessage(message, List.of());
+        irisChatWebsocketService.sendMessage(irisSession, message, List.of());
         verify(websocketMessagingService, times(1)).sendMessageToUser(eq(TEST_PREFIX + "student1"), eq("/topic/iris/" + irisSession.getId()),
-                eq(new IrisWebsocketDTO(message, new IrisRateLimitService.IrisRateLimitInformation(0, -1, 0), List.of(), List.of())));
+                eq(new IrisChatWebsocketDTO(message, new IrisRateLimitService.IrisRateLimitInformation(0, -1, 0), List.of(), List.of())));
     }
 
     private IrisTextMessageContent createMockContent() {
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java
index 613b35f5d08f..e67f52342bfc 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisCompetencyGenerationIntegrationTest.java
@@ -1,24 +1,35 @@
 package de.tum.in.www1.artemis.iris;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithMockUser;
 
 import de.tum.in.www1.artemis.domain.Course;
-import de.tum.in.www1.artemis.domain.competency.Competency;
 import de.tum.in.www1.artemis.domain.competency.CompetencyTaxonomy;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyExtractionInputDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyRecommendationDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.competency.PyrisCompetencyStatusUpdateDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageDTO;
+import de.tum.in.www1.artemis.service.connectors.pyris.dto.status.PyrisStageState;
+import de.tum.in.www1.artemis.service.iris.IrisCompetencyGenerationService;
 
 class IrisCompetencyGenerationIntegrationTest extends AbstractIrisIntegrationTest {
 
     private static final String TEST_PREFIX = "iriscompetencyintegration";
 
+    @Autowired
+    IrisCompetencyGenerationService irisCompetencyGenerationService;
+
     private Course course;
 
     @BeforeEach
@@ -31,34 +42,43 @@ void initTestCase() {
     }
 
     @Test
-    @Disabled // TODO: Enable this test again!
     @WithMockUser(username = TEST_PREFIX + "editor1", roles = "EDITOR")
     void generateCompetencies_asEditor_shouldSucceed() throws Exception {
-        final String courseDescription = "Any description";
-        Competency expected = new Competency();
-        expected.setTitle("title");
-        expected.setDescription("description");
-        expected.setTaxonomy(CompetencyTaxonomy.ANALYZE);
-        // var competencyMap1 = Map.of("title", expected.getTitle(), "description", expected.getDescription(), "taxonomy", expected.getTaxonomy());
-        // // empty or malformed competencies are ignored
-        // var competencyMap2 = Map.of("title", "!done");
-        // var competencyMap3 = Map.of("malformed", "any content");
-        // var responseMap = Map.of("competencies", List.of(competencyMap1, competencyMap2, competencyMap3));
-
-        /*
-         * irisRequestMockProvider.mockRunResponse(dto -> {
-         * assertThat(dto.settings().authenticationToken()).isNotNull();
-         * pipelineDone.set(true);
-         * });
-         */
-        fail("This test is not yet implemented. Implement it and remove the fail call.");
-
-        List<Competency> competencies = request.postListWithResponseBody("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", courseDescription,
-                Competency.class, HttpStatus.OK);
-        Competency actualCompetency = competencies.getFirst();
-
-        assertThat(competencies.size()).isEqualTo(1);
-        assertThat(actualCompetency).usingRecursiveComparison().comparingOnlyFields("title", "description", "taxonomy").isEqualTo(expected);
+        String courseDescription = "Cool course description";
+        var currentCompetencies = new PyrisCompetencyRecommendationDTO[] { new PyrisCompetencyRecommendationDTO("test title", "test description", CompetencyTaxonomy.UNDERSTAND), };
+
+        // Expect that a request is sent to Pyris having the following characteristics
+        irisRequestMockProvider.mockRunCompetencyExtractionResponseAnd(dto -> {
+            var token = dto.execution().settings().authenticationToken();
+            assertThat(token).isNotNull();
+            assertThat(dto.courseDescription()).contains(courseDescription);
+            assertThat(dto.currentCompetencies()).containsExactly(currentCompetencies);
+            assertThat(dto.taxonomyOptions()).isNotEmpty();
+            assertThat(dto.maxN()).isPositive();
+        });
+
+        // Send a request to the Artemis server as if the user had clicked the button in the UI
+        request.postWithoutResponseBody("/api/courses/" + course.getId() + "/course-competencies/generate-from-description",
+                new PyrisCompetencyExtractionInputDTO(courseDescription, currentCompetencies), HttpStatus.ACCEPTED);
+
+        PyrisCompetencyRecommendationDTO expected = new PyrisCompetencyRecommendationDTO("test title", "test description", CompetencyTaxonomy.UNDERSTAND);
+        List<PyrisCompetencyRecommendationDTO> recommendations = List.of(expected, expected, expected);
+        List<PyrisStageDTO> stages = List.of(new PyrisStageDTO("Generating Competencies", 10, PyrisStageState.DONE, null));
+
+        // In the real system, this would be triggered by Pyris via a REST call to the Artemis server
+        irisCompetencyGenerationService.handleStatusUpdate(TEST_PREFIX + "editor1", course.getId(), new PyrisCompetencyStatusUpdateDTO(stages, recommendations));
+
+        ArgumentCaptor<PyrisCompetencyStatusUpdateDTO> argumentCaptor = ArgumentCaptor.forClass(PyrisCompetencyStatusUpdateDTO.class);
+        verify(websocketMessagingService, timeout(200).times(3)).sendMessageToUser(eq(TEST_PREFIX + "editor1"), eq("/topic/iris/competencies/" + course.getId()),
+                argumentCaptor.capture());
+
+        List<PyrisCompetencyStatusUpdateDTO> allValues = argumentCaptor.getAllValues();
+        assertThat(allValues.get(0).stages()).hasSize(2);
+        assertThat(allValues.get(0).result()).isNull();
+        assertThat(allValues.get(1).stages()).hasSize(2);
+        assertThat(allValues.get(1).result()).isNull();
+        assertThat(allValues.get(2).stages()).hasSize(1);
+        assertThat(allValues.get(2).result()).isEqualTo(recommendations);
     }
 
     @Test
@@ -74,6 +94,7 @@ void testAll_asTutor_shouldReturnForbidden() throws Exception {
     }
 
     void testAllPreAuthorize() throws Exception {
-        request.post("/api/courses/" + course.getId() + "/course-competencies/generate-from-description", "a", HttpStatus.FORBIDDEN);
+        request.post("/api/courses/" + course.getId() + "/course-competencies/generate-from-description",
+                new PyrisCompetencyExtractionInputDTO("a", new PyrisCompetencyRecommendationDTO[] {}), HttpStatus.FORBIDDEN);
     }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
index 190d02485212..cbd957d51dd1 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIParticipationIntegrationTest.java
@@ -57,7 +57,7 @@ void testStartParticipation() throws Exception {
         LocalVCRepositoryUri studentAssignmentRepositoryUri = new LocalVCRepositoryUri(projectKey, projectKey.toLowerCase() + "-" + TEST_PREFIX + "student1", localVCBaseUrl);
         assertThat(studentAssignmentRepositoryUri.getLocalRepositoryPath(localVCBasePath)).exists();
 
-        var vcsAccessToken = request.get("/api/users/vcsToken?participationId=" + participation.getId(), HttpStatus.OK, String.class);
+        var vcsAccessToken = request.get("/api/account/participation-vcs-access-token?participationId=" + participation.getId(), HttpStatus.OK, String.class);
         assertThat(vcsAccessToken).isNotNull();
         assertThat(vcsAccessToken).startsWith("vcpat");
 
diff --git a/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java b/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java
index 96b0db2daa28..c97014991558 100644
--- a/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/notification/NotificationTargetFactoryTest.java
@@ -58,8 +58,6 @@ class NotificationTargetFactoryTest {
 
     private static final String BASE_URL = "https://artemistest.ase.in.tum.de";
 
-    private static final String MESSAGES_CONVERSATION = "messages?conversationId=";
-
     private String resultingURL;
 
     private static final String PROBLEM_STATEMENT = "problem statement";
@@ -74,8 +72,8 @@ class NotificationTargetFactoryTest {
 
     // expected/correct URLs
 
-    // e.g. https://artemistest.ase.in.tum.de/courses/477/discussion?searchText=%232000
-    private static final String EXPECTED_POST_URL = BASE_URL_COURSES_COURSE_ID + "/" + MESSAGES_CONVERSATION + CHANNEL_ID;
+    // e.g. https://artemistest.ase.in.tum.de/courses/477/communication?conversationId=2000
+    private static final String EXPECTED_POST_URL = BASE_URL_COURSES_COURSE_ID + "/" + "communication?conversationId=" + CHANNEL_ID;
 
     // e.g. https://artemistest.ase.in.tum.de/courses/477/lectures/199
     private static final String EXPECTED_ATTACHMENT_CHANGED_URL = BASE_URL_COURSES_COURSE_ID + "/" + LECTURES_TEXT + "/" + LECTURE_ID;
diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java
similarity index 96%
rename from src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java
index 45374611d0ba..957238bac53e 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/ContinuousPlagiarismControlServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/ContinuousPlagiarismControlServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service.plagiarism;
+package de.tum.in.www1.artemis.plagiarism;
 
 import static java.util.Collections.emptySet;
 import static java.util.Collections.singleton;
@@ -43,6 +43,11 @@
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismCaseRepository;
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismComparisonRepository;
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository;
+import de.tum.in.www1.artemis.service.plagiarism.ContinuousPlagiarismControlService;
+import de.tum.in.www1.artemis.service.plagiarism.PlagiarismCaseService;
+import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService;
+import de.tum.in.www1.artemis.service.plagiarism.PlagiarismPostService;
+import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException;
 
 class ContinuousPlagiarismControlServiceTest {
 
diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java
similarity index 96%
rename from src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java
rename to src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java
index 83b6938a5040..1672a44291af 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionConfigHelperTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionConfigHelperTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service.plagiarism;
+package de.tum.in.www1.artemis.plagiarism;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -12,6 +12,7 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingExercise;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismDetectionConfig;
 import de.tum.in.www1.artemis.repository.ModelingExerciseRepository;
+import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionConfigHelper;
 
 class PlagiarismDetectionConfigHelperTest {
 
diff --git a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java
similarity index 93%
rename from src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java
rename to src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java
index d80897af7d4f..39ab8d09aad3 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/plagiarism/PlagiarismDetectionServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/plagiarism/PlagiarismDetectionServiceTest.java
@@ -1,4 +1,4 @@
-package de.tum.in.www1.artemis.service.plagiarism;
+package de.tum.in.www1.artemis.plagiarism;
 
 import static java.util.Collections.emptyList;
 import static java.util.Collections.emptySet;
@@ -22,6 +22,11 @@
 import de.tum.in.www1.artemis.domain.plagiarism.modeling.ModelingPlagiarismResult;
 import de.tum.in.www1.artemis.domain.plagiarism.text.TextPlagiarismResult;
 import de.tum.in.www1.artemis.repository.plagiarism.PlagiarismResultRepository;
+import de.tum.in.www1.artemis.service.plagiarism.ModelingPlagiarismDetectionService;
+import de.tum.in.www1.artemis.service.plagiarism.PlagiarismDetectionService;
+import de.tum.in.www1.artemis.service.plagiarism.ProgrammingLanguageNotSupportedForPlagiarismDetectionException;
+import de.tum.in.www1.artemis.service.plagiarism.ProgrammingPlagiarismDetectionService;
+import de.tum.in.www1.artemis.service.plagiarism.TextPlagiarismDetectionService;
 import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeature;
 import de.tum.in.www1.artemis.service.programming.ProgrammingLanguageFeatureService;
 
diff --git a/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java b/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java
index bcbdb17eafb0..d7cbc1010b9e 100644
--- a/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/science/ScienceUtilService.java
@@ -23,11 +23,12 @@ public class ScienceUtilService {
      * @param identity   The login of the user associated with the event.
      * @param type       The type of the event.
      * @param resourceId The id of the resource associated with the event.
+     * @param timestamp  The timestamp of the event.
      */
-    public ScienceEvent createScienceEvent(String identity, ScienceEventType type, Long resourceId) {
+    public ScienceEvent createScienceEvent(String identity, ScienceEventType type, Long resourceId, ZonedDateTime timestamp) {
         ScienceEvent event = new ScienceEvent();
         event.setIdentity(identity);
-        event.setTimestamp(ZonedDateTime.now());
+        event.setTimestamp(timestamp);
         event.setType(type);
         event.setResourceId(resourceId);
         return scienceEventRepository.save(event);
@@ -39,14 +40,7 @@ public ScienceEvent createScienceEvent(String identity, ScienceEventType type, L
      */
     public static Comparator<ScienceEvent> scienceEventComparator = Comparator.comparing(ScienceEvent::getResourceId).thenComparing(ScienceEvent::getType)
             .thenComparing((ScienceEvent e1, ScienceEvent e2) -> {
-
-                Duration d = Duration.between(e1.getTimestamp(), e2.getTimestamp());
-                if (d.toNanos() > 500) {
-                    return 1;
-                }
-                else if (d.toNanos() < -500) {
-                    return -1;
-                }
-                return 0;
-            });
+                Duration duration = Duration.between(e1.getTimestamp(), e2.getTimestamp());
+                return Math.abs(duration.toNanos()) < 1e5 ? 0 : duration.isNegative() ? -1 : 1;
+            }).thenComparing(ScienceEvent::getIdentity);
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
index e21e7563d52a..98f8b97e07e3 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/DataExportCreationServiceTest.java
@@ -167,7 +167,8 @@ void initTestCase() throws IOException {
 
         apollonRequestMockProvider.enableMockingOfRequests();
 
-        // mock apollon conversion 8 times, because the last test includes 8 modeling exercises, because each test adds modeling exercises
+        // mock apollon conversion 8 times, because the last test includes 8 modeling
+        // exercises, because each test adds modeling exercises
         for (int i = 0; i < 8; i++) {
             mockApollonConversion();
         }
@@ -230,7 +231,6 @@ private void assertCommunicationDataCsvFile(Path courseDirPath) {
     /**
      * Asserts the content of the science events CSV file.
      * Allows for a 500ns difference between the timestamps due to the reimport from the csv export.
-     * Might cause the test to be flaky if multiple events are created overlapping and matched wrongly.
      *
      * @param extractedZipDirPath The path to the extracted zip directory
      * @param events              The set of science events to compare with the content of the CSV file
@@ -249,13 +249,13 @@ private void assertScienceEventsCSVFile(Path extractedZipDirPath, Set<ScienceEve
                 scienceEvent.setTimestamp(ZonedDateTime.parse(record.get("timestamp")));
                 scienceEvent.setType(ScienceEventType.valueOf(record.get("event_type")));
                 scienceEvent.setResourceId(Long.parseLong(record.get("resource_id")));
+                scienceEvent.setIdentity(TEST_PREFIX + "student1");
                 actual.add(scienceEvent);
             }
         }
         catch (IOException e) {
             fail("Failed while reading science events CSV file");
         }
-
         assertThat(actual).usingElementComparator(ScienceUtilService.scienceEventComparator).containsExactlyInAnyOrderElementsOf(events);
     }
 
@@ -332,9 +332,13 @@ private void createPlagiarismData(String userLogin, ProgrammingExercise programm
     }
 
     private Set<ScienceEvent> createScienceEvents(String userLogin) {
-        return Set.of(scienceUtilService.createScienceEvent(userLogin, ScienceEventType.EXERCISE__OPEN, 1L),
-                scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN, 2L),
-                scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN_UNIT, 3L));
+
+        ZonedDateTime timestamp = ZonedDateTime.now();
+        // Rounding timestamp due to rounding during export
+        timestamp = timestamp.withNano(timestamp.getNano() - timestamp.getNano() % 10000);
+        return Set.of(scienceUtilService.createScienceEvent(userLogin, ScienceEventType.EXERCISE__OPEN, 1L, timestamp),
+                scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN, 2L, timestamp.plusMinutes(1)),
+                scienceUtilService.createScienceEvent(userLogin, ScienceEventType.LECTURE__OPEN_UNIT, 3L, timestamp.plusSeconds(30)));
 
     }
 
@@ -635,7 +639,8 @@ void testDataExportContainsDataAboutCourseStudentUnenrolled() throws Exception {
         var course = prepareCourseDataForDataExportCreation(assessmentDueDateInTheFuture, courseShortName);
         conversationUtilService.addOneMessageForUserInCourse(TEST_PREFIX + "student1", course, "only one post");
         var dataExport = initDataExport();
-        // by setting the course groups to a different value we simulate unenrollment because the user is no longer part of the user group and hence, the course.
+        // by setting the course groups to a different value, we simulate unenrollment
+        // because the user is no longer part of the user group and hence, the course.
         courseUtilService.updateCourseGroups("abc", course, "");
         dataExportCreationService.createDataExport(dataExport);
         var dataExportFromDb = dataExportRepository.findByIdElseThrow(dataExport.getId());
diff --git a/src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java b/src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java
new file mode 100644
index 000000000000..9ff3a4db9874
--- /dev/null
+++ b/src/test/java/de/tum/in/www1/artemis/telemetry/TelemetryServiceTest.java
@@ -0,0 +1,78 @@
+package de.tum.in.www1.artemis.telemetry;
+
+import static org.mockito.Mockito.spy;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.method;
+import static org.springframework.test.web.client.match.MockRestRequestMatchers.requestTo;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withServerError;
+import static org.springframework.test.web.client.response.MockRestResponseCreators.withStatus;
+
+import java.net.URI;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.client.ExpectedCount;
+import org.springframework.test.web.client.MockRestServiceServer;
+import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest;
+import de.tum.in.www1.artemis.service.telemetry.TelemetryService;
+
+@ExtendWith(MockitoExtension.class)
+class TelemetryServiceTest extends AbstractSpringIntegrationIndependentTest {
+
+    @Value("${artemis.telemetry.destination}")
+    private String destination;
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    private MockRestServiceServer mockServer;
+
+    private final ObjectMapper mapper = new ObjectMapper();
+
+    @Autowired
+    private TelemetryService telemetryService;
+
+    private TelemetryService telemetryServiceSpy;
+
+    @BeforeEach
+    void init() {
+        telemetryServiceSpy = spy(telemetryService);
+        mockServer = MockRestServiceServer.createServer(restTemplate);
+        telemetryServiceSpy.useTelemetry = true;
+    }
+
+    @Test
+    void testSendTelemetry_TelemetryEnabled() throws Exception {
+        mockServer.expect(ExpectedCount.once(), requestTo(new URI(destination + "/api/telemetry"))).andExpect(method(HttpMethod.POST))
+                .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(mapper.writeValueAsString("Success!")));
+        telemetryServiceSpy.sendTelemetry();
+        mockServer.verify();
+    }
+
+    @Test
+    void testSendTelemetry_TelemetryDisabled() throws Exception {
+        mockServer.expect(ExpectedCount.never(), requestTo(new URI(destination + "/api/telemetry"))).andExpect(method(HttpMethod.POST))
+                .andRespond(withStatus(HttpStatus.OK).contentType(MediaType.APPLICATION_JSON).body(mapper.writeValueAsString("Success!")));
+        telemetryServiceSpy.useTelemetry = false;
+        telemetryServiceSpy.sendTelemetry();
+        mockServer.verify();
+    }
+
+    @Test
+    void testSendTelemetry_ExceptionHandling() throws Exception {
+        mockServer.expect(ExpectedCount.once(), requestTo(new URI(destination + "/api/telemetry"))).andExpect(method(HttpMethod.POST))
+                .andRespond(withServerError().body(mapper.writeValueAsString("Failure!")));
+        telemetryServiceSpy.sendTelemetry();
+        mockServer.verify();
+    }
+}
diff --git a/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java b/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java
index 04c75c487a6f..8b3b6738b219 100644
--- a/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/theia/TheiaInfoContributorTest.java
@@ -23,14 +23,9 @@ class TheiaInfoContributorTest {
     void testContribute() {
         Info.Builder builder = new Info.Builder();
         theiaInfoContributor = new TheiaInfoContributor();
-        try {
-            theiaInfoContributor.contribute(builder);
-        }
-        catch (NullPointerException e) {
-        }
+        theiaInfoContributor.contribute(builder);
 
         Info info = builder.build();
         assertThat(info.getDetails().get(Constants.THEIA_PORTAL_URL)).isEqualTo(expectedValue);
-
     }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java b/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
index 394200342127..7902d3348d51 100644
--- a/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/user/UserTestService.java
@@ -27,13 +27,18 @@
 import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Authority;
 import de.tum.in.www1.artemis.domain.Course;
+import de.tum.in.www1.artemis.domain.ProgrammingSubmission;
 import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.enumeration.SubmissionType;
 import de.tum.in.www1.artemis.domain.science.ScienceEvent;
 import de.tum.in.www1.artemis.domain.science.ScienceEventType;
 import de.tum.in.www1.artemis.exercise.programming.MockDelegate;
 import de.tum.in.www1.artemis.exercise.programming.ProgrammingExerciseUtilService;
 import de.tum.in.www1.artemis.repository.AuthorityRepository;
 import de.tum.in.www1.artemis.repository.CourseRepository;
+import de.tum.in.www1.artemis.repository.ParticipationRepository;
+import de.tum.in.www1.artemis.repository.ParticipationVCSAccessTokenRepository;
+import de.tum.in.www1.artemis.repository.SubmissionRepository;
 import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.repository.science.ScienceEventRepository;
 import de.tum.in.www1.artemis.security.Role;
@@ -106,6 +111,15 @@ public class UserTestService {
 
     private static final int NUMBER_OF_INSTRUCTORS = 1;
 
+    @Autowired
+    private ParticipationVCSAccessTokenRepository participationVCSAccessTokenRepository;
+
+    @Autowired
+    private ParticipationRepository participationRepository;
+
+    @Autowired
+    private SubmissionRepository submissionRepository;
+
     public void setup(String testPrefix, MockDelegate mockDelegate) throws Exception {
         this.TEST_PREFIX = testPrefix;
         this.mockDelegate = mockDelegate;
@@ -817,18 +831,73 @@ public void addAndDeleteSshPublicKey() throws Exception {
 
         // adding invalid key should fail
         String invalidSshKey = "invalid key";
-        request.putWithResponseBody("/api/users/sshpublickey", invalidSshKey, String.class, HttpStatus.BAD_REQUEST, true);
+        request.putWithResponseBody("/api/account/ssh-public-key", invalidSshKey, String.class, HttpStatus.BAD_REQUEST, true);
 
         // adding valid key should work correctly
         String validSshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEbgjoSpKnry5yuMiWh/uwhMG2Jq5Sh8Uw9vz+39or2i email@abc.de";
-        request.putWithResponseBody("/api/users/sshpublickey", validSshKey, String.class, HttpStatus.OK, true);
+        request.putWithResponseBody("/api/account/ssh-public-key", validSshKey, String.class, HttpStatus.OK, true);
         assertThat(userRepository.getUser().getSshPublicKey()).isEqualTo(validSshKey);
 
         // deleting the key shoul work correctly
-        request.delete("/api/users/sshpublickey", HttpStatus.OK);
+        request.delete("/api/account/ssh-public-key", HttpStatus.OK);
         assertThat(userRepository.getUser().getSshPublicKey()).isEqualTo(null);
     }
 
+    // Test
+    public void getAndCreateParticipationVcsAccessToken() throws Exception {
+        User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1");
+
+        // try to get token for non existent participation
+        request.get("/api/account/participation-vcs-access-token?participationId=11", HttpStatus.NOT_FOUND, String.class);
+
+        var course = courseUtilService.addEmptyCourse();
+        var exercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course);
+        courseRepository.save(course);
+
+        var submission = (ProgrammingSubmission) new ProgrammingSubmission().commitHash("abc").type(SubmissionType.MANUAL).submitted(true);
+        submission = programmingExerciseUtilService.addProgrammingSubmission(exercise, submission, user.getLogin());
+        // request existing token
+        var token = request.get("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), HttpStatus.OK, String.class);
+        assertThat(token).isNotNull();
+
+        // delete all tokens
+        participationVCSAccessTokenRepository.deleteAll();
+
+        // check that token was deleted
+        request.get("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), HttpStatus.NOT_FOUND, String.class);
+        var newToken = request.putWithResponseBody("/api/account/participation-vcs-access-token?participationId=" + submission.getParticipation().getId(), null, String.class,
+                HttpStatus.OK);
+        assertThat(newToken).isNotEqualTo(token);
+
+        submissionRepository.delete(submission);
+        participationVCSAccessTokenRepository.deleteAll();
+        participationRepository.deleteById(submission.getParticipation().getId());
+    }
+
+    // Test
+    public void createAndDeleteUserVcsAccessToken() throws Exception {
+        User user = userUtilService.getUserByLogin(TEST_PREFIX + "student1");
+        assertThat(user.getVcsAccessToken()).isNull();
+
+        // Set expiry date to already past date -> Bad Request
+        ZonedDateTime expiryDate = ZonedDateTime.now().minusMonths(1);
+        var userDTO = request.putWithResponseBody("/api/account/user-vcs-access-token?expiryDate=" + expiryDate, null, UserDTO.class, HttpStatus.BAD_REQUEST);
+        assertThat(userDTO).isNull();
+
+        // Correct expiry date -> OK
+        expiryDate = ZonedDateTime.now().plusMonths(1);
+        userDTO = request.putWithResponseBody("/api/account/user-vcs-access-token?expiryDate=" + expiryDate, null, UserDTO.class, HttpStatus.OK);
+        user = userUtilService.getUserByLogin(TEST_PREFIX + "student1");
+        assertThat(user.getVcsAccessToken()).isEqualTo(userDTO.getVcsAccessToken());
+        assertThat(user.getVcsAccessTokenExpiryDate()).isEqualTo(userDTO.getVcsAccessTokenExpiryDate());
+
+        // Delete token
+        request.delete("/api/account/user-vcs-access-token", HttpStatus.OK);
+        user = userUtilService.getUserByLogin(TEST_PREFIX + "student1");
+        assertThat(user.getVcsAccessToken()).isNull();
+        assertThat(user.getVcsAccessTokenExpiryDate()).isNull();
+    }
+
     public UserRepository getUserRepository() {
         return userRepository;
     }
diff --git a/src/test/javascript/spec/component/account/vcs-access-token-settings.component.spec.ts b/src/test/javascript/spec/component/account/vcs-access-token-settings.component.spec.ts
new file mode 100644
index 000000000000..71439b28cfba
--- /dev/null
+++ b/src/test/javascript/spec/component/account/vcs-access-token-settings.component.spec.ts
@@ -0,0 +1,187 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { AccountService } from 'app/core/auth/account.service';
+import { of, throwError } from 'rxjs';
+import { By } from '@angular/platform-browser';
+import { MockComponent, MockPipe } from 'ng-mocks';
+import { ButtonComponent } from 'app/shared/components/button.component';
+import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
+import { User } from 'app/core/user/user.model';
+import { ArtemisTestModule } from '../../test.module';
+import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
+import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
+import { TranslateService } from '@ngx-translate/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { VcsAccessTokensSettingsComponent } from 'app/shared/user-settings/vcs-access-tokens-settings/vcs-access-tokens-settings.component';
+import dayjs from 'dayjs/esm';
+import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
+import { AlertService } from 'app/core/util/alert.service';
+
+describe('VcsAccessTokensSettingsComponent', () => {
+    let fixture: ComponentFixture<VcsAccessTokensSettingsComponent>;
+    let comp: VcsAccessTokensSettingsComponent;
+
+    let accountServiceMock: { getAuthenticationState: jest.Mock; deleteUserVcsAccessToken: jest.Mock; addNewVcsAccessToken: jest.Mock };
+    const alertServiceMock = { error: jest.fn(), addAlert: jest.fn() };
+    let translateService: TranslateService;
+
+    const token = 'initial-token';
+
+    beforeEach(async () => {
+        accountServiceMock = {
+            getAuthenticationState: jest.fn(),
+            deleteUserVcsAccessToken: jest.fn(),
+            addNewVcsAccessToken: jest.fn(),
+        };
+
+        await TestBed.configureTestingModule({
+            imports: [ArtemisTestModule],
+            declarations: [
+                VcsAccessTokensSettingsComponent,
+                TranslatePipeMock,
+                MockPipe(ArtemisDatePipe),
+                MockComponent(ButtonComponent),
+                MockComponent(FormDateTimePickerComponent),
+            ],
+            providers: [
+                { provide: AccountService, useValue: accountServiceMock },
+                { provide: TranslateService, useClass: MockTranslateService },
+                { provide: NgbModal, useClass: MockNgbModalService },
+                { provide: AlertService, useValue: alertServiceMock },
+            ],
+        }).compileComponents();
+        fixture = TestBed.createComponent(VcsAccessTokensSettingsComponent);
+        comp = fixture.componentInstance;
+
+        translateService = TestBed.inject(TranslateService);
+        translateService.currentLang = 'en';
+
+        accountServiceMock.getAuthenticationState.mockReturnValue(of({ id: 1, vcsAccessToken: token, vcsAccessTokenExpiryDate: '11:20' } as User));
+        accountServiceMock.addNewVcsAccessToken.mockReturnValue(of({ id: 1, vcsAccessToken: token, vcsAccessTokenExpiryDate: '11:20' } as User));
+        accountServiceMock.deleteUserVcsAccessToken.mockReturnValue(of({}));
+        jest.spyOn(console, 'error').mockImplementation(() => {});
+    });
+
+    it('should cancel token creation', () => {
+        accountServiceMock.getAuthenticationState.mockReturnValue(of({ id: 1 } as User));
+
+        startTokenCreation();
+
+        // click button to send expiry date to server, to create the new token
+        const createTokenButton = fixture.debugElement.query(By.css('#cancel-vcs-token-creation-button'));
+        createTokenButton.triggerEventHandler('onClick', null);
+        fixture.detectChanges();
+        expect(comp.edit).toBeFalsy();
+    });
+
+    it('should fail token creation with invalid date', () => {
+        accountServiceMock.getAuthenticationState.mockReturnValue(of({ id: 1 } as User));
+        startTokenCreation();
+
+        // add an invalid expiry date
+        comp.expiryDate = dayjs().subtract(7, 'day');
+        comp.validateDate();
+        fixture.detectChanges();
+
+        // click button to send expiry date to server, to create the new token
+        const createTokenButton = fixture.debugElement.query(By.css('#create-vcs-token-button'));
+        createTokenButton.triggerEventHandler('onClick', null);
+        fixture.detectChanges();
+        expect(comp.edit).toBeTruthy();
+        expect(comp.currentUser?.vcsAccessToken).toBeUndefined();
+        expect(alertServiceMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle failed token creation', () => {
+        accountServiceMock.addNewVcsAccessToken.mockImplementation(() => {
+            return throwError(() => new Error('Internal Server error'));
+        });
+
+        accountServiceMock.getAuthenticationState.mockReturnValue(of({ id: 1 } as User));
+        startTokenCreation();
+
+        // add an invalid expiry date
+        comp.expiryDate = dayjs().add(7, 'day');
+        comp.validExpiryDate = true;
+
+        // click button to send expiry date to server, to create the new token
+        const createTokenButton = fixture.debugElement.query(By.css('#create-vcs-token-button'));
+        createTokenButton.triggerEventHandler('onClick', null);
+        fixture.detectChanges();
+        expect(comp.edit).toBeTruthy();
+        expect(alertServiceMock.error).toHaveBeenCalled();
+    });
+
+    it('should create new vcs access token', () => {
+        const newToken = 'new-token';
+        const tokenExpiryDate = dayjs().add(7, 'day');
+
+        accountServiceMock.getAuthenticationState.mockReturnValue(of({ id: 1 } as User));
+        accountServiceMock.addNewVcsAccessToken.mockReturnValue(of({ body: { id: 1, vcsAccessToken: newToken, vcsAccessTokenExpiryDate: tokenExpiryDate.toISOString() } as User }));
+        startTokenCreation();
+
+        // add an expiry date
+        comp.expiryDate = tokenExpiryDate;
+        comp.validateDate();
+        fixture.detectChanges();
+
+        // click button to send expiry date to server, to create the new token
+        const createTokenButton = fixture.debugElement.query(By.css('#create-vcs-token-button'));
+        createTokenButton.triggerEventHandler('onClick', null);
+        fixture.detectChanges();
+
+        expect(comp.edit).toBeFalsy();
+        expect(accountServiceMock.addNewVcsAccessToken).toHaveBeenCalled();
+        expect(comp.currentUser!.vcsAccessToken).toEqual(newToken);
+    });
+
+    it('should delete vcs access token', () => {
+        accountServiceMock.deleteUserVcsAccessToken.mockImplementation(() => {
+            return throwError(() => new Error('Internal Server error'));
+        });
+        comp.ngOnInit();
+        comp.deleteVcsAccessToken();
+        expect(accountServiceMock.deleteUserVcsAccessToken).toHaveBeenCalled();
+        expect(alertServiceMock.error).toHaveBeenCalled();
+    });
+
+    it('should handle error when delete vcs access token fails', () => {
+        const newToken = 'new-token';
+        accountServiceMock.addNewVcsAccessToken.mockReturnValue(of({ id: 1, vcsAccessToken: newToken, vcsAccessTokenExpiryDate: '11:20' } as User));
+        comp.ngOnInit();
+        expect(comp.currentUser!.vcsAccessToken).toEqual(token);
+        comp.deleteVcsAccessToken();
+        expect(accountServiceMock.deleteUserVcsAccessToken).toHaveBeenCalled();
+        expect(comp.currentUser!.vcsAccessToken).toBeUndefined();
+    });
+
+    it('should set wasCopied to true and back to false after 3 seconds on successful copy', () => {
+        comp.ngOnInit();
+
+        jest.useFakeTimers();
+        comp.onCopyFinished(true);
+        expect(comp.wasCopied).toBeTruthy();
+        jest.advanceTimersByTime(3000);
+        expect(comp.wasCopied).toBeFalsy();
+        jest.useRealTimers();
+    });
+
+    it('should not change wasCopied if copy is unsuccessful', () => {
+        comp.ngOnInit();
+        comp.onCopyFinished(false);
+
+        // Verify that wasCopied remains false
+        expect(comp.wasCopied).toBeFalsy();
+    });
+
+    function startTokenCreation() {
+        comp.ngOnInit();
+        fixture.detectChanges();
+        expect(comp.currentUser!.vcsAccessToken).toBeUndefined();
+
+        // click on new token button
+        const addTokenButton = fixture.debugElement.query(By.css('#add-new-token-button'));
+        addTokenButton.triggerEventHandler('onClick', null);
+        fixture.detectChanges();
+        expect(comp.edit).toBeTruthy();
+    }
+});
diff --git a/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts b/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts
index c9f6b2ebd4ee..bbec5290351b 100644
--- a/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts
+++ b/src/test/javascript/spec/component/admin/legal-document-update.component.spec.ts
@@ -6,7 +6,6 @@ import { UnsavedChangesWarningComponent } from 'app/admin/legal/unsaved-changes-
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ArtemisTestModule } from '../../test.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { JhiLanguageHelper } from 'app/core/language/language.helper';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
 import { MockLanguageHelper } from '../../helpers/mocks/service/mock-translate.service';
@@ -19,6 +18,7 @@ import { ActivatedRoute, UrlSegment } from '@angular/router';
 import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { PrivacyStatement } from 'app/entities/privacy-statement.model';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('LegalDocumentUpdateComponent', () => {
     let component: LegalDocumentUpdateComponent;
@@ -35,7 +35,7 @@ describe('LegalDocumentUpdateComponent', () => {
                 MockComponent(UnsavedChangesWarningComponent),
                 MockComponent(ButtonComponent),
                 MockDirective(TranslateDirective),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(ModePickerComponent),
                 MockPipe(ArtemisTranslatePipe),
             ],
@@ -117,7 +117,7 @@ describe('LegalDocumentUpdateComponent', () => {
     it('should correctly determine unsaved changes', () => {
         component.unsavedChanges = false;
         component.legalDocument.text = 'text';
-        component.checkUnsavedChanges('changed text');
+        component.onContentChanged('changed text');
         expect(component.unsavedChanges).toBeTrue();
     });
 
@@ -135,7 +135,7 @@ describe('LegalDocumentUpdateComponent', () => {
                 updateFile = jest.spyOn(legalDocumentService, 'updateImprint').mockReturnValue(of(returnValue));
             }
             component.markdownEditor.markdown = 'text';
-            component.unsavedChanges = true;
+            component.onContentChanged('text');
             const expected = new LegalDocument(documentType, LegalDocumentLanguage.GERMAN);
             expected.text = 'text';
             fixture.detectChanges();
@@ -149,13 +149,12 @@ describe('LegalDocumentUpdateComponent', () => {
             expect(component.unsavedChanges).toBeFalse();
         }),
     );
-    it('should set the value of the markdown editor when switching to the edit mode if the language is changed while in preview mode', () => {
+    it('should set the value of the markdown editor when the language is changed while in preview mode', () => {
         setupRoutes(LegalDocumentType.PRIVACY_STATEMENT);
         const returnValue = new PrivacyStatement(LegalDocumentLanguage.GERMAN);
         returnValue.text = 'new content';
-        const updateTextOnEditSelect = jest.spyOn(component, 'updateTextIfLanguageChangedInPreview').mockImplementation();
+        const parseMarkdownStub = jest.spyOn(component.markdownEditor, 'parseMarkdown').mockImplementation();
         component.markdownEditor.markdown = 'text';
-        component.markdownEditor.previewMode = true;
         component.unsavedChanges = false;
         component.ngOnInit();
         const loadFile = jest.spyOn(legalDocumentService, 'getPrivacyStatementForUpdate').mockReturnValue(of(returnValue));
@@ -164,7 +163,7 @@ describe('LegalDocumentUpdateComponent', () => {
         expect(loadFile).toHaveBeenCalledOnce();
         expect(component.legalDocument.text).toBe('new content');
         component.markdownEditor.onEditSelect.emit();
-        expect(updateTextOnEditSelect).toHaveBeenCalledOnce();
+        expect(parseMarkdownStub).toHaveBeenCalledOnce();
     });
 
     function setupRoutes(documentType: LegalDocumentType) {
diff --git a/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts
index b9b5192b7e70..bc3cfc327be3 100644
--- a/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-dashboard/assessment-dashboard.component.spec.ts
@@ -12,10 +12,10 @@ import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.mode
 import { TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { SecondCorrectionEnableButtonComponent } from 'app/exercises/shared/dashboards/tutor/second-correction-button/second-correction-enable-button.component';
 import { AssessmentDashboardComponent } from 'app/course/dashboards/assessment-dashboard/assessment-dashboard.component';
diff --git a/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts
index 8b424f245ce8..e3e18abc527a 100644
--- a/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-dashboard/exam-assessment-buttons.component.spec.ts
@@ -8,7 +8,7 @@ import { Course } from 'app/entities/course.model';
 import { of, throwError } from 'rxjs';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { User } from 'app/core/user/user.model';
 import dayjs from 'dayjs/esm';
 import { By } from '@angular/platform-browser';
diff --git a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts
index f8bdd14321c4..92a1d051230e 100644
--- a/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-dashboard/exercise-assessment-dashboard.component.spec.ts
@@ -24,19 +24,19 @@ import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.mod
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { FileUploadSubmissionService } from 'app/exercises/file-upload/participate/file-upload-submission.service';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Complaint, ComplaintType } from 'app/entities/complaint.model';
 import { Language } from 'app/entities/course.model';
 import { Submission, SubmissionExerciseType } from 'app/entities/submission.model';
 import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { SecondCorrectionEnableButtonComponent } from 'app/exercises/shared/dashboards/tutor/second-correction-button/second-correction-enable-button.component';
 import { LanguageTableCellComponent } from 'app/exercises/shared/dashboards/tutor/language-table-cell/language-table-cell.component';
diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts
index 0bf67ea63b40..af84f8154c5f 100644
--- a/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-shared/assessment-complaint-alert.component.spec.ts
@@ -3,6 +3,7 @@ import { AssessmentComplaintAlertComponent } from 'app/assessment/assessment-com
 import { ArtemisTestModule } from '../../test.module';
 import { Complaint, ComplaintType } from 'app/entities/complaint.model';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
+import { By } from '@angular/platform-browser';
 
 describe('AssessmentComplaintAlertComponent', () => {
     let component: AssessmentComplaintAlertComponent;
@@ -42,16 +43,16 @@ describe('AssessmentComplaintAlertComponent', () => {
     it('should show complaint alert text for complaint', () => {
         setComplaintOfType(ComplaintType.COMPLAINT);
 
-        const alertNode = fixture.debugElement.children[0];
+        const alertNode = fixture.debugElement.query(By.css('.alert-info'));
         expect(alertNode).toBeTruthy();
-        expect(alertNode.nativeElement.textContent).toContain('artemisApp.complaint.hint');
+        expect(alertNode.attributes['jhiTranslate']).toBe('artemisApp.complaint.hint');
     });
 
     it('should show complaint alert text for more feedback request', () => {
         setComplaintOfType(ComplaintType.MORE_FEEDBACK);
 
-        const alertNode = fixture.debugElement.children[0];
+        const alertNode = fixture.debugElement.query(By.css('.alert-info'));
         expect(alertNode).toBeTruthy();
-        expect(alertNode.nativeElement.textContent).toContain('artemisApp.moreFeedback.hint');
+        expect(alertNode.attributes['jhiTranslate']).toBe('artemisApp.moreFeedback.hint');
     });
 });
diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts
index 83d241b52277..6c151bfbce91 100644
--- a/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-shared/assessment-header.component.spec.ts
@@ -14,7 +14,7 @@ import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.s
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { TranslateDirective, TranslateService } from '@ngx-translate/core';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { GradingSystemService } from 'app/grading-system/grading-system.service';
 import { GradingScale } from 'app/entities/grading-scale.model';
diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts
index 9f823f82f15f..548e3b7b9c1a 100644
--- a/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-shared/assessment-instructions.component.spec.ts
@@ -6,9 +6,9 @@ import { ExpandableSectionComponent } from 'app/assessment/assessment-instructio
 import { StructuredGradingInstructionsAssessmentLayoutComponent } from 'app/assessment/structured-grading-instructions-assessment-layout/structured-grading-instructions-assessment-layout.component';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component';
 import { ExtensionPointDirective } from 'app/shared/extension-point/extension-point.directive';
diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts
index a61789265a44..54ebbc921892 100644
--- a/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-shared/assessment-locks.component.spec.ts
@@ -8,8 +8,8 @@ import { MockHasAnyAuthorityDirective } from '../../helpers/mocks/directive/mock
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ModelingAssessmentService } from 'app/exercises/modeling/assess/modeling-assessment.service';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
 import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service';
diff --git a/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts b/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts
index e7ba6af20d1c..eefbd24f2338 100644
--- a/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts
+++ b/src/test/javascript/spec/component/assessment-shared/assessment-warning.component.spec.ts
@@ -2,9 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import dayjs from 'dayjs/esm';
 import { AssessmentWarningComponent } from 'app/assessment/assessment-warning/assessment-warning.component';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 
 describe('AssessmentWarningComponent', () => {
     let component: AssessmentWarningComponent;
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-actions.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-actions.component.spec.ts
index 9b11c3e3948d..99c170f5720d 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-actions.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-actions.component.spec.ts
@@ -16,7 +16,6 @@ import { CommitState, EditorState } from 'app/exercises/programming/shared/code-
 import { MockModule } from 'ng-mocks';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 
 // Cartesian product helper function
@@ -50,7 +49,7 @@ describe('CodeEditorActionsComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, MockModule(AceEditorModule), MockModule(NgbTooltipModule)],
+            imports: [ArtemisTestModule, MockModule(NgbTooltipModule)],
             declarations: [CodeEditorActionsComponent, TranslatePipeMock, FeatureToggleDirective],
             providers: [
                 { provide: CodeEditorRepositoryService, useClass: MockCodeEditorRepositoryService },
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts
index 3092d1c466ac..87206e5b1fff 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-build-output.component.spec.ts
@@ -1,24 +1,23 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { of } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { CodeEditorBuildOutputComponent } from 'app/exercises/programming/shared/code-editor/build-output/code-editor-build-output.component';
 import { Participation } from 'app/entities/participation/participation.model';
-import { BuildLogEntryArray } from 'app/entities/build-log.model';
+import { BuildLogEntryArray } from 'app/entities/programming/build-log.model';
 import { CodeEditorBuildLogService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { ResultService } from 'app/exercises/shared/result/result.service';
 import { MockResultService } from '../../helpers/mocks/service/mock-result.service';
 import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service';
 import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Result } from 'app/entities/result.model';
-import { StaticCodeAnalysisIssue } from 'app/entities/static-code-analysis-issue.model';
+import { StaticCodeAnalysisIssue } from 'app/entities/programming/static-code-analysis-issue.model';
 import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { MockPipe, MockProvider } from 'ng-mocks';
 import { CodeEditorSubmissionService } from 'app/exercises/programming/shared/code-editor/service/code-editor-submission.service';
@@ -82,7 +81,7 @@ describe('CodeEditorBuildOutputComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule],
+            imports: [ArtemisTestModule],
             declarations: [CodeEditorBuildOutputComponent, MockPipe(ArtemisDatePipe)],
             providers: [
                 { provide: ResultService, useClass: MockResultService },
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts
index 679c1fa41c98..e0916b34a07a 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-file-browser.component.spec.ts
@@ -19,6 +19,7 @@ import { MockCodeEditorConflictStateService } from '../../helpers/mocks/service/
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { TreeviewModule } from 'app/exercises/programming/shared/code-editor/treeview/treeview.module';
 import { TreeviewItem } from 'app/exercises/programming/shared/code-editor/treeview/models/treeview-item';
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 
 describe('CodeEditorFileBrowserComponent', () => {
     let comp: CodeEditorFileBrowserComponent;
@@ -149,6 +150,25 @@ describe('CodeEditorFileBrowserComponent', () => {
         expect(renderedFiles).toHaveLength(3);
     });
 
+    it('should toggle tree compression', () => {
+        comp.repositoryFiles = {
+            file1: FileType.FILE,
+        };
+        const treeNode = {
+            folder: '',
+            file: 'file1',
+            children: [],
+            text: 'file1',
+            value: 'file1',
+        };
+        jest.spyOn(comp, 'buildTree').mockReturnValue([treeNode]);
+        const transformTreeToTreeViewItemStub = jest.spyOn(comp, 'transformTreeToTreeViewItem').mockReturnValue([new TreeviewItem(treeNode)]);
+        comp.compressFolders = false;
+        comp.toggleTreeCompress();
+        expect(comp.compressFolders).toBeTrue();
+        expect(transformTreeToTreeViewItemStub).toHaveBeenCalledExactlyOnceWith([treeNode]);
+    });
+
     it('should create compressed treeviewItems with nested folder structure', () => {
         comp.repositoryFiles = {
             folder: FileType.FOLDER,
@@ -205,7 +225,6 @@ describe('CodeEditorFileBrowserComponent', () => {
         };
         const forbiddenFiles = {
             'danger.bin': FileType.FILE,
-            'README.md': FileType.FILE,
             '.hidden': FileType.FILE,
             '.': FileType.FOLDER,
         };
@@ -310,6 +329,42 @@ describe('CodeEditorFileBrowserComponent', () => {
         expect(renderedFiles).toHaveLength(0);
     });
 
+    it('should select the correct file based on the user selection', () => {
+        const fileToSelect = 'folder/file1';
+        const otherFile = 'folder2/file2';
+        comp.repositoryFiles = {
+            folder: FileType.FOLDER,
+            'folder/file1': FileType.FILE,
+            folder2: FileType.FOLDER,
+            'folder/file2': FileType.FILE,
+        };
+        comp.filesTreeViewItem = [
+            new TreeviewItem({
+                checked: false,
+                text: fileToSelect,
+                value: fileToSelect,
+                children: [],
+            } as any),
+            new TreeviewItem({
+                checked: false,
+                text: otherFile,
+                value: otherFile,
+                children: [],
+            }),
+        ];
+        comp.selectedFile = undefined;
+        const nodeFirstFile = comp.filesTreeViewItem[0];
+        comp.handleNodeSelected(nodeFirstFile);
+        expect(nodeFirstFile.checked).toBeTrue();
+        expect(comp.selectedFile).toBe(fileToSelect);
+        // Deselect the current file.
+        const nodeSecondFile = comp.filesTreeViewItem[1];
+        comp.handleNodeSelected(nodeSecondFile);
+        expect(nodeFirstFile.checked).toBeFalse();
+        expect(nodeSecondFile.checked).toBeTrue();
+        expect(comp.selectedFile).toBe(otherFile);
+    });
+
     it('should set node to checked if its file gets selected and update ui', () => {
         const selectedFile = 'folder/file1';
         const repositoryFiles = {
@@ -505,6 +560,26 @@ describe('CodeEditorFileBrowserComponent', () => {
         expect(createFileStub).not.toHaveBeenCalled();
     });
 
+    it('should manage the root file/folder it is currently creating', () => {
+        comp.setCreatingFileInRoot(FileType.FILE);
+        expect(comp.creatingFile).toEqual(['', FileType.FILE]);
+        comp.setCreatingFileInRoot(FileType.FOLDER);
+        expect(comp.creatingFile).toEqual(['', FileType.FOLDER]);
+        comp.clearCreatingFile();
+        expect(comp.creatingFile).toBeUndefined();
+    });
+
+    it('should manage the file/folder it is currently creating within another folder', () => {
+        const folder = 'folder';
+        const item = { value: folder } as TreeviewItem<string>;
+        comp.setCreatingFile({ item, fileType: FileType.FILE });
+        expect(comp.creatingFile).toEqual([folder, FileType.FILE]);
+        comp.setCreatingFile({ item, fileType: FileType.FOLDER });
+        expect(comp.creatingFile).toEqual([folder, FileType.FOLDER]);
+        comp.clearCreatingFile();
+        expect(comp.creatingFile).toBeUndefined();
+    });
+
     it('should update repository file entry on rename', fakeAsync(() => {
         const fileName = 'file1';
         const afterRename = 'newFileName';
@@ -761,6 +836,18 @@ describe('CodeEditorFileBrowserComponent', () => {
         expect(renamingInput).toBeNull();
     }));
 
+    it('should manage the file it is currently renaming', () => {
+        comp.repositoryFiles = {
+            'folder/file1': FileType.FILE,
+            folder: FileType.FOLDER,
+        };
+        const item = { value: 'folder/file1', text: 'file1' } as TreeviewItem<string>;
+        comp.setRenamingFile(item);
+        expect(comp.renamingFile).toEqual(['folder/file1', 'file1', FileType.FILE]);
+        comp.clearRenamingFile();
+        expect(comp.renamingFile).toBeUndefined();
+    });
+
     it('should disable action buttons if there is a git conflict', () => {
         const repositoryContent: { [fileName: string]: string } = {};
         getStatusStub.mockReturnValue(of({ repositoryStatus: CommitState.CONFLICT }));
@@ -806,6 +893,7 @@ describe('CodeEditorFileBrowserComponent', () => {
         const filteredChangeInformation = {
             'Class.java': true,
             'Document.md': false,
+            'README.md': true,
         };
         const getFilesWithChangeInfoStub = jest.fn().mockReturnValue(of(changeInformation));
         codeEditorRepositoryFileService.getFilesWithInformationAboutChange = getFilesWithChangeInfoStub;
@@ -821,6 +909,21 @@ describe('CodeEditorFileBrowserComponent', () => {
         loadFiles.unsubscribe();
     }));
 
+    it('should open a modal when trying to delete a file', () => {
+        comp.repositoryFiles = {
+            'folder/file1': FileType.FILE,
+            folder: FileType.FOLDER,
+        };
+        const item = { value: 'folder/file1', text: 'file1' } as TreeviewItem<string>;
+        const modalRef = { componentInstance: { parent: undefined, fileNameToDelete: undefined, fileType: undefined } } as NgbModalRef;
+        const openModalStub = jest.spyOn(comp.modalService, 'open').mockReturnValue(modalRef);
+        comp.openDeleteFileModal(item);
+        expect(openModalStub).toHaveBeenCalledOnce();
+        expect(modalRef.componentInstance.parent).toBe(comp);
+        expect(modalRef.componentInstance.fileNameToDelete).toBe('folder/file1');
+        expect(modalRef.componentInstance.fileType).toBe(FileType.FILE);
+    });
+
     describe('getFolderBadges', () => {
         // Mock fileBadges data
         const mockFileBadges = {
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts
index 6e221deca2fb..d77f3e5fb3cd 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-header.component.spec.ts
@@ -2,7 +2,8 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin
 import { CodeEditorHeaderComponent } from 'app/exercises/programming/shared/code-editor/header/code-editor-header.component';
 import { ArtemisTestModule } from '../../test.module';
 import { NgbDropdownMocksModule } from '../../helpers/mocks/directive/ngbDropdownMocks.module';
-import { MAX_TAB_SIZE } from 'app/shared/markdown-editor/ace-editor/ace-editor.component';
+
+import { MAX_TAB_SIZE } from 'app/shared/monaco-editor/monaco-editor.component';
 
 describe('CodeEditorHeaderComponent', () => {
     let fixture: ComponentFixture<CodeEditorHeaderComponent>;
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts
index 1acb8bc88d43..e6a35ac15468 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-monaco.component.spec.ts
@@ -127,7 +127,7 @@ describe('CodeEditorMonacoComponent', () => {
     ])('should correctly lock the editor on changes', (setup: () => void, shouldLock: boolean) => {
         comp.selectedFile = 'file';
         comp.fileSession = {
-            [comp.selectedFile]: { code: 'some code', cursor: { row: 0, column: 0 }, loadingError: false },
+            [comp.selectedFile]: { code: 'some code', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         fixture.detectChanges();
         setup();
@@ -138,7 +138,7 @@ describe('CodeEditorMonacoComponent', () => {
     it('should update the file session and notify when the file content changes', () => {
         const selectedFile = 'file';
         const fileSession = {
-            [selectedFile]: { code: 'some unchanged code', cursor: { row: 0, column: 0 }, loadingError: false },
+            [selectedFile]: { code: 'some unchanged code', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         const newCode = 'some new code';
         const valueCallbackStub = jest.fn();
@@ -161,7 +161,7 @@ describe('CodeEditorMonacoComponent', () => {
         const changeModelStub = jest.spyOn(comp.editor, 'changeModel').mockImplementation();
         const presentFileName = 'present-file';
         const presentFileSession = {
-            [presentFileName]: { code: 'code\ncode', cursor: { row: 1, column: 2 }, loadingError: false },
+            [presentFileName]: { code: 'code\ncode', cursor: { lineNumber: 1, column: 2 }, loadingError: false },
         };
         fixture.detectChanges();
         comp.fileSession = presentFileSession;
@@ -172,7 +172,7 @@ describe('CodeEditorMonacoComponent', () => {
         expect(loadFileFromRepositoryStub).toHaveBeenCalledExactlyOnceWith(fileToLoad.fileName);
         expect(comp.fileSession).toEqual({
             ...presentFileSession,
-            [fileToLoad.fileName]: { code: fileToLoad.fileContent, cursor: { column: 0, row: 0 }, loadingError: false },
+            [fileToLoad.fileName]: { code: fileToLoad.fileContent, cursor: { column: 0, lineNumber: 0 }, loadingError: false },
         });
         expect(setPositionStub).toHaveBeenCalledTimes(2);
         expect(changeModelStub).toHaveBeenCalledTimes(2);
@@ -181,7 +181,7 @@ describe('CodeEditorMonacoComponent', () => {
     it('should load a selected file after a loading error', async () => {
         const fileToLoad = { fileName: 'file-to-load', fileContent: 'some code' };
         // File session after loading fails
-        const fileSession = { [fileToLoad.fileName]: { code: '', loadingError: true, cursor: { row: 0, column: 0 } } };
+        const fileSession = { [fileToLoad.fileName]: { code: '', loadingError: true, cursor: { lineNumber: 0, column: 0 } } };
         const loadedFileSubject = new BehaviorSubject(fileToLoad);
         loadFileFromRepositoryStub.mockReturnValue(loadedFileSubject);
         comp.fileSession = fileSession;
@@ -189,14 +189,14 @@ describe('CodeEditorMonacoComponent', () => {
         fixture.detectChanges();
         await comp.ngOnChanges({ selectedFile: new SimpleChange(undefined, fileToLoad, false) });
         expect(loadFileFromRepositoryStub).toHaveBeenCalledOnce();
-        expect(comp.fileSession).toEqual({ [fileToLoad.fileName]: { code: fileToLoad.fileContent, loadingError: false, cursor: { row: 0, column: 0 } } });
+        expect(comp.fileSession).toEqual({ [fileToLoad.fileName]: { code: fileToLoad.fileContent, loadingError: false, cursor: { lineNumber: 0, column: 0 } } });
     });
 
     it('should not load binaries into the editor', async () => {
         const changeModelSpy = jest.spyOn(comp.editor, 'changeModel');
         const fileName = 'file-to-load';
         comp.fileSession = {
-            [fileName]: { code: '\0\0\0\0 (binary content)', loadingError: false, cursor: { row: 0, column: 0 } },
+            [fileName]: { code: '\0\0\0\0 (binary content)', loadingError: false, cursor: { lineNumber: 0, column: 0 } },
         };
         fixture.detectChanges();
         comp.selectedFile = fileName;
@@ -221,7 +221,7 @@ describe('CodeEditorMonacoComponent', () => {
         await comp.ngOnChanges({ selectedFile: new SimpleChange(undefined, fileToLoad.fileName, false) });
         expect(loadFileFromRepositoryStub).toHaveBeenCalledOnce();
         expect(errorCallbackStub).toHaveBeenCalledExactlyOnceWith(errorCode);
-        expect(comp.fileSession).toEqual({ [fileToLoad.fileName]: { code: '', loadingError: true, cursor: { row: 0, column: 0 } } });
+        expect(comp.fileSession).toEqual({ [fileToLoad.fileName]: { code: '', loadingError: true, cursor: { lineNumber: 0, column: 0 } } });
     });
 
     it('should discard local changes when the editor is refreshed', async () => {
@@ -231,14 +231,14 @@ describe('CodeEditorMonacoComponent', () => {
         loadFileFromRepositoryStub.mockReturnValue(reloadedFileSubject);
         comp.selectedFile = fileToReload.fileName;
         comp.fileSession = {
-            [fileToReload.fileName]: { code: 'some local undiscarded changes', cursor: { row: 0, column: 0 }, loadingError: false },
+            [fileToReload.fileName]: { code: 'some local undiscarded changes', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         comp.editorState = EditorState.CLEAN;
         fixture.detectChanges();
         // Simulate a refresh of the editor.
         await comp.ngOnChanges({ editorState: new SimpleChange(EditorState.REFRESHING, EditorState.CLEAN, false) });
         expect(comp.fileSession).toEqual({
-            [fileToReload.fileName]: { code: fileToReload.fileContent, cursor: { row: 0, column: 0 }, loadingError: false },
+            [fileToReload.fileName]: { code: fileToReload.fileContent, cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         });
         expect(editorResetStub).toHaveBeenCalledOnce();
     });
@@ -246,7 +246,7 @@ describe('CodeEditorMonacoComponent', () => {
     it('should only load the currently selected file', async () => {
         const changeModelSpy = jest.spyOn(comp.editor, 'changeModel');
         // Occurs when the first file load takes a while, but the user has already selected another file.
-        comp.fileSession = { ['file2']: { code: 'code2', cursor: { row: 0, column: 0 }, loadingError: false } };
+        comp.fileSession = { ['file2']: { code: 'code2', cursor: { lineNumber: 0, column: 0 }, loadingError: false } };
         fixture.detectChanges();
         comp.selectedFile = 'file1';
         const longLoadingFileSubject = new Subject();
@@ -266,7 +266,7 @@ describe('CodeEditorMonacoComponent', () => {
         fixture.detectChanges();
         const selectedFile = 'file1';
         const fileSession = {
-            [selectedFile]: { code: 'code\ncode', cursor: { row: 1, column: 2 }, loadingError: false },
+            [selectedFile]: { code: 'code\ncode', cursor: { lineNumber: 1, column: 2 }, loadingError: false },
         };
         comp.fileSession = fileSession;
         comp.selectedFile = selectedFile;
@@ -331,8 +331,8 @@ describe('CodeEditorMonacoComponent', () => {
     }));
 
     it('should add a new feedback widget', fakeAsync(() => {
+        // Feedback is stored as 0-based line numbers, but the editor requires 1-based line numbers.
         const feedbackLineOneBased = 3;
-        // Will be removed once Ace is gone.
         const feedbackLineZeroBased = feedbackLineOneBased - 1;
         const addLineWidgetStub = jest.spyOn(comp.editor, 'addLineWidget').mockImplementation();
         const element = document.createElement('div');
@@ -427,8 +427,8 @@ describe('CodeEditorMonacoComponent', () => {
         const newFileName = 'new-file-name';
         const otherFileName = 'other-file';
         const fileSession = {
-            [oldFileName]: { code: 'renamed', cursor: { row: 0, column: 0 }, loadingError: false },
-            [otherFileName]: { code: 'unrelated', cursor: { row: 0, column: 0 }, loadingError: false },
+            [oldFileName]: { code: 'renamed', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
+            [otherFileName]: { code: 'unrelated', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         fixture.detectChanges();
         comp.fileSession = { ...fileSession };
@@ -444,8 +444,8 @@ describe('CodeEditorMonacoComponent', () => {
         const fileToDeleteName = 'file-to-delete';
         const otherFileName = 'other-file';
         const fileSession = {
-            [fileToDeleteName]: { code: 'will be deleted', cursor: { row: 0, column: 0 }, loadingError: false },
-            [otherFileName]: { code: 'unrelated', cursor: { row: 0, column: 0 }, loadingError: false },
+            [fileToDeleteName]: { code: 'will be deleted', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
+            [otherFileName]: { code: 'unrelated', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         fixture.detectChanges();
         comp.fileSession = { ...fileSession };
@@ -460,7 +460,7 @@ describe('CodeEditorMonacoComponent', () => {
         const fileToCreateName = 'file-to-create';
         const otherFileName = 'other-file';
         const fileSession = {
-            [otherFileName]: { code: 'unrelated', cursor: { row: 0, column: 0 }, loadingError: false },
+            [otherFileName]: { code: 'unrelated', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         };
         fixture.detectChanges();
         comp.fileSession = { ...fileSession };
@@ -468,7 +468,7 @@ describe('CodeEditorMonacoComponent', () => {
         await comp.onFileChange(createFileChange);
         expect(comp.fileSession).toEqual({
             [otherFileName]: fileSession[otherFileName],
-            [fileToCreateName]: { code: '', cursor: { row: 0, column: 0 }, loadingError: false },
+            [fileToCreateName]: { code: '', cursor: { lineNumber: 0, column: 0 }, loadingError: false },
         });
     });
 
diff --git a/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts b/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts
index 1f8d058725f9..d39be7e531e3 100644
--- a/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts
+++ b/src/test/javascript/spec/component/code-editor/code-editor-status.component.spec.ts
@@ -1,13 +1,12 @@
-import { DebugElement } from '@angular/core/';
+import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
 import { ArtemisTestModule } from '../../test.module';
 import { By } from '@angular/platform-browser';
 import { CodeEditorStatusComponent } from 'app/exercises/programming/shared/code-editor/status/code-editor-status.component';
 import { CommitState } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
-import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { MockModule } from 'ng-mocks';
+import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 
 describe('CodeEditorStatusComponent', () => {
     let comp: CodeEditorStatusComponent;
@@ -15,36 +14,51 @@ describe('CodeEditorStatusComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, MockModule(NgbTooltipModule)],
+            imports: [ArtemisTestModule, MockModule(NgbTooltipModule)],
             declarations: [CodeEditorStatusComponent, TranslatePipeMock],
         })
             .compileComponents()
             .then(() => {
                 fixture = TestBed.createComponent(CodeEditorStatusComponent);
                 comp = fixture.componentInstance;
+                fixture.detectChanges();
             });
     });
 
+    it('should create', () => {
+        expect(comp).toBeTruthy();
+    });
+
     it('should show an empty status segment for CommitState if no EditorState is given', () => {
+        fixture.detectChanges();
         const commitStateSegment = fixture.debugElement.query(By.css('#commit_state'));
-        expect(commitStateSegment.children).toBeEmpty();
+        expect(commitStateSegment.children).toHaveLength(0);
     });
 
-    Object.keys(CommitState).map((commitState) =>
-        it(`should show exactly one status segment for CommitState ${commitState} with an icon and a non empty description`, () => {
+    const commitStateToTranslationKey = {
+        UNDEFINED: 'artemisApp.editor.changesUndefined',
+        COULD_NOT_BE_RETRIEVED: 'artemisApp.editor.changesError',
+        CONFLICT: 'artemisApp.editor.changesConflict',
+        CLEAN: 'artemisApp.editor.changesSubmitted',
+        UNCOMMITTED_CHANGES: 'artemisApp.editor.unsubmittedChanges',
+        COMMITTING: 'artemisApp.editor.submittingChanges',
+    };
+
+    Object.keys(CommitState).forEach((commitState) =>
+        it(`should show exactly one status segment for CommitState ${commitState} with an icon and a non-empty description`, () => {
             comp.commitState = commitState as CommitState;
             fixture.detectChanges();
             const commitStateSegment = fixture.debugElement.query(By.css('#commit_state'));
-            showsExactlyOneStatusSegment(commitStateSegment);
+            showsExactlyOneStatusSegment(commitStateSegment, commitStateToTranslationKey[commitState as keyof typeof commitStateToTranslationKey]);
         }),
     );
 
-    const showsExactlyOneStatusSegment = (stateSegment: DebugElement) => {
+    const showsExactlyOneStatusSegment = (stateSegment: DebugElement, expectedKey: string) => {
         expect(stateSegment.children).toHaveLength(1);
         const icon = stateSegment.query(By.css('fa-icon'));
         expect(icon).not.toBeNull();
-        const text = stateSegment.query(By.css('span'));
+        const text = stateSegment.query(By.css('span[jhiTranslate]'));
         expect(text).not.toBeNull();
-        expect(text.nativeElement.textContent).not.toBe('');
+        expect(text.attributes['jhiTranslate']).toBe(expectedKey);
     };
 });
diff --git a/src/test/javascript/spec/component/competencies/competency-form.component.spec.ts b/src/test/javascript/spec/component/competencies/competency-form.component.spec.ts
index ebe7506fbc81..40ef3c893792 100644
--- a/src/test/javascript/spec/component/competencies/competency-form.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/competency-form.component.spec.ts
@@ -7,7 +7,7 @@ import { Competency, CompetencyTaxonomy } from 'app/entities/competency.model';
 import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { Lecture } from 'app/entities/lecture.model';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
-import { MockProvider } from 'ng-mocks';
+import { MockComponent, MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
@@ -17,6 +17,8 @@ import { CompetencyFormComponent } from 'app/course/competencies/forms/competenc
 import { CourseCompetencyFormData } from 'app/course/competencies/forms/course-competency-form.component';
 import { By } from '@angular/platform-browser';
 import { CommonCourseCompetencyFormComponent } from 'app/course/competencies/forms/common-course-competency-form.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 describe('CompetencyFormComponent', () => {
     let competencyFormComponentFixture: ComponentFixture<CompetencyFormComponent>;
@@ -30,6 +32,10 @@ describe('CompetencyFormComponent', () => {
             declarations: [],
             providers: [MockProvider(CompetencyService), MockProvider(LectureUnitService), { provide: TranslateService, useClass: MockTranslateService }],
         })
+            .overrideModule(ArtemisMarkdownEditorModule, {
+                remove: { exports: [MarkdownEditorMonacoComponent] },
+                add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] },
+            })
             .compileComponents()
             .then(() => {
                 competencyFormComponentFixture = TestBed.createComponent(CompetencyFormComponent);
diff --git a/src/test/javascript/spec/component/competencies/competency.service.spec.ts b/src/test/javascript/spec/component/competencies/competency.service.spec.ts
index 2b8a4c46813a..2d0bc277e85b 100644
--- a/src/test/javascript/spec/component/competencies/competency.service.spec.ts
+++ b/src/test/javascript/spec/component/competencies/competency.service.spec.ts
@@ -197,7 +197,7 @@ describe('CompetencyService', () => {
         const expected = defaultCompetencies;
         let response: any;
 
-        competencyService.generateCompetenciesFromCourseDescription(description, 1).subscribe((resp) => (response = resp));
+        competencyService.generateCompetenciesFromCourseDescription(1, description, []).subscribe((resp) => (response = resp));
         const req = httpTestingController.expectOne({ method: 'POST' });
         req.flush(returnedFromService);
         tick();
diff --git a/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts b/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts
index 9581c68a404a..88b261712f1f 100644
--- a/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/edit-competency.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MockProvider } from 'ng-mocks';
+import { MockComponent, MockProvider } from 'ng-mocks';
 import { AlertService } from 'app/core/util/alert.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { of } from 'rxjs';
@@ -15,6 +15,8 @@ import { MockRouter } from '../../helpers/mocks/mock-router';
 import { CompetencyFormStubComponent } from './competency-form-stub.component';
 import { ArtemisTestModule } from '../../test.module';
 import { CompetencyFormComponent } from 'app/course/competencies/forms/competency/competency-form.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 describe('EditCompetencyComponent', () => {
     let editCompetencyComponentFixture: ComponentFixture<EditCompetencyComponent>;
@@ -56,6 +58,10 @@ describe('EditCompetencyComponent', () => {
             ],
             schemas: [],
         })
+            .overrideModule(ArtemisMarkdownEditorModule, {
+                remove: { exports: [MarkdownEditorMonacoComponent] },
+                add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] },
+            })
             .compileComponents()
             .then(() => {
                 editCompetencyComponentFixture = TestBed.createComponent(EditCompetencyComponent);
diff --git a/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts b/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts
index 50e21caf9dfa..7e1009b2d1e8 100644
--- a/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/edit-prerequisite.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { MockProvider } from 'ng-mocks';
+import { MockComponent, MockProvider } from 'ng-mocks';
 import { AlertService } from 'app/core/util/alert.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { of } from 'rxjs';
@@ -16,6 +16,8 @@ import { EditPrerequisiteComponent } from 'app/course/competencies/edit/edit-pre
 import { PrerequisiteService } from 'app/course/competencies/prerequisite.service';
 import { PrerequisiteFormComponent } from 'app/course/competencies/forms/prerequisite/prerequisite-form.component';
 import { PrerequisiteFormStubComponent } from './prerequisite-form-stub.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 describe('EditPrerequisiteComponent', () => {
     let editPrerequisiteComponentFixture: ComponentFixture<EditPrerequisiteComponent>;
@@ -57,6 +59,10 @@ describe('EditPrerequisiteComponent', () => {
             ],
             schemas: [],
         })
+            .overrideModule(ArtemisMarkdownEditorModule, {
+                remove: { exports: [MarkdownEditorMonacoComponent] },
+                add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] },
+            })
             .compileComponents()
             .then(() => {
                 editPrerequisiteComponentFixture = TestBed.createComponent(EditPrerequisiteComponent);
diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts
index a2ee1c0c064b..b97f8099cd1d 100644
--- a/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/generate-competencies/competency-recommendation-detail.component.spec.ts
@@ -11,8 +11,8 @@ import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbColl
 import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('CompetencyRecommendationDetailComponent', () => {
     let competencyRecommendationDetailComponentFixture: ComponentFixture<CompetencyRecommendationDetailComponent>;
@@ -28,7 +28,7 @@ describe('CompetencyRecommendationDetailComponent', () => {
                 MockDirective(TranslateDirective),
                 MockPipe(ArtemisTranslatePipe),
                 MockPipe(HtmlForMarkdownPipe),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(TaxonomySelectComponent),
             ],
             providers: [],
diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts
index 20cfba29cac7..86f602263226 100644
--- a/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/generate-competencies/course-description-form.component.spec.ts
@@ -70,4 +70,14 @@ describe('CourseDescriptionFormComponent', () => {
         courseDescriptionComponent.courseDescriptionControl.setValue(descriptionTooLong);
         expect(courseDescriptionComponent.isSubmitPossible).toBeFalse();
     });
+
+    it('should update the description', () => {
+        courseDescriptionComponentFixture.detectChanges();
+
+        expect(courseDescriptionComponent.courseDescriptionControl.value).toEqual(courseDescriptionComponent.placeholder);
+
+        const description = 'I'.repeat(courseDescriptionComponent['DESCRIPTION_MIN'] + 1);
+        courseDescriptionComponent.setCourseDescription(description);
+        expect(courseDescriptionComponent.courseDescriptionControl.value).toEqual(description);
+    });
 });
diff --git a/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts b/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts
index f1dc252ada53..6888c6d994ea 100644
--- a/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/generate-competencies/generate-competencies.component.spec.ts
@@ -1,4 +1,4 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { ArtemisTestModule } from '../../../test.module';
@@ -12,7 +12,7 @@ import { CompetencyService } from 'app/course/competencies/competency.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { MockNgbModalService } from '../../../helpers/mocks/service/mock-ngb-modal.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { of } from 'rxjs';
+import { Subject, of } from 'rxjs';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
 import { CourseDescriptionFormStubComponent } from './course-description-form-stub.component';
 import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route';
@@ -21,17 +21,23 @@ import { HttpResponse } from '@angular/common/http';
 import { By } from '@angular/platform-browser';
 import { CompetencyRecommendationDetailComponent } from 'app/course/competencies/generate-competencies/competency-recommendation-detail.component';
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
+import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
+import { IrisStageStateDTO } from 'app/entities/iris/iris-stage-dto.model';
 import { CourseDescriptionFormComponent } from 'app/course/competencies/generate-competencies/course-description-form.component';
 import { CourseCompetencyService } from 'app/course/competencies/course-competency.service';
 import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module';
+import { CourseManagementService } from 'app/course/manage/course-management.service';
 
 describe('GenerateCompetenciesComponent', () => {
     let generateCompetenciesComponentFixture: ComponentFixture<GenerateCompetenciesComponent>;
     let generateCompetenciesComponent: GenerateCompetenciesComponent;
+    let mockWebSocketSubject: Subject<any>;
 
     beforeEach(() => {
+        mockWebSocketSubject = new Subject<any>();
+
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, GenerateCompetenciesComponent, ArtemisSharedCommonModule, ArtemisSharedComponentModule, ArtemisCompetenciesModule],
             declarations: [
@@ -50,6 +56,16 @@ describe('GenerateCompetenciesComponent', () => {
                     useValue: new MockActivatedRoute({ courseId: 1 }),
                 },
                 { provide: Router, useClass: MockRouter },
+                {
+                    provide: JhiWebsocketService,
+                    useValue: {
+                        subscribe: jest.fn(),
+                        receive: jest.fn(() => mockWebSocketSubject.asObservable()),
+                        unsubscribe: jest.fn(),
+                    },
+                },
+                MockProvider(CourseDescriptionFormComponent),
+                MockProvider(CourseManagementService),
                 MockProvider(CourseCompetencyService),
                 MockProvider(CompetencyService),
                 MockProvider(AlertService),
@@ -85,11 +101,32 @@ describe('GenerateCompetenciesComponent', () => {
         expect(getCompetencyRecommendationsSpy).toHaveBeenCalledOnce();
     });
 
+    it('should initialize the form with the course description', fakeAsync(() => {
+        generateCompetenciesComponentFixture.detectChanges();
+        const courseDescription = 'Course Description';
+
+        const courseDescriptionComponent: CourseDescriptionFormComponent = generateCompetenciesComponentFixture.debugElement.query(
+            By.directive(CourseDescriptionFormComponent),
+        ).componentInstance;
+        const setCourseDescriptionSpy = jest.spyOn(courseDescriptionComponent, 'setCourseDescription');
+
+        // mock the course returned by CourseManagementService
+        const course = { description: courseDescription };
+        const courseManagementService = TestBed.inject(CourseManagementService);
+        const getCourseSpy = jest.spyOn(courseManagementService, 'find').mockReturnValue(of(new HttpResponse({ body: course })));
+
+        generateCompetenciesComponent.ngOnInit();
+        tick();
+
+        expect(getCourseSpy).toHaveBeenCalledOnce();
+        expect(setCourseDescriptionSpy).toHaveBeenCalledWith(courseDescription);
+    }));
+
     it('should add competency recommendations', () => {
         generateCompetenciesComponentFixture.detectChanges();
         const courseDescription = 'Course Description';
         const response = new HttpResponse({
-            body: [{}, {}],
+            body: null,
             status: 200,
         });
         const courseCompetencyService = TestBed.inject(CourseCompetencyService);
@@ -100,10 +137,15 @@ describe('GenerateCompetenciesComponent', () => {
         expect(generateCompetenciesComponent.competencies.value).toHaveLength(0);
 
         generateCompetenciesComponent.getCompetencyRecommendations(courseDescription);
+        const websocketMessage = {
+            stages: [{ state: IrisStageStateDTO.DONE }],
+            result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }],
+        };
+        mockWebSocketSubject.next(websocketMessage);
         generateCompetenciesComponentFixture.detectChanges();
 
-        expect(generateCompetenciesComponentFixture.debugElement.queryAll(By.directive(CompetencyRecommendationDetailComponent))).toHaveLength(2);
-        expect(generateCompetenciesComponent.competencies.value).toHaveLength(2);
+        expect(generateCompetenciesComponentFixture.debugElement.queryAll(By.directive(CompetencyRecommendationDetailComponent))).toHaveLength(1);
+        expect(generateCompetenciesComponent.competencies.value).toHaveLength(1);
         expect(getSpy).toHaveBeenCalledOnce();
     });
 
@@ -190,17 +232,30 @@ describe('GenerateCompetenciesComponent', () => {
 
     it('should display alerts after generating', () => {
         const alertService = TestBed.inject(AlertService);
+        const response = new HttpResponse({
+            body: null,
+            status: 200,
+        });
         const courseCompetencyService = TestBed.inject(CourseCompetencyService);
-        const generateCompetenciesMock = jest.spyOn(courseCompetencyService, 'generateCompetenciesFromCourseDescription');
+        const generateCompetenciesMock = jest.spyOn(courseCompetencyService, 'generateCompetenciesFromCourseDescription').mockReturnValue(of(response));
 
-        generateCompetenciesMock.mockReturnValue(of({ body: [{ id: 1 }] } as HttpResponse<Competency[]>));
         const successMock = jest.spyOn(alertService, 'success');
-        generateCompetenciesComponent.getCompetencyRecommendations('');
+        generateCompetenciesComponent.getCompetencyRecommendations('Cool course description');
+        const websocketMessage = {
+            stages: [{ state: IrisStageStateDTO.DONE }],
+            result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }],
+        };
+        mockWebSocketSubject.next(websocketMessage);
         expect(successMock).toHaveBeenCalledOnce();
+        expect(generateCompetenciesMock).toHaveBeenCalledOnce();
 
-        generateCompetenciesMock.mockReturnValue(of({} as HttpResponse<Competency[]>));
         const warnMock = jest.spyOn(alertService, 'warning');
-        generateCompetenciesComponent.getCompetencyRecommendations('');
+        generateCompetenciesComponent.getCompetencyRecommendations('Cool course description');
+        const errorMessage = {
+            stages: [{ state: IrisStageStateDTO.ERROR }],
+            result: [{ title: 'Title', description: 'Description', taxonomy: CompetencyTaxonomy.ANALYZE }],
+        };
+        mockWebSocketSubject.next(errorMessage);
         expect(warnMock).toHaveBeenCalled();
     });
 
diff --git a/src/test/javascript/spec/component/competencies/prerequisite-form.component.spec.ts b/src/test/javascript/spec/component/competencies/prerequisite-form.component.spec.ts
index 3a3e852e4c39..4471d024976b 100644
--- a/src/test/javascript/spec/component/competencies/prerequisite-form.component.spec.ts
+++ b/src/test/javascript/spec/component/competencies/prerequisite-form.component.spec.ts
@@ -6,7 +6,7 @@ import { CompetencyTaxonomy } from 'app/entities/competency.model';
 import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { Lecture } from 'app/entities/lecture.model';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
-import { MockProvider } from 'ng-mocks';
+import { MockComponent, MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
@@ -19,6 +19,8 @@ import { CommonCourseCompetencyFormComponent } from 'app/course/competencies/for
 import { PrerequisiteFormComponent } from 'app/course/competencies/forms/prerequisite/prerequisite-form.component';
 import { PrerequisiteService } from 'app/course/competencies/prerequisite.service';
 import { Prerequisite } from 'app/entities/prerequisite.model';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
 
 describe('PrerequisiteFormComponent', () => {
     let prerequisiteFormComponentFixture: ComponentFixture<PrerequisiteFormComponent>;
@@ -29,9 +31,12 @@ describe('PrerequisiteFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [CompetencyFormComponent, ArtemisTestModule, ReactiveFormsModule, NgbDropdownModule],
-            declarations: [],
             providers: [MockProvider(PrerequisiteService), MockProvider(LectureUnitService), { provide: TranslateService, useClass: MockTranslateService }],
         })
+            .overrideModule(ArtemisMarkdownEditorModule, {
+                remove: { exports: [MarkdownEditorMonacoComponent] },
+                add: { exports: [MockComponent(MarkdownEditorMonacoComponent)], declarations: [MockComponent(MarkdownEditorMonacoComponent)] },
+            })
             .compileComponents()
             .then(() => {
                 prerequisiteFormComponentFixture = TestBed.createComponent(PrerequisiteFormComponent);
diff --git a/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts b/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts
index 23ceabf755ac..3911a601d7df 100644
--- a/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts
+++ b/src/test/javascript/spec/component/competencies/prerequisite.service.spec.ts
@@ -198,7 +198,7 @@ describe('PrerequisiteService', () => {
         const expected = defaultPrerequisites;
         let response: any;
 
-        prerequisiteService.generateCompetenciesFromCourseDescription(description, 1).subscribe((resp) => (response = resp));
+        prerequisiteService.generateCompetenciesFromCourseDescription(1, description, []).subscribe((resp) => (response = resp));
         const req = httpTestingController.expectOne({ method: 'POST' });
         req.flush(returnedFromService);
         tick();
diff --git a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts
index 149e46dae205..5d93f7870fa0 100644
--- a/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts
+++ b/src/test/javascript/spec/component/complaints/complaint-response.service.spec.ts
@@ -9,7 +9,7 @@ import { AccountService } from 'app/core/auth/account.service';
 import { MockProvider } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { User } from 'app/core/user/user.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ComplaintAction, ComplaintResponseUpdateDTO } from 'app/entities/complaint-response-dto.model';
 
 describe('ComplaintResponseService', () => {
diff --git a/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts b/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts
index 58ba0cd9a035..528e9d6d5c6a 100644
--- a/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts
+++ b/src/test/javascript/spec/component/complaints/complaint-student-view.component.spec.ts
@@ -7,7 +7,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Submission } from 'app/entities/submission.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { Observable, of } from 'rxjs';
diff --git a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts
index 95b704d76e81..959355b8d92a 100644
--- a/src/test/javascript/spec/component/complaints/complaint.service.spec.ts
+++ b/src/test/javascript/spec/component/complaints/complaint.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed } from '@angular/core/testing';
 import { ComplaintService } from 'app/complaints/complaint.service';
 import { Complaint, ComplaintType } from 'app/entities/complaint.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
 import { User } from 'app/core/user/user.model';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts
index 0a6055063b27..c8fdeedcc452 100644
--- a/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts
+++ b/src/test/javascript/spec/component/complaints/complaints-for-tutor.component.spec.ts
@@ -4,7 +4,7 @@ import { ComplaintResponseService } from 'app/complaints/complaint-response.serv
 import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor/complaints-for-tutor.component';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { TextareaCounterComponent } from 'app/shared/textarea/textarea-counter.component';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AlertService } from 'app/core/util/alert.service';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
@@ -17,6 +17,7 @@ import { HttpResponse } from '@angular/common/http';
 import { of } from 'rxjs';
 import { Course } from 'app/entities/course.model';
 import { Exercise } from 'app/entities/exercise.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('ComplaintsForTutorComponent', () => {
     let complaintsForTutorComponent: ComplaintsForTutorComponent;
@@ -29,7 +30,13 @@ describe('ComplaintsForTutorComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [RouterTestingModule.withRoutes([]), FormsModule],
-            declarations: [ComplaintsForTutorComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe), MockComponent(TextareaCounterComponent)],
+            declarations: [
+                ComplaintsForTutorComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockPipe(ArtemisDatePipe),
+                MockComponent(TextareaCounterComponent),
+                MockDirective(TranslateDirective),
+            ],
             providers: [MockProvider(ComplaintResponseService), MockProvider(ComplaintService), MockProvider(AlertService)],
         })
             .compileComponents()
diff --git a/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts b/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts
index aeff086bc8e6..e3abe463b09d 100644
--- a/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts
+++ b/src/test/javascript/spec/component/complaints/list-of-complaints.component.spec.ts
@@ -13,8 +13,8 @@ import { Complaint, ComplaintType } from 'app/entities/complaint.model';
 import { Course } from 'app/entities/course.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Result } from 'app/entities/result.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { SortService } from 'app/shared/service/sort.service';
 import dayjs from 'dayjs/esm';
diff --git a/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts b/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts
index 78a8c5a7577c..5a845b83473d 100644
--- a/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts
+++ b/src/test/javascript/spec/component/consistency-check/consistency-check.component.spec.ts
@@ -1,6 +1,6 @@
 import { ConsistencyCheckComponent } from 'app/shared/consistency-check/consistency-check.component';
 import { ConsistencyCheckService } from 'app/shared/consistency-check/consistency-check.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { ConsistencyCheckError, ErrorType } from 'app/entities/consistency-check-result.model';
 import { ArtemisTestModule } from '../../test.module';
diff --git a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts
index 017814b34c5e..3a2e57aa1588 100644
--- a/src/test/javascript/spec/component/course/course-exercises.component.spec.ts
+++ b/src/test/javascript/spec/component/course/course-exercises.component.spec.ts
@@ -29,6 +29,7 @@ import { SidebarComponent } from 'app/shared/sidebar/sidebar.component';
 import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
 import { By } from '@angular/platform-browser';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('CourseExercisesComponent', () => {
     let fixture: ComponentFixture<CourseExercisesComponent>;
@@ -44,7 +45,7 @@ describe('CourseExercisesComponent', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, FormsModule, RouterTestingModule.withRoutes([]), MockModule(ReactiveFormsModule)],
+            imports: [ArtemisTestModule, FormsModule, RouterTestingModule.withRoutes([]), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)],
             declarations: [
                 CourseExercisesComponent,
                 SidebarComponent,
diff --git a/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts b/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts
index c8d23f7f5ddc..2912262c8621 100644
--- a/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts
+++ b/src/test/javascript/spec/component/course/course-lti-configuration.component.spec.ts
@@ -11,7 +11,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { CourseLtiConfigurationComponent } from 'app/course/manage/course-lti-configuration/course-lti-configuration.component';
 import { SortService } from 'app/shared/service/sort.service';
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
diff --git a/src/test/javascript/spec/component/course/course-overview.component.spec.ts b/src/test/javascript/spec/component/course/course-overview.component.spec.ts
index cb3496dcb9b7..b411f3760596 100644
--- a/src/test/javascript/spec/component/course/course-overview.component.spec.ts
+++ b/src/test/javascript/spec/component/course/course-overview.component.spec.ts
@@ -31,7 +31,7 @@ import { AlertService } from 'app/core/util/alert.service';
 import { AfterViewInit, ChangeDetectorRef, Component, TemplateRef, ViewChild } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TeamAssignmentPayload } from 'app/entities/team.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { CompetencyService } from 'app/course/competencies/competency.service';
 import { CourseOverviewComponent } from 'app/overview/course-overview.component';
 import { BarControlConfiguration, BarControlConfigurationProvider } from 'app/shared/tab-bar/tab-bar';
diff --git a/src/test/javascript/spec/component/course/course-overview.service.spec.ts b/src/test/javascript/spec/component/course/course-overview.service.spec.ts
index d0527dde176a..7dbc94aabaea 100644
--- a/src/test/javascript/spec/component/course/course-overview.service.spec.ts
+++ b/src/test/javascript/spec/component/course/course-overview.service.spec.ts
@@ -11,8 +11,8 @@ import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ChannelDTO, ChannelSubType, getAsChannelDTO } from 'app/entities/metis/conversation/channel.model';
 
 describe('CourseOverviewService', () => {
diff --git a/src/test/javascript/spec/component/course/course-update.component.spec.ts b/src/test/javascript/spec/component/course/course-update.component.spec.ts
index 9566d806f9cf..289e91dbd948 100644
--- a/src/test/javascript/spec/component/course/course-update.component.spec.ts
+++ b/src/test/javascript/spec/component/course/course-update.component.spec.ts
@@ -29,7 +29,7 @@ import { OrganizationManagementService } from 'app/admin/organization-management
 import { Organization } from 'app/entities/organization.model';
 import dayjs from 'dayjs/esm';
 import { ImageCropperModule } from 'app/shared/image-cropper/image-cropper.module';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { CourseAdminService } from 'app/course/manage/course-admin.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../../helpers/mocks/service/mock-account.service';
@@ -43,7 +43,7 @@ import { ImageCropperModalComponent } from 'app/course/manage/image-cropper-moda
 import { FeatureToggle, FeatureToggleService } from 'app/shared/feature-toggle/feature-toggle.service';
 import { MockFeatureToggleService } from '../../helpers/mocks/service/mock-feature-toggle.service';
 
-@Component({ selector: 'jhi-markdown-editor', template: '' })
+@Component({ selector: 'jhi-markdown-editor-monaco', template: '' })
 class MarkdownEditorStubComponent {
     @Input() markdown: string;
     @Input() enableResize = false;
diff --git a/src/test/javascript/spec/component/course/course.component.spec.ts b/src/test/javascript/spec/component/course/course.component.spec.ts
index dae7b6996b55..0922550c27e3 100644
--- a/src/test/javascript/spec/component/course/course.component.spec.ts
+++ b/src/test/javascript/spec/component/course/course.component.spec.ts
@@ -32,7 +32,7 @@ import { AlertService } from 'app/core/util/alert.service';
 import { Component } from '@angular/core';
 import { of } from 'rxjs';
 import dayjs from 'dayjs/esm';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { CourseAccessStorageService } from 'app/course/course-access-storage.service';
 
 const endDate1 = dayjs().add(1, 'days');
diff --git a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts
index 8aadaa3d2189..b2720b28a415 100644
--- a/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts
+++ b/src/test/javascript/spec/component/course/exercise-filter.model.spec.ts
@@ -1,15 +1,13 @@
 import { ExerciseFilter } from 'app/entities/exercise-filter.model';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Exercise } from 'app/entities/exercise.model';
 
 describe('Exercise Filter Test', () => {
-    const category1 = new ExerciseCategory();
-    category1.category = 'Easy';
-    const category2 = new ExerciseCategory();
-    category2.category = 'Hard';
+    const category1 = new ExerciseCategory('Easy', undefined);
+    const category2 = new ExerciseCategory('Hard', undefined);
     const course: Course = { id: 123 } as Course;
     const exercise1 = new ProgrammingExercise(course, undefined);
     exercise1.id = 1;
diff --git a/src/test/javascript/spec/component/detail-overview-list.component.spec.ts b/src/test/javascript/spec/component/detail-overview-list.component.spec.ts
index cf32c04afa13..61e891b11e35 100644
--- a/src/test/javascript/spec/component/detail-overview-list.component.spec.ts
+++ b/src/test/javascript/spec/component/detail-overview-list.component.spec.ts
@@ -1,9 +1,5 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { DetailOverviewListComponent, DetailOverviewSection, DetailType } from 'app/detail-overview-list/detail-overview-list.component';
-import { TranslatePipeMock } from '../helpers/mocks/service/mock-translate.service';
-import { MockNgbModalService } from '../helpers/mocks/service/mock-ngb-modal.service';
-import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
 import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service';
 import { AlertService } from 'app/core/util/alert.service';
 import { MockAlertService } from '../helpers/mocks/service/mock-alert.service';
@@ -16,6 +12,7 @@ import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { MockProfileService } from '../helpers/mocks/service/mock-profile.service';
 import { MockRouter } from '../helpers/mocks/mock-router';
 import { ExerciseDetailDirective } from 'app/detail-overview-list/exercise-detail.directive';
+import { TranslatePipeMock } from '../helpers/mocks/service/mock-translate.service';
 
 const sections: DetailOverviewSection[] = [
     {
@@ -34,7 +31,6 @@ const sections: DetailOverviewSection[] = [
 describe('DetailOverviewList', () => {
     let component: DetailOverviewListComponent;
     let fixture: ComponentFixture<DetailOverviewListComponent>;
-    let modalService: NgbModal;
     let modelingService: ModelingExerciseService;
     let alertService: AlertService;
 
@@ -43,7 +39,6 @@ describe('DetailOverviewList', () => {
             imports: [ExerciseDetailDirective],
             declarations: [DetailOverviewListComponent, TranslatePipeMock],
             providers: [
-                { provide: NgbModal, useClass: MockNgbModalService },
                 { provide: AlertService, useClass: MockAlertService },
                 { provide: Router, useClass: MockRouter },
                 { provide: ProfileService, useClass: MockProfileService },
@@ -52,7 +47,6 @@ describe('DetailOverviewList', () => {
         })
             .compileComponents()
             .then(() => {
-                modalService = fixture.debugElement.injector.get(NgbModal);
                 modelingService = fixture.debugElement.injector.get(ModelingExerciseService);
                 alertService = fixture.debugElement.injector.get(AlertService);
             });
@@ -99,18 +93,6 @@ describe('DetailOverviewList', () => {
         expect(titleDetailValue.textContent).toContain('A Title');
     });
 
-    it('should open git diff modal', () => {
-        const modalSpy = jest.spyOn(modalService, 'open');
-        component.showGitDiff({} as unknown as ProgrammingExerciseGitDiffReport);
-        expect(modalSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should not open git diff modal', () => {
-        const modalSpy = jest.spyOn(modalService, 'open');
-        component.showGitDiff(undefined);
-        expect(modalSpy).not.toHaveBeenCalled();
-    });
-
     it('should download apollon Diagram', () => {
         const downloadSpy = jest.spyOn(modelingService, 'convertToPdf').mockReturnValue(of(new HttpResponse({ body: new Blob() })));
         component.downloadApollonDiagramAsPDf({} as UMLModel, 'title');
diff --git a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts
index 2f5a5ee00a31..2a5d9fde2bb3 100644
--- a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts
+++ b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question-edit.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { NgModel } from '@angular/forms';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbCollapse, NgbModal, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model';
 import { DragAndDropQuestion } from 'app/entities/quiz/drag-and-drop-question.model';
 import { DragItem } from 'app/entities/quiz/drag-item.model';
@@ -13,10 +13,6 @@ import { QuizScoringInfoModalComponent } from 'app/exercises/quiz/manage/quiz-sc
 import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component';
 import { FileUploaderService } from 'app/shared/http/file-uploader.service';
 import { SecuredImageComponent } from 'app/shared/image/secured-image.component';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command';
-import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
@@ -27,8 +23,9 @@ import { DragAndDropQuestionUtil } from 'app/exercises/quiz/shared/drag-and-drop
 import { ChangeDetectorRef } from '@angular/core';
 import { clone } from 'lodash-es';
 import { CdkDragDrop, DragDropModule } from '@angular/cdk/drag-drop';
-import { NgbCollapse } from '@ng-bootstrap/ng-bootstrap';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
+import { MarkdownEditorMonacoComponent, TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('DragAndDropQuestionEditComponent', () => {
     let fixture: ComponentFixture<DragAndDropQuestionEditComponent>;
@@ -75,7 +72,7 @@ describe('DragAndDropQuestionEditComponent', () => {
                 DragAndDropQuestionEditComponent,
                 MockPipe(ArtemisTranslatePipe),
                 MockComponent(QuizScoringInfoModalComponent),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(SecuredImageComponent),
                 MockComponent(DragAndDropQuestionComponent),
                 MockDirective(NgModel),
@@ -603,36 +600,36 @@ describe('DragAndDropQuestionEditComponent', () => {
         expect(component.questionEditorText).toBe(newValue);
     });
 
-    it('should detect domain commands', () => {
+    it('should detect domain actions', () => {
         component.question = new DragAndDropQuestion();
         component.question.text = 'text';
         component.question.explanation = 'explanation';
         component.question.hint = 'hint';
-        let domainCommand: [string, DomainCommand];
+        let textWithDomainAction: TextWithDomainAction;
 
         // explanation
-        let command = new ExplanationCommand();
+        let action = new MonacoQuizExplanationAction();
         let text = 'take this as an explanationCommand';
-        domainCommand = [text, command];
+        textWithDomainAction = { text, action };
 
-        component.domainCommandsFound([domainCommand]);
+        component.domainActionsFound([textWithDomainAction]);
 
         expect(component.question.explanation).toBe(text);
 
         // hint
-        command = new HintCommand();
+        action = new MonacoQuizHintAction();
         text = 'take this as a hintCommand';
-        domainCommand = [text, command];
+        textWithDomainAction = { text, action };
 
-        component.domainCommandsFound([domainCommand]);
+        component.domainActionsFound([textWithDomainAction]);
 
         expect(component.question.hint).toBe(text);
 
         // text
         text = 'take this null as a command';
-        domainCommand = [text, null as unknown as DomainCommand];
+        textWithDomainAction = { text, action: undefined };
 
-        component.domainCommandsFound([domainCommand]);
+        component.domainActionsFound([textWithDomainAction]);
 
         expect(component.question.text).toBe(text);
     });
diff --git a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts
index 9d8afe5529f9..4b11c8785650 100644
--- a/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts
+++ b/src/test/javascript/spec/component/drag-and-drop-question/drag-and-drop-question.component.spec.ts
@@ -8,7 +8,6 @@ import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/question
 import { DragItemComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-item.component';
 import { QuizScoringInfoStudentModalComponent } from 'app/exercises/quiz/shared/questions/quiz-scoring-infostudent-modal/quiz-scoring-info-student-modal.component';
 import { SecuredImageComponent } from 'app/shared/image/secured-image.component';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
@@ -34,7 +33,6 @@ describe('DragAndDropQuestionComponent', () => {
             declarations: [
                 DragAndDropQuestionComponent,
                 MockPipe(ArtemisTranslatePipe),
-                MockComponent(MarkdownEditorComponent),
                 MockComponent(SecuredImageComponent),
                 MockComponent(DragAndDropQuestionComponent),
                 MockComponent(QuizScoringInfoStudentModalComponent),
diff --git a/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts
index 187443be2be4..cc2d7aaf230a 100644
--- a/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts
+++ b/src/test/javascript/spec/component/exam-exercise-row-buttons/exam-exercise-row-buttons.component.spec.ts
@@ -3,9 +3,9 @@ import { ArtemisTestModule } from '../../test.module';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { ExamExerciseRowButtonsComponent } from 'app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { ModelingExerciseService } from 'app/exercises/modeling/manage/modeling-exercise.service';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
@@ -17,7 +17,7 @@ import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { of, throwError } from 'rxjs';
 import { HttpErrorResponse } from '@angular/common/http';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockDirective, MockProvider } from 'ng-mocks';
 import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
 import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive';
diff --git a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts
index 80750ba8853b..5bf796d51879 100644
--- a/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/exam-scores/exam-scores-average-scores-graph.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateService } from '@ngx-translate/core';
-import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
+import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { ExamScoresAverageScoresGraphComponent } from 'app/exam/exam-scores/exam-scores-average-scores-graph.component';
@@ -15,6 +15,7 @@ import { GraphColors } from 'app/entities/statistics.model';
 import { NgxChartsSingleSeriesDataEntry } from 'app/shared/chart/ngx-charts-datatypes';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { LocaleConversionService } from 'app/shared/service/locale-conversion.service';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('ExamScoresAverageScoresGraphComponent', () => {
     let fixture: ComponentFixture<ExamScoresAverageScoresGraphComponent>;
@@ -55,7 +56,7 @@ describe('ExamScoresAverageScoresGraphComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)],
-            declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe)],
+            declarations: [ExamScoresAverageScoresGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)],
             providers: [
                 MockProvider(CourseManagementService, {
                     find: () => {
diff --git a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
index 3536693cbe09..7dd87ad9bef8 100644
--- a/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/exam-update.component.spec.ts
@@ -15,11 +15,10 @@ import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { GradingSystemService } from 'app/grading-system/grading-system.service';
@@ -42,7 +41,8 @@ import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
 import { TitleChannelNameComponent } from 'app/shared/form/title-channel-name/title-channel-name.component';
 import { UMLDiagramType } from '@ls1intum/apollon';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 @Component({
     template: '',
@@ -77,7 +77,7 @@ describe('ExamUpdateComponent', () => {
                 declarations: [
                     ExamUpdateComponent,
                     MockComponent(FormDateTimePickerComponent),
-                    MockComponent(MarkdownEditorComponent),
+                    MockComponent(MarkdownEditorMonacoComponent),
                     MockComponent(DataTableComponent),
                     DummyComponent,
                     MockPipe(ArtemisTranslatePipe),
@@ -606,7 +606,7 @@ describe('ExamUpdateComponent', () => {
                     ExamUpdateComponent,
                     ExamExerciseImportComponent,
                     MockComponent(FormDateTimePickerComponent),
-                    MockComponent(MarkdownEditorComponent),
+                    MockComponent(MarkdownEditorMonacoComponent),
                     MockComponent(DataTableComponent),
                     DummyComponent,
                     MockPipe(ArtemisTranslatePipe),
diff --git a/src/test/javascript/spec/component/exam/feedback.utils.spec.ts b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts
index adf848356db6..5fc2c9311d97 100644
--- a/src/test/javascript/spec/component/exam/feedback.utils.spec.ts
+++ b/src/test/javascript/spec/component/exam/feedback.utils.spec.ts
@@ -2,7 +2,7 @@ import { prepareFeedbackComponentParameters } from 'app/exercises/shared/feedbac
 import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import dayjs from 'dayjs/esm';
 import { of } from 'rxjs';
 import { MockProvider } from 'ng-mocks';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts
index 304a86ef1639..38b8d1df5b58 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-exercise-import.component.spec.ts
@@ -3,12 +3,12 @@ import { ArtemisTestModule } from '../../../test.module';
 import { MockModule, MockPipe } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { FormsModule } from '@angular/forms';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamExerciseImportComponent } from 'app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { Exercise } from 'app/entities/exercise.model';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts
index fc769df6b8d6..430a59b2f55b 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-exercise-row-buttons.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Router, RouterModule } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { HttpResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamExerciseRowButtonsComponent } from 'app/exercises/shared/exam-exercise-row-buttons/exam-exercise-row-buttons.component';
 import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts
index c743acdb5e98..b0476cd518fe 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-import.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts
index c3a2ed6b9848..9c7482c9fe6f 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-management-resolve.spec.ts
@@ -6,7 +6,7 @@ import { MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExamService } from 'app/exam/manage/student-exams/student-exam.service';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { StudentExamWithGradeDTO } from 'app/exam/exam-scores/exam-score-dtos.model';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts
index ecd81a41c681..b5601206f621 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-management.component.spec.ts
@@ -10,11 +10,11 @@ import { TranslateService } from '@ngx-translate/core';
 import { ActivatedRoute, Router, UrlSegment, convertToParamMap } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { ExamManagementComponent } from 'app/exam/manage/exam-management.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { SortService } from 'app/shared/service/sort.service';
-import { ExamInformationDTO } from 'app/entities/exam-information.model';
+import { ExamInformationDTO } from 'app/entities/exam/exam-information.model';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { HasAnyAuthorityDirective } from 'app/shared/auth/has-any-authority.directive';
 import { MockDirective, MockPipe } from 'ng-mocks';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts
index a452d76c4a7b..747d87a8a3c5 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-management.service.spec.ts
@@ -3,19 +3,19 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { Course } from 'app/entities/course.model';
 import { ArtemisTestModule } from '../../../test.module';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
-import { ExamInformationDTO } from 'app/entities/exam-information.model';
+import { ExamInformationDTO } from 'app/entities/exam/exam-information.model';
 import { StudentDTO } from 'app/entities/student-dto.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExamScoreDTO } from 'app/exam/exam-scores/exam-score-dtos.model';
 import { StatsForDashboard } from 'app/course/dashboards/stats-for-dashboard.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { AccountService } from 'app/core/auth/account.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { UMLDiagramType } from '@ls1intum/apollon';
 
 describe('Exam Management Service Tests', () => {
diff --git a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts
index 1e6b737b7266..dfe43434b530 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-students-attendance-check.component.spec.ts
@@ -4,8 +4,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateService } from '@ngx-translate/core';
 import { User } from 'app/core/user/user.model';
 import { Course } from 'app/entities/course.model';
-import { ExamUserAttendanceCheckDTO } from 'app/entities/exam-users-attendance-check-dto.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamUserAttendanceCheckDTO } from 'app/entities/exam/exam-users-attendance-check-dto.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExamStudentsAttendanceCheckComponent } from 'app/exam/manage/students/verify-attendance-check/exam-students-attendance-check.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts
index 048b06c65333..58a448041153 100644
--- a/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exam-students.component.spec.ts
@@ -7,7 +7,7 @@ import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable';
 import { User } from 'app/core/user/user.model';
 import { UserService } from 'app/core/user/user.service';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { ExamStudentsComponent } from 'app/exam/manage/students/exam-students.component';
 import { StudentsUploadImagesButtonComponent } from 'app/exam/manage/students/upload-images/students-upload-images-button.component';
@@ -20,8 +20,8 @@ import { MockTranslateService } from '../../../helpers/mocks/service/mock-transl
 import { ArtemisTestModule } from '../../../test.module';
 import { UsersImportButtonComponent } from 'app/shared/user-import/users-import-button.component';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
-import { ExamUserDTO } from 'app/entities/exam-user-dto.model';
-import { ExamUser } from 'app/entities/exam-user.model';
+import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model';
+import { ExamUser } from 'app/entities/exam/exam-user.model';
 
 describe('ExamStudentsComponent', () => {
     const course = { id: 1 } as Course;
diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts
index 1c31b7cd263f..09c6836b7cbb 100644
--- a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-button.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { faBullhorn } from '@fortawesome/free-solid-svg-icons';
 import dayjs from 'dayjs/esm';
 import { By } from '@angular/platform-browser';
diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts
index 6e248103b247..6ab12448b3fb 100644
--- a/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exams/exam-announcement-dialog/exam-live-announcement-create-modal.component.spec.ts
@@ -7,9 +7,9 @@ import { AccountService } from 'app/core/auth/account.service';
 import { By } from '@angular/platform-browser';
 import { MockComponent } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ExamLiveEventComponent } from 'app/exam/shared/events/exam-live-event.component';
 import { ExamWideAnnouncementEvent } from 'app/exam/participate/exam-participation-live-events.service';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('ExamLiveAnnouncementCreateModalComponent', () => {
     let component: ExamLiveAnnouncementCreateModalComponent;
@@ -19,7 +19,12 @@ describe('ExamLiveAnnouncementCreateModalComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [ExamLiveAnnouncementCreateModalComponent, MockComponent(FaIconComponent), MockComponent(MarkdownEditorComponent), MockComponent(ExamLiveEventComponent)],
+            declarations: [
+                ExamLiveAnnouncementCreateModalComponent,
+                MockComponent(FaIconComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
+                MockComponent(ExamLiveEventComponent),
+            ],
             providers: [
                 { provide: NgbActiveModal, useValue: { dismiss: jest.fn() } },
                 { provide: ExamManagementService, useValue: { createAnnouncement: jest.fn() } },
diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts
index 9c934e9c8817..da54d7079565 100644
--- a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist-exercisegroup-table.component.spec.ts
@@ -4,7 +4,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { Component } from '@angular/core';
 import { HasAnyAuthorityDirective } from 'app/shared/auth/has-any-authority.directive';
-import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component';
+import { ChecklistCheckComponent } from 'app/shared/components/checklist-check/checklist-check.component';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ProgressBarComponent } from 'app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component';
diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts
index 317ab262a4a9..814df06dd42b 100644
--- a/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exams/exam-checklist.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamChecklistExerciseGroupTableComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist-exercisegroup-table/exam-checklist-exercisegroup-table.component';
 import { ExamChecklistComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.component';
 import { ProgressBarComponent } from 'app/shared/dashboards/tutor-participation-graph/progress-bar/progress-bar.component';
diff --git a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts
index 211c90093b8b..4abd8b00e497 100644
--- a/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exams/exam-detail.component.spec.ts
@@ -8,8 +8,8 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { AccountService } from 'app/core/auth/account.service';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
-import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component';
+import { Exam } from 'app/entities/exam/exam.model';
+import { ChecklistCheckComponent } from 'app/shared/components/checklist-check/checklist-check.component';
 import { ExamChecklistExerciseGroupTableComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist-exercisegroup-table/exam-checklist-exercisegroup-table.component';
 import { ExamChecklistComponent } from 'app/exam/manage/exams/exam-checklist-component/exam-checklist.component';
 import { ExamDetailComponent } from 'app/exam/manage/exams/exam-detail.component';
diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts
index d20532d40dc7..900f896fa97a 100644
--- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-group-update.component.spec.ts
@@ -6,19 +6,20 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { TranslateService } from '@ngx-translate/core';
 import { EntityResponseType } from 'app/complaints/complaint.service';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ExerciseGroupUpdateComponent } from 'app/exam/manage/exercise-groups/exercise-group-update.component';
 import { ExerciseGroupService } from 'app/exam/manage/exercise-groups/exercise-group.service';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { AlertService } from 'app/core/util/alert.service';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { of, throwError } from 'rxjs';
 import { MockRouter } from '../../../../helpers/mocks/mock-router';
 import { MockSyncStorage } from '../../../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service';
 import { NgbAlertsMocksModule } from '../../../../helpers/mocks/directive/ngbAlertsMocks.module';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('ExerciseGroupUpdateComponent', () => {
     const course = { id: 456 } as Course;
@@ -43,7 +44,7 @@ describe('ExerciseGroupUpdateComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [HttpClientModule, FormsModule, NgbAlertsMocksModule],
-            declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)],
+            declarations: [ExerciseGroupUpdateComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockDirective(TranslateDirective)],
             providers: [
                 { provide: SessionStorageService, useClass: MockSyncStorage },
                 { provide: LocalStorageService, useClass: MockSyncStorage },
diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts
index cc5dd2cb5225..040752cb4ffb 100644
--- a/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/exercise-groups.component.spec.ts
@@ -7,8 +7,8 @@ import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
 import { EventManager } from 'app/core/util/event-manager.service';
 import { Course } from 'app/entities/course.model';
-import { ExamInformationDTO } from 'app/entities/exam-information.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamInformationDTO } from 'app/entities/exam/exam-information.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
diff --git a/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts b/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts
index fe38c8c71ae0..499338bffb52 100644
--- a/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/exercise-groups/programming-exercise-group-cell.component.spec.ts
@@ -5,7 +5,7 @@ import { ProgrammingExerciseGroupCellComponent } from 'app/exam/manage/exercise-
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { By } from '@angular/platform-browser';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TranslatePipeMock } from '../../../../helpers/mocks/service/mock-translate.service';
 import { of } from 'rxjs';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
@@ -30,6 +30,7 @@ describe('Programming Exercise Group Cell Component', () => {
         },
         allowOfflineIde: true,
         allowOnlineEditor: true,
+        allowOnlineIde: false,
     } as any as ProgrammingExercise;
 
     let mockedProfileService: ProfileService;
@@ -93,11 +94,15 @@ describe('Programming Exercise Group Cell Component', () => {
 
         const div0 = fixture.debugElement.query(By.css('div > div > div:first-child'));
         expect(div0).not.toBeNull();
-        expect(div0.nativeElement.textContent?.trim()).toBe('artemisApp.programmingExercise.offlineIde : true');
+        expect(div0.nativeElement.textContent?.trim()).toBe(': true');
 
         const div1 = fixture.debugElement.query(By.css('div > div > div:nth-child(2)'));
         expect(div1).not.toBeNull();
-        expect(div1.nativeElement.textContent?.trim()).toBe('artemisApp.programmingExercise.onlineEditor : true');
+        expect(div1.nativeElement.textContent?.trim()).toBe(': true');
+
+        const div2 = fixture.debugElement.query(By.css('div > div > div:nth-child(3)'));
+        expect(div2).not.toBeNull();
+        expect(div2.nativeElement.textContent?.trim()).toBe(': false');
     });
 
     it('should download the repository', () => {
diff --git a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts
index e4ecca13e935..cb10c66e1574 100644
--- a/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/programming-exam-diff.component.spec.ts
@@ -4,7 +4,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { CommitsInfoComponent } from 'app/exercises/programming/shared/commits-info/commits-info.component';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { of } from 'rxjs';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts
index 213d77fac9b6..453df0f6be55 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/exam-status.component.spec.ts
@@ -5,12 +5,12 @@ import { MockPipe } from 'ng-mocks';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MockExamChecklistService } from '../../../../helpers/mocks/service/mock-exam-checklist.service';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
 import { of } from 'rxjs';
 import { Course } from 'app/entities/course.model';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts
index d7cd5e7161e6..22cdaf2eb531 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail-table-row.component.spec.ts
@@ -9,11 +9,11 @@ import { ReactiveFormsModule } from '@angular/forms';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts
index ae4ca95910a7..531f3d5aef50 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-detail.component.spec.ts
@@ -17,7 +17,7 @@ import { NgForm, NgModel, ReactiveFormsModule } from '@angular/forms';
 import { Exercise } from 'app/entities/exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts
index fe4ee6e5d5eb..07ff99eac312 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-summary.component.spec.ts
@@ -4,7 +4,7 @@ import { MockComponent } from 'ng-mocks';
 import { Course } from 'app/entities/course.model';
 import { of } from 'rxjs';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExamSummaryComponent } from 'app/exam/manage/student-exams/student-exam-summary.component';
 import { ExamResultSummaryComponent } from 'app/exam/participate/summary/exam-result-summary.component';
 
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts
index 09cc4dee6962..e28f9b6390ca 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exam-timeline.component.spec.ts
@@ -4,7 +4,7 @@ import { MockComponent, MockPipe } from 'ng-mocks';
 import { Course } from 'app/entities/course.model';
 import { Observable, of } from 'rxjs';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExamTimelineComponent } from 'app/exam/manage/student-exams/student-exam-timeline/student-exam-timeline.component';
 import { ModelingExamSubmissionComponent } from 'app/exam/participate/exercises/modeling/modeling-exam-submission.component';
 import { TextExamSubmissionComponent } from 'app/exam/participate/exercises/text/text-exam-submission.component';
@@ -16,14 +16,14 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component';
 import { MockTranslateValuesDirective } from '../../../../helpers/mocks/directive/mock-translate-values.directive';
 import { EntityArrayResponseType, SubmissionService } from 'app/exercises/shared/submission/submission.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import dayjs from 'dayjs/esm';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { FileUploadSubmission } from 'app/entities/file-upload-submission.model';
 import { SubmissionVersion } from 'app/entities/submission-version.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Submission } from 'app/entities/submission.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockLocalStorageService } from '../../../../helpers/mocks/service/mock-local-storage.service';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts
index 1534c947d717..c5fbbc5b1a02 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/student-exams.component.spec.ts
@@ -16,7 +16,7 @@ import { Course } from 'app/entities/course.model';
 import { of, throwError } from 'rxjs';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { User } from 'app/core/user/user.model';
 import dayjs from 'dayjs/esm';
 import { By } from '@angular/platform-browser';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts
index 3a2b4012bc1f..918148de4548 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-button.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent, MockModule, MockProvider } from 'ng-mocks';
 import { AlertService } from 'app/core/util/alert.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { By } from '@angular/platform-browser';
 import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ButtonComponent } from 'app/shared/components/button.component';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts
index f0c4be9a98ce..c96fe070e773 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/students-upload-images-dialog.component.spec.ts
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { StudentsUploadImagesDialogComponent } from 'app/exam/manage/students/upload-images/students-upload-images-dialog.component';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts
index ca19b1567ba3..e803ff5deb7f 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-button.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent, MockModule, MockProvider } from 'ng-mocks';
 import { AlertService } from 'app/core/util/alert.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { By } from '@angular/platform-browser';
 import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ButtonComponent } from 'app/shared/components/button.component';
diff --git a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts
index 0541146c9d95..4f97eab7cc62 100644
--- a/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/student-exams/user-import-dialog.component.spec.ts
@@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
@@ -19,7 +19,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { Router } from '@angular/router';
 import * as fs from 'fs';
 import * as path from 'path';
-import { ExamUserDTO } from 'app/entities/exam-user-dto.model';
+import { ExamUserDTO } from 'app/entities/exam/exam-user-dto.model';
 
 describe('UsersImportDialogComponent', () => {
     let fixture: ComponentFixture<UsersImportDialogComponent>;
diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts
index ae26c8a72e3b..b7586940ad52 100644
--- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-behavior.component.spec.ts
@@ -14,7 +14,7 @@ import { ButtonComponent } from 'app/shared/components/button.component';
 import { MockRouterLinkDirective } from '../../../../helpers/mocks/directive/mock-router-link.directive';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { Exercise } from 'app/entities/exercise.model';
-import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model';
 import { MockRouter } from '../../../../helpers/mocks/mock-router';
 import { FormsModule } from '@angular/forms';
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts
index 3676e637591f..f375ca4fb6cc 100644
--- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions-overview.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
 import { SuspiciousSessionsOverviewComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions-overview/suspicious-sessions-overview.component';
-import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model';
 import { ArtemisTestModule } from '../../../../test.module';
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { SuspiciousSessionsComponent } from 'app/exam/manage/suspicious-behavior/suspicious-sessions/suspicious-sessions.component';
diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts
index 68d38513ba77..8024d4a251c2 100644
--- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.component.spec.ts
@@ -4,7 +4,7 @@ import { SuspiciousSessionsComponent } from 'app/exam/manage/suspicious-behavior
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockPipe } from 'ng-mocks';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason } from 'app/entities/exam/exam-session.model';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { ArtemisTestModule } from '../../../../test.module';
 
diff --git a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts
index bc1e1522f292..0760f147551b 100644
--- a/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts
+++ b/src/test/javascript/spec/component/exam/manage/suspicious-behavior/suspicious-sessions.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 
 import { SuspiciousSessionsService } from 'app/exam/manage/suspicious-behavior/suspicious-sessions.service';
-import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam-session.model';
+import { SuspiciousExamSessions, SuspiciousSessionReason, SuspiciousSessionsAnalysisOptions } from 'app/entities/exam/exam-session.model';
 
 describe('SuspiciousSessionsService', () => {
     let service: SuspiciousSessionsService;
diff --git a/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts
index 2c187f95b291..03eb5e090d94 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-bar.component.spec.ts
@@ -12,7 +12,7 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag
 import { TranslateService } from '@ngx-translate/core';
 import { ExamBarComponent } from 'app/exam/participate/exam-bar/exam-bar.component';
 import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 
 describe('ExamBarComponent', () => {
diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts
index 50389d445c46..40c65e3f008d 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-bar.component.spec.ts
@@ -1,8 +1,8 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import dayjs from 'dayjs/esm';
-import { MockComponent, MockModule } from 'ng-mocks';
+import { MockComponent, MockDirective, MockModule } from 'ng-mocks';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ExamSession } from 'app/entities/exam-session.model';
+import { ExamSession } from 'app/entities/exam/exam-session.model';
 import { of } from 'rxjs';
 import { ExamNavigationBarComponent } from 'app/exam/participate/exam-navigation-bar/exam-navigation-bar.component';
 import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
@@ -21,6 +21,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { faCheck, faEdit } from '@fortawesome/free-solid-svg-icons';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { ExamLiveEventsButtonComponent } from 'app/exam/participate/events/exam-live-events-button.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('Exam Navigation Bar Component', () => {
     let fixture: ComponentFixture<ExamNavigationBarComponent>;
@@ -35,7 +36,7 @@ describe('Exam Navigation Bar Component', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, TranslateTestingModule, MockModule(NgbTooltipModule)],
-            declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent)],
+            declarations: [ExamNavigationBarComponent, MockComponent(ExamTimerComponent), MockComponent(ExamLiveEventsButtonComponent), MockDirective(TranslateDirective)],
             providers: [
                 ExamParticipationService,
                 { provide: ExamExerciseUpdateService, useValue: mockExamExerciseUpdateService },
diff --git a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts
index 9e2e2cf7b70d..45ce49fc2b4d 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-navigation-sidebar.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { MockComponent, MockModule } from 'ng-mocks';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ExamSession } from 'app/entities/exam-session.model';
+import { ExamSession } from 'app/entities/exam/exam-session.model';
 import { of } from 'rxjs';
 import { ExamNavigationSidebarComponent } from 'app/exam/participate/exam-navigation-sidebar/exam-navigation-sidebar.component';
 import { CodeEditorRepositoryService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
diff --git a/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts
index 9e7b34dedae5..4f5514b08626 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-participation-cover.component.spec.ts
@@ -7,7 +7,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { AccountService } from 'app/core/auth/account.service';
 import { User } from 'app/core/user/user.model';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ExamParticipationCoverComponent } from 'app/exam/participate/exam-cover/exam-participation-cover.component';
diff --git a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts
index 4742c845c8ad..de433ab78169 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-participation.component.spec.ts
@@ -9,20 +9,20 @@ import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { CourseStorageService } from 'app/course/manage/course-storage.service';
 import { Course } from 'app/entities/course.model';
-import { ExamPage } from 'app/entities/exam-page.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamPage } from 'app/entities/exam/exam-page.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { Submission } from 'app/entities/submission.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ExamExerciseUpdateService } from 'app/exam/manage/exam-exercise-update.service';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { TestRunRibbonComponent } from 'app/exam/manage/test-runs/test-run-ribbon.component';
diff --git a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts
index 5f3b9f04df78..6332ee962a6c 100644
--- a/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam-start-information/exam-start-information.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ExamStartInformationComponent } from 'app/exam/participate/exam-start-information/exam-start-information.component';
 import { InformationBoxComponent } from 'app/shared/information-box/information-box.component';
diff --git a/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts b/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts
index 1254b6abcb98..2f75558e228f 100644
--- a/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exam.utils.spec.ts
@@ -2,7 +2,7 @@ import { isExamResultPublished } from 'app/exam/participate/exam.utils';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { MockArtemisServerDateService } from '../../../helpers/mocks/service/mock-server-date.service';
 import { TestBed } from '@angular/core/testing';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 
 let artemisServerDateService: ArtemisServerDateService;
diff --git a/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts
index bcd570d8c8a2..ad5c65c27275 100644
--- a/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exercises/programming-exam-submission.component.spec.ts
@@ -4,8 +4,8 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ProgrammingExamSubmissionComponent } from 'app/exam/participate/exercises/programming/programming-exam-submission.component';
 import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component';
 import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component';
diff --git a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts
index 97f000ca0af1..176692131b10 100644
--- a/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/exercises/text-exam-submission.component.spec.ts
@@ -3,8 +3,8 @@ import { NgModel } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { TextExamSubmissionComponent } from 'app/exam/participate/exercises/text/text-exam-submission.component';
 import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component';
 import { TextEditorService } from 'app/exercises/text/participate/text-editor.service';
@@ -16,6 +16,7 @@ import { ExamExerciseUpdateHighlighterComponent } from 'app/exam/participate/exe
 import { ArtemisTestModule } from '../../../../test.module';
 import { ResizeableContainerComponent } from 'app/shared/resizeable-container/resizeable-container.component';
 import dayjs from 'dayjs/esm';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TextExamSubmissionComponent', () => {
     let fixture: ComponentFixture<TextExamSubmissionComponent>;
@@ -38,6 +39,7 @@ describe('TextExamSubmissionComponent', () => {
                 MockComponent(IncludedInScoreBadgeComponent),
                 MockComponent(ExamExerciseUpdateHighlighterComponent),
                 MockComponent(ResizeableContainerComponent),
+                MockDirective(TranslateDirective),
             ],
             providers: [MockProvider(TextEditorService), MockProvider(ArtemisMarkdownService)],
         })
diff --git a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts
index 4be44e0709b1..9ead47365e2e 100644
--- a/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/general-information/exam-general-information.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ExamGeneralInformationComponent } from 'app/exam/participate/general-information/exam-general-information.component';
 import { StudentExamWorkingTimeComponent } from 'app/exam/shared/student-exam-working-time/student-exam-working-time.component';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts
index 815e36582b17..a36b5b62eb0e 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/exam-result-summary.component.spec.ts
@@ -9,20 +9,20 @@ import { ThemeService } from 'app/core/theme/theme.service';
 import { User } from 'app/core/user/user.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { GradeType } from 'app/entities/grading-scale.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model';
 import { StudentExam } from 'app/entities/student-exam.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ExerciseResult, StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model';
 import { TestRunRibbonComponent } from 'app/exam/manage/test-runs/test-run-ribbon.component';
 import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts
index 2fd0a02f46d8..b5a588f2f83f 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/header/exam-result-summary-exercise-card-header.component.spec.ts
@@ -2,12 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionType } from 'app/entities/submission.model';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts
index deaa197ba1b6..6d8d7327aed3 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/programming-exam-summary.component.spec.ts
@@ -9,11 +9,11 @@ import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-st
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { ExerciseCacheService } from 'app/exercises/shared/exercise/exercise-cache.service';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { User } from 'app/core/user/user.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts
index a6a54f521bfb..6dc458e8d548 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/quiz-exam-summary.component.spec.ts
@@ -1,7 +1,7 @@
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { AnswerOption } from 'app/entities/quiz/answer-option.model';
 import { DragAndDropMapping } from 'app/entities/quiz/drag-and-drop-mapping.model';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts
index 7606478c4e1c..cf9a391476c0 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/exercises/text-exam-summary.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TextExamSummaryComponent } from 'app/exam/participate/summary/exercises/text-exam-summary/text-exam-summary.component';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { TextEditorComponent } from 'app/exercises/text/participate/text-editor.component';
 import { MockComponent } from 'ng-mocks';
diff --git a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts
index df597333fc63..836d997c7530 100644
--- a/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/participate/summary/result-overview/exam-result-overview.component.spec.ts
@@ -4,14 +4,14 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { User } from 'app/core/user/user.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamResultOverviewComponent } from 'app/exam/participate/summary/result-overview/exam-result-overview.component';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { Result } from 'app/entities/result.model';
diff --git a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts
index f53027f7a24c..fe01da3df68d 100644
--- a/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/shared/events/exam-live-event.component.spec.ts
@@ -16,6 +16,8 @@ import { TranslateService } from '@ngx-translate/core';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
 import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe';
 import { WorkingTimeChangeComponent } from 'app/exam/shared/working-time-change/working-time-change.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { MockDirective } from 'ng-mocks';
 
 describe('ExamLiveEventComponent', () => {
     let component: ExamLiveEventComponent;
@@ -23,7 +25,15 @@ describe('ExamLiveEventComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [ExamLiveEventComponent, WorkingTimeChangeComponent, ArtemisTranslatePipe, ArtemisDatePipe, HtmlForMarkdownPipe, ArtemisDurationFromSecondsPipe],
+            declarations: [
+                ExamLiveEventComponent,
+                WorkingTimeChangeComponent,
+                ArtemisTranslatePipe,
+                ArtemisDatePipe,
+                HtmlForMarkdownPipe,
+                ArtemisDurationFromSecondsPipe,
+                MockDirective(TranslateDirective),
+            ],
             imports: [FontAwesomeModule],
             providers: [{ provide: TranslateService, useClass: MockTranslateService }],
         }).compileComponents();
diff --git a/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts b/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts
index 1c71302e88cc..81da42c6eb6a 100644
--- a/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/shared/student-exam-working-time.component.spec.ts
@@ -3,7 +3,7 @@ import { MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { StudentExamWorkingTimeComponent } from 'app/exam/shared/student-exam-working-time/student-exam-working-time.component';
 import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 
 describe('StudentExamWorkingTimeComponent', () => {
diff --git a/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts b/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts
index 7a4817aa9936..b3ca685443bd 100644
--- a/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/shared/testexam-working-time.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { ArtemisDurationFromSecondsPipe } from 'app/shared/pipes/artemis-duration-from-seconds.pipe';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { TestexamWorkingTimeComponent } from 'app/exam/shared/testExam-workingTime/testexam-working-time.component';
 import { round } from 'app/shared/util/utils';
diff --git a/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts b/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts
index 75382fcb9e4d..322846cc0bb2 100644
--- a/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/shared/working-time-control.component.spec.ts
@@ -2,7 +2,7 @@ import dayjs from 'dayjs/esm';
 import { FormsModule } from '@angular/forms';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { WorkingTimeControlComponent } from 'app/exam/shared/working-time-control/working-time-control.component';
 
 const createTestExam = (duration: number) => ({ workingTime: duration, startDate: dayjs.unix(0), endDate: dayjs.unix(duration) }) as Exam;
diff --git a/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts
index 23f0394ec3f3..4ca659c9076f 100644
--- a/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/test-run/create-test-run-modal.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Course } from 'app/entities/course.model';
 import { CreateTestRunModalComponent } from 'app/exam/manage/test-runs/create-test-run-modal.component';
 import dayjs from 'dayjs/esm';
diff --git a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts
index 725a5b677390..40d92651dcfa 100644
--- a/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts
+++ b/src/test/javascript/spec/component/exam/test-run/test-run-management.component.spec.ts
@@ -9,7 +9,7 @@ import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { AccountService } from 'app/core/auth/account.service';
 import { User } from 'app/core/user/user.model';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { StudentExam } from 'app/entities/student-exam.model';
@@ -58,6 +58,7 @@ describe('Test Run Management Component', () => {
                 MockPipe(ArtemisDatePipe),
                 MockDirective(SortDirective),
                 MockDirective(DeleteButtonDirective),
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 { provide: LocalStorageService, useClass: MockSyncStorage },
diff --git a/src/test/javascript/spec/component/exercise-detail.directive.spec.ts b/src/test/javascript/spec/component/exercise-detail.directive.spec.ts
index 4367413f636f..50ed496b1b34 100644
--- a/src/test/javascript/spec/component/exercise-detail.directive.spec.ts
+++ b/src/test/javascript/spec/component/exercise-detail.directive.spec.ts
@@ -1,13 +1,30 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ExerciseDetailDirective } from 'app/detail-overview-list/exercise-detail.directive';
 import { Component, ViewChild } from '@angular/core';
-import type { BooleanDetail, DateDetail, Detail, LinkDetail, NotShownDetail, ShownDetail, TextDetail } from 'app/detail-overview-list/detail.model';
-import { TextDetailComponent } from 'app/detail-overview-list/components/text-detail.component';
-import { MockComponent } from 'ng-mocks';
+import type {
+    BooleanDetail,
+    DateDetail,
+    Detail,
+    LinkDetail,
+    NotShownDetail,
+    ProgrammingAuxiliaryRepositoryButtonsDetail,
+    ProgrammingDiffReportDetail,
+    ProgrammingRepositoryButtonsDetail,
+    ProgrammingTestStatusDetail,
+    ShownDetail,
+    TextDetail,
+} from 'app/detail-overview-list/detail.model';
+import { TextDetailComponent } from 'app/detail-overview-list/components/text-detail/text-detail.component';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { DetailType } from 'app/detail-overview-list/detail-overview-list.component';
-import { DateDetailComponent } from 'app/detail-overview-list/components/date-detail.component';
-import { LinkDetailComponent } from 'app/detail-overview-list/components/link-detail.component';
-import { BooleanDetailComponent } from 'app/detail-overview-list/components/boolean-detail.component';
+import { DateDetailComponent } from 'app/detail-overview-list/components/date-detail/date-detail.component';
+import { LinkDetailComponent } from 'app/detail-overview-list/components/link-detail/link-detail.component';
+import { BooleanDetailComponent } from 'app/detail-overview-list/components/boolean-detail/boolean-detail.component';
+import { ProgrammingRepositoryButtonsDetailComponent } from 'app/detail-overview-list/components/programming-repository-buttons-detail/programming-repository-buttons-detail.component';
+import { ProgrammingAuxiliaryRepositoryButtonsDetailComponent } from 'app/detail-overview-list/components/programming-auxiliary-repository-buttons-detail/programming-auxiliary-repository-buttons-detail.component';
+import { ProgrammingTestStatusDetailComponent } from 'app/detail-overview-list/components/programming-test-status-detail/programming-test-status-detail.component';
+import { ProgrammingDiffReportDetailComponent } from 'app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 @Component({
     template: `<div jhiExerciseDetail [detail]="detail"></div>`,
@@ -23,7 +40,13 @@ describe('ExerciseDetailDirective', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            declarations: [TestDetailHostComponent, ExerciseDetailDirective, MockComponent(TextDetailComponent)],
+            declarations: [
+                TestDetailHostComponent,
+                ExerciseDetailDirective,
+                MockDirective(TranslateDirective),
+                MockComponent(TextDetailComponent),
+                MockComponent(ProgrammingDiffReportDetailComponent),
+            ],
         }).compileComponents();
 
         fixture = TestBed.createComponent(TestDetailHostComponent);
@@ -63,6 +86,25 @@ describe('ExerciseDetailDirective', () => {
         it('should create BooleanDetail component', () => {
             checkComponentForDetailWasCreated({ type: DetailType.Boolean } as BooleanDetail, BooleanDetailComponent);
         });
+
+        it('should create ProgrammingRepositoryButtonsDetailComponent component', () => {
+            checkComponentForDetailWasCreated({ type: DetailType.ProgrammingRepositoryButtons } as ProgrammingRepositoryButtonsDetail, ProgrammingRepositoryButtonsDetailComponent);
+        });
+
+        it('should create ProgrammingAuxiliaryRepositoryButtonsDetailComponent component', () => {
+            checkComponentForDetailWasCreated(
+                { type: DetailType.ProgrammingAuxiliaryRepositoryButtons } as ProgrammingAuxiliaryRepositoryButtonsDetail,
+                ProgrammingAuxiliaryRepositoryButtonsDetailComponent,
+            );
+        });
+
+        it('should create ProgrammingTestStatusDetail component', () => {
+            checkComponentForDetailWasCreated({ type: DetailType.ProgrammingTestStatus } as ProgrammingTestStatusDetail, ProgrammingTestStatusDetailComponent);
+        });
+
+        it('should create ProgrammingDiffReportDetail component', () => {
+            checkComponentForDetailWasCreated({ type: DetailType.ProgrammingDiffReport } as ProgrammingDiffReportDetail, ProgrammingDiffReportDetailComponent);
+        });
     });
 
     function checkComponentForDetailWasNotCreated(detailToBeChecked: NotShownDetail) {
diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts
index 038a9cc515ef..4ef9a51082c3 100644
--- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts
+++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint-update.component.spec.ts
@@ -11,11 +11,10 @@ import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
 import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
 import { ActivatedRoute } from '@angular/router';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
@@ -25,6 +24,7 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { PROFILE_IRIS } from 'app/app.constants';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('ExerciseHint Management Update Component', () => {
     let comp: ExerciseHintUpdateComponent;
@@ -52,7 +52,7 @@ describe('ExerciseHint Management Update Component', () => {
     beforeEach(fakeAsync(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, FormsModule],
-            declarations: [ExerciseHintUpdateComponent, MockComponent(MarkdownEditorComponent), MockComponent(HelpIconComponent)],
+            declarations: [ExerciseHintUpdateComponent, MockComponent(MarkdownEditorMonacoComponent), MockComponent(HelpIconComponent)],
             providers: [
                 FormBuilder,
                 MockProvider(ProgrammingExerciseService),
diff --git a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts
index 5d9ffdb54ca2..b7b531efa5a8 100644
--- a/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts
+++ b/src/test/javascript/spec/component/exercise-hint/manage/exercise-hint.component.spec.ts
@@ -9,7 +9,7 @@ import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
 import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
 import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route';
 import { EventManager } from 'app/core/util/event-manager.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 describe('ExerciseHint Management Component', () => {
     let comp: ExerciseHintComponent;
diff --git a/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts
index 9bbadd2c6bb0..0dbdd2699087 100644
--- a/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts
+++ b/src/test/javascript/spec/component/exercise-hint/participate/exercise-hint-expandable.component.spec.ts
@@ -9,7 +9,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
 import { ExerciseHintResponse, ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
 import { ExerciseHintExpandableComponent } from 'app/exercises/shared/exercise-hint/participate/exercise-hint-expandable.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { StarRatingComponent } from 'app/exercises/shared/rating/star-rating/star-rating.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
diff --git a/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts b/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts
index 745539ab66f3..d7852f272f21 100644
--- a/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts
+++ b/src/test/javascript/spec/component/exercise-hint/shared/code-hint-container.component.spec.ts
@@ -3,7 +3,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { CodeHintContainerComponent } from 'app/exercises/shared/exercise-hint/shared/code-hint-container.component';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service';
 
 describe('ExerciseHint Management Component', () => {
diff --git a/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts b/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts
index dfe3302f9d69..8135e4878ae5 100644
--- a/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/problem-statement.component.spec.ts
@@ -6,8 +6,8 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici
 import { HttpResponse } from '@angular/common/http';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProblemStatementComponent } from 'app/overview/exercise-details/problem-statement/problem-statement.component';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts
index 598ed280ae94..c3c268ae9481 100644
--- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-pool.component.spec.ts
@@ -15,7 +15,7 @@ import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-questi
 import { QuizGroup } from 'app/entities/quiz/quiz-group.model';
 import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { QuizPoolMappingComponent } from 'app/exercises/quiz/manage/quiz-pool-mapping.component';
 import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-question-list-edit.component';
diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts
index e0c07d841d71..cac2387f7258 100644
--- a/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/quiz/manage/quiz-question-list-edit-existing.component.spec.ts
@@ -10,7 +10,7 @@ import { QuizQuestionListEditExistingComponent, State } from 'app/exercises/quiz
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { Course } from 'app/entities/course.model';
 import { FormsModule } from '@angular/forms';
diff --git a/src/test/javascript/spec/component/exercises/quiz/manage/re-evaluate/re-evaluate-multiple-choice-question.component.spec.ts b/src/test/javascript/spec/component/exercises/quiz/manage/re-evaluate/re-evaluate-multiple-choice-question.component.spec.ts
index 7c65c546617a..67de3457a999 100644
--- a/src/test/javascript/spec/component/exercises/quiz/manage/re-evaluate/re-evaluate-multiple-choice-question.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/quiz/manage/re-evaluate/re-evaluate-multiple-choice-question.component.spec.ts
@@ -4,13 +4,13 @@ import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from
 import { ArtemisTestModule } from '../../../../../test.module';
 import { ReEvaluateMultipleChoiceQuestionComponent } from 'app/exercises/quiz/manage/re-evaluate/multiple-choice-question/re-evaluate-multiple-choice-question.component';
 import { MultipleChoiceQuestionEditComponent } from 'app/exercises/quiz/manage/multiple-choice-question/multiple-choice-question-edit.component';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { NgModel } from '@angular/forms';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { Directive, Input } from '@angular/core';
 import { MultipleChoiceQuestion } from 'app/entities/quiz/multiple-choice-question.model';
 import { AnswerOption } from 'app/entities/quiz/answer-option.model';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 // eslint-disable-next-line @angular-eslint/directive-selector
 @Directive({ selector: '[sortableData]' })
@@ -31,7 +31,7 @@ describe('ReEvaluateMultipleChoiceQuestionComponent', () => {
             declarations: [
                 ReEvaluateMultipleChoiceQuestionComponent,
                 MockComponent(MultipleChoiceQuestionEditComponent),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockDirective(NgModel),
                 MockDirective(MockSortableDataDirective),
                 MockPipe(ArtemisTranslatePipe),
diff --git a/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts
index 8a82a0dd3925..4a7188fd906c 100644
--- a/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/example-submission-import.component.spec.ts
@@ -4,7 +4,7 @@ import { NgbPagination } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { Submission, SubmissionType } from 'app/entities/submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ExampleSubmissionImportPagingService } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import-paging.service';
 import { ExampleSubmissionImportComponent } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import.component';
 import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service';
diff --git a/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts
index 0d292309f796..4b40d355f277 100644
--- a/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/example-submissions.component.spec.ts
@@ -14,7 +14,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ResultComponent } from 'app/exercises/shared/result/result.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { HttpResponse } from '@angular/common/http';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { AlertService } from 'app/core/util/alert.service';
 
 describe('Example Submission Component', () => {
diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts
index 0faee4a0f4c9..4d6e2636cb3d 100644
--- a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores-export-button.component.spec.ts
@@ -7,7 +7,7 @@ import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { ResultService } from 'app/exercises/shared/result/result.service';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts
index c7bd261c1ed2..2bc2d727ee5e 100644
--- a/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/exercise-scores/exercise-scores.component.spec.ts
@@ -11,7 +11,7 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { Participation } from 'app/entities/participation/participation.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Result } from 'app/entities/result.model';
 import { Submission } from 'app/entities/submission.model';
 import { Team } from 'app/entities/team.model';
diff --git a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
index 23e6a4c7183c..37b91a62f115 100644
--- a/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/exercise-title-channel-name.component.spec.ts
@@ -2,7 +2,7 @@ import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NgForm } from '@angular/forms';
 import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
 import { TitleChannelNameModule } from 'app/shared/form/title-channel-name/title-channel-name.module';
 
diff --git a/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts
index f1a7ce415e15..0b2b00eff87c 100644
--- a/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/headers/difficulty-badge.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../../../../helpers/mocks/service/mock-translate.service';
 import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DifficultyLevel } from 'app/entities/exercise.model';
 
 describe('DifficultyBadge', () => {
diff --git a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts
index 6d38f089db69..433069739443 100644
--- a/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/headers/header-exercise-page-with-details.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { MockComponent, MockPipe } from 'ng-mocks';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { HeaderExercisePageWithDetailsComponent } from 'app/exercises/shared/exercise-headers/header-exercise-page-with-details.component';
 import { NotReleasedTagComponent } from 'app/shared/components/not-released-tag.component';
 import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe';
@@ -11,10 +11,10 @@ import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-hea
 import { ExerciseTypePipe } from 'app/shared/pipes/exercise-type.pipe';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { SubmissionType } from 'app/entities/submission.model';
 import { Result } from 'app/entities/result.model';
 import { LockRepositoryPolicy } from 'app/entities/submission-policy.model';
@@ -67,8 +67,7 @@ describe('HeaderExercisePageWithDetails', () => {
         expect(component.icon.iconName).toBe('keyboard');
 
         // dueDate, categories, examMode should also be set if the necessary information is known
-        const category = new ExerciseCategory();
-        category.category = 'testcategory';
+        const category = new ExerciseCategory('testcategory', undefined);
         const categories = [category];
         exercise.categories = categories;
         exam.endDate = dayjs().subtract(1, 'day');
diff --git a/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts
index 11e02319eee8..b8e5b4266769 100644
--- a/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/headers/header-participation-page.component.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { MockComponent, MockPipe } from 'ng-mocks';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { DifficultyBadgeComponent } from 'app/exercises/shared/exercise-headers/difficulty-badge.component';
@@ -8,7 +8,7 @@ import { ArtemisTestModule } from '../../../../test.module';
 import { IncludedInScoreBadgeComponent } from 'app/exercises/shared/exercise-headers/included-in-score-badge.component';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { HeaderParticipationPageComponent } from 'app/exercises/shared/exercise-headers/header-participation-page.component';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
diff --git a/src/test/javascript/spec/component/exercises/shared/result.spec.ts b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
index 65d663a7dd12..782145a2aa63 100644
--- a/src/test/javascript/spec/component/exercises/shared/result.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/result.spec.ts
@@ -13,7 +13,7 @@ import { cloneDeep } from 'lodash-es';
 import { Submission } from 'app/entities/submission.model';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { faQuestionCircle, faTimesCircle } from '@fortawesome/free-regular-svg-icons';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
@@ -23,6 +23,7 @@ import { ResultTemplateStatus } from 'app/exercises/shared/result/result.utils';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
 import { MIN_SCORE_GREEN, MIN_SCORE_ORANGE } from 'app/app.constants';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('ResultComponent', () => {
     let fixture: ComponentFixture<ResultComponent>;
@@ -50,7 +51,7 @@ describe('ResultComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
-            declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe)],
+            declarations: [ResultComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisTimeAgoPipe), MockPipe(ArtemisDatePipe), MockDirective(TranslateDirective)],
             providers: [
                 { provide: LocalStorageService, useClass: MockSyncStorage },
                 { provide: SessionStorageService, useClass: MockSyncStorage },
diff --git a/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts
index 91d124000a49..558987481795 100644
--- a/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/team-config-form-group.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Exercise, ExerciseMode } from 'app/entities/exercise.model';
 import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { Subject } from 'rxjs';
diff --git a/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts b/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts
index 9fb883b25037..6bab9646a59b 100644
--- a/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts
+++ b/src/test/javascript/spec/component/exercises/shared/team-submission-sync.component.spec.ts
@@ -14,7 +14,7 @@ import { MockHttpService } from '../../../helpers/mocks/service/mock-http.servic
 import { HttpClient } from '@angular/common/http';
 import { Submission } from 'app/entities/submission.model';
 import { Observable, Subject, of } from 'rxjs';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { SubmissionSyncPayload } from 'app/entities/submission-sync-payload.model';
 import { User } from 'app/core/user/user.model';
 import { AccountService } from 'app/core/auth/account.service';
diff --git a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts
index d104f657bdf3..3579287a3913 100644
--- a/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/file-upload-exercise/file-upload-exercise-update.component.spec.ts
@@ -17,12 +17,13 @@ import { MockProvider } from 'ng-mocks';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import dayjs from 'dayjs/esm';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { fileUploadExercise } from '../../helpers/mocks/service/mock-file-upload-exercise.service';
 import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { NgModel } from '@angular/forms';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
 
 describe('FileUploadExerciseUpdateComponent', () => {
     let comp: FileUploadExerciseUpdateComponent;
@@ -321,7 +322,7 @@ describe('FileUploadExerciseUpdateComponent', () => {
     it('should updateCategories properly by making category available for selection again when removing it', () => {
         comp.fileUploadExercise = fileUploadExercise;
         comp.exerciseCategories = [];
-        const newCategories = [{ category: 'Easy' }, { category: 'Hard' }];
+        const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)];
 
         comp.updateCategories(newCategories);
 
diff --git a/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts b/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
index 102a97560a30..7c7e5dbbdac3 100644
--- a/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
+++ b/src/test/javascript/spec/component/forms/form-status-bar.component.spec.ts
@@ -30,10 +30,6 @@ describe('FormStatusBarComponent', () => {
         jest.restoreAllMocks();
     });
 
-    it('should initializes', () => {
-        expect(comp).toBeDefined();
-    });
-
     it('should scroll to correct headline', () => {
         const mockDOMElement = { scrollIntoView: jest.fn(), style: {} };
         const getElementSpy = jest.spyOn(document, 'getElementById').mockReturnValue(mockDOMElement as any as HTMLElement);
diff --git a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts
index c9fa23b97001..7ecabd855b07 100644
--- a/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts
+++ b/src/test/javascript/spec/component/grading-system/detailed-grading-system.component.spec.ts
@@ -14,7 +14,7 @@ import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { ActivatedRoute } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Course } from 'app/entities/course.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
@@ -22,6 +22,7 @@ import { MockCourseManagementService } from '../../helpers/mocks/service/mock-co
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { PresentationType } from 'app/grading-system/grading-system-presentations/grading-system-presentations.component';
 import { download, generateCsv, mkConfig } from 'export-to-csv';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 jest.mock('export-to-csv', () => {
     return {
@@ -86,6 +87,7 @@ describe('Detailed Grading System Component', () => {
                 MockComponent(HelpIconComponent),
                 MockDirective(DeleteButtonDirective),
                 MockPipe(ArtemisTranslatePipe),
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 { provide: ActivatedRoute, useValue: route },
diff --git a/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts b/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts
index 70f795c2051c..531b3f1f2064 100644
--- a/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts
+++ b/src/test/javascript/spec/component/grading-system/interval-grading-system.component.spec.ts
@@ -11,7 +11,7 @@ import { GradeStep } from 'app/entities/grade-step.model';
 import { cloneDeep } from 'lodash-es';
 import { of } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Course } from 'app/entities/course.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts
index d34c0758200a..360a08238306 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-overview.component.spec.ts
@@ -1,6 +1,6 @@
 import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CodeHint, CodeHintGenerationStep } from 'app/entities/hestia/code-hint-model';
 import { CodeHintGenerationOverviewComponent } from 'app/exercises/programming/hestia/generation-overview/code-hint-generation-overview/code-hint-generation-overview.component';
 import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route';
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts
index 1581002cfad0..f0e9e9999233 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/code-hint-generation-step.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { CodeHintGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/code-hint-generation-step/code-hint-generation-step.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CodeHintService } from 'app/exercises/shared/exercise-hint/services/code-hint.service';
 import { CodeHint } from 'app/entities/hestia/code-hint-model';
 
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts
index 2707ed4960a3..cda7ed0c1f60 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/coverage-generation-step.component.spec.ts
@@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { CoverageGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/coverage-generation-step/coverage-generation-step.component';
 import { CoverageReport } from 'app/entities/hestia/coverage-report.model';
 
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts
index 72b487652668..6d9f4cca6346 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/diff-generation-step.component.spec.ts
@@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DiffGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/diff-generation-step/diff-generation-step.component';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
 
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts
index 34c79f31899d..9720294dde47 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/manual-solution-entry-creation-modal.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ManualSolutionEntryCreationModalComponent } from 'app/exercises/programming/hestia/generation-overview/manual-solution-entry-creation-modal/manual-solution-entry-creation-modal.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { ProgrammingExerciseSolutionEntryService } from 'app/exercises/shared/exercise-hint/services/programming-exercise-solution-entry.service';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { of } from 'rxjs';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts
index 603c7838f5cd..7852a6aa8f5f 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-details-modal.component.spec.ts
@@ -1,7 +1,7 @@
 import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ProgrammingExerciseSolutionEntryService } from 'app/exercises/shared/exercise-hint/services/programming-exercise-solution-entry.service';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { of } from 'rxjs';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
diff --git a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts
index f231e94f008c..9e4ff7118bc9 100644
--- a/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/generation-overview/solution-entry-generation-step.component.spec.ts
@@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { Observable, of } from 'rxjs';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SolutionEntryGenerationStepComponent } from 'app/exercises/programming/hestia/generation-overview/steps/solution-entry-generation-step/solution-entry-generation-step.component';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
@@ -11,7 +11,7 @@ import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programmin
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { EventEmitter } from '@angular/core';
-import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType } from 'app/entities/programming/programming-exercise-test-case.model';
 import { SortingOrder } from 'app/shared/table/pageable-table';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 
diff --git a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts
index d837ef16643a..a35ac8f46b3b 100644
--- a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-file.component.spec.ts
@@ -2,7 +2,7 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TestwiseCoverageFileComponent } from 'app/exercises/programming/hestia/testwise-coverage-report/testwise-coverage-file.component';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { TestwiseCoverageReportEntry } from 'app/entities/hestia/testwise-coverage-report-entry.model';
 import { CoverageFileReport } from 'app/entities/hestia/coverage-file-report.model';
 import { MatExpansionModule } from '@angular/material/expansion';
diff --git a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts
index 77f8c1db5cbd..1c2e97853b5b 100644
--- a/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts
+++ b/src/test/javascript/spec/component/hestia/testwise-coverage-report/testwise-coverage-report.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TestwiseCoverageReportComponent } from 'app/exercises/programming/hestia/testwise-coverage-report/testwise-coverage-report.component';
 import { CoverageReport } from 'app/entities/hestia/coverage-report.model';
 import { CoverageFileReport } from 'app/entities/hestia/coverage-file-report.model';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { TestwiseCoverageReportEntry } from 'app/entities/hestia/testwise-coverage-report-entry.model';
 
 describe('TestwiseCoverageReport Component', () => {
diff --git a/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts
index 1e6d212a1c9a..d855c5af0aa1 100644
--- a/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts
+++ b/src/test/javascript/spec/component/import/exercise-import-from-file.component.spec.ts
@@ -6,14 +6,14 @@ import { ArtemisTestModule } from '../../test.module';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { ButtonComponent } from 'app/shared/components/button.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import JSZip from 'jszip';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { UMLDiagramType } from '@ls1intum/apollon';
 
diff --git a/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts
index fb60d4ab979c..eeb648c6126e 100644
--- a/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts
+++ b/src/test/javascript/spec/component/import/exercise-import-wrapper.component.spec.ts
@@ -9,7 +9,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ArtemisTestModule } from '../../test.module';
 import { ExerciseImportTabsComponent } from 'app/exercises/shared/import/exercise-import-tabs.component';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 
 describe('ExerciseImportWrapperComponent', () => {
     let component: ExerciseImportWrapperComponent;
diff --git a/src/test/javascript/spec/component/import/exercise-import.component.spec.ts b/src/test/javascript/spec/component/import/exercise-import.component.spec.ts
index cf1a0da9a91f..ae6201f3dea5 100644
--- a/src/test/javascript/spec/component/import/exercise-import.component.spec.ts
+++ b/src/test/javascript/spec/component/import/exercise-import.component.spec.ts
@@ -3,9 +3,9 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin
 import { FormsModule } from '@angular/forms';
 import { NgbActiveModal, NgbPagination } from '@ng-bootstrap/ng-bootstrap';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ModelingExercisePagingService } from 'app/exercises/modeling/manage/modeling-exercise-paging.service';
 import { CodeAnalysisPagingService } from 'app/exercises/programming/manage/services/code-analysis-paging.service';
 import { ProgrammingExercisePagingService } from 'app/exercises/programming/manage/services/programming-exercise-paging.service';
diff --git a/src/test/javascript/spec/component/import/import.component.spec.ts b/src/test/javascript/spec/component/import/import.component.spec.ts
index 637cfb5c95de..88919c3b0a58 100644
--- a/src/test/javascript/spec/component/import/import.component.spec.ts
+++ b/src/test/javascript/spec/component/import/import.component.spec.ts
@@ -3,7 +3,7 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin
 import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
 import { NgbActiveModal, NgbPagination } from '@ng-bootstrap/ng-bootstrap';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { ImportComponent } from 'app/shared/import/import.component';
 import { BaseEntity } from 'app/shared/model/base-entity';
diff --git a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts
index a79259f2268a..ba02154c4bc5 100644
--- a/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts
+++ b/src/test/javascript/spec/component/iris/settings/iris-enabled.component.spec.ts
@@ -9,7 +9,7 @@ import { IrisSettings } from 'app/entities/iris/settings/iris-settings.model';
 import { HttpResponse } from '@angular/common/http';
 import { IrisEnabledComponent } from 'app/iris/settings/shared/iris-enabled.component';
 import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { IrisSubSettingsType } from 'app/entities/iris/settings/iris-sub-settings.model';
 
diff --git a/src/test/javascript/spec/component/learning-paths/components/learning-path-lecture-unit.component.spec.ts b/src/test/javascript/spec/component/learning-paths/components/learning-path-lecture-unit.component.spec.ts
index e82d4195a3f6..03905c6938a7 100644
--- a/src/test/javascript/spec/component/learning-paths/components/learning-path-lecture-unit.component.spec.ts
+++ b/src/test/javascript/spec/component/learning-paths/components/learning-path-lecture-unit.component.spec.ts
@@ -17,20 +17,33 @@ import { AlertService } from 'app/core/util/alert.service';
 import { MockAlertService } from '../../../helpers/mocks/service/mock-alert.service';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
 import { of } from 'rxjs';
+import { CourseInformationSharingConfiguration } from 'app/entities/course.model';
+import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
+import { MockComponent } from 'ng-mocks';
+import { LearningPathNavigationService } from 'app/course/learning-paths/services/learning-path-navigation.service';
+import { Lecture } from 'app/entities/lecture.model';
+import { LectureUnitCompletionEvent } from 'app/overview/course-lectures/course-lecture-details.component';
 
 describe('LearningPathLectureUnitComponent', () => {
     let component: LearningPathLectureUnitComponent;
     let fixture: ComponentFixture<LearningPathLectureUnitComponent>;
 
+    let learningPathNavigationService: LearningPathNavigationService;
     let lectureUnitService: LectureUnitService;
     let getLectureUnitByIdSpy: jest.SpyInstance;
+    let setLearningObjectCompletionSpy: jest.SpyInstance;
 
     const learningPathId = 1;
     const lectureUnit: VideoUnit = {
         id: 1,
         description: 'Example video unit',
         name: 'Example video',
-        lecture: { id: 2 },
+        lecture: {
+            id: 2,
+            course: {
+                courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING,
+            },
+        },
         completed: false,
         visibleToStudents: true,
         source: 'https://www.youtube.com/embed/8iU8LPEa4o0',
@@ -38,7 +51,7 @@ describe('LearningPathLectureUnitComponent', () => {
 
     beforeEach(async () => {
         await TestBed.configureTestingModule({
-            imports: [LearningPathLectureUnitComponent],
+            imports: [LearningPathLectureUnitComponent, MockComponent(DiscussionSectionComponent)],
             providers: [
                 provideHttpClient(),
                 provideHttpClientTesting(),
@@ -70,6 +83,8 @@ describe('LearningPathLectureUnitComponent', () => {
         lectureUnitService = TestBed.inject(LectureUnitService);
         getLectureUnitByIdSpy = jest.spyOn(lectureUnitService, 'getLectureUnitById').mockReturnValue(of(lectureUnit));
         lectureUnitService = TestBed.inject(LectureUnitService);
+        learningPathNavigationService = TestBed.inject(LearningPathNavigationService);
+        setLearningObjectCompletionSpy = jest.spyOn(learningPathNavigationService, 'setCurrentLearningObjectCompletion').mockReturnValue();
 
         fixture = TestBed.createComponent(LearningPathLectureUnitComponent);
         component = fixture.componentInstance;
@@ -83,10 +98,11 @@ describe('LearningPathLectureUnitComponent', () => {
     it('should initialize', () => {
         expect(component).toBeTruthy();
         expect(component.lectureUnitId()).toBe(learningPathId);
+        expect(component.isCommunicationEnabled()).toBeFalse();
     });
 
     it('should get lecture unit', async () => {
-        const getLectureUnitSpy = jest.spyOn(component, 'getLectureUnit');
+        const getLectureUnitSpy = jest.spyOn(component, 'loadLectureUnit');
 
         fixture.detectChanges();
         await fixture.whenStable();
@@ -101,8 +117,40 @@ describe('LearningPathLectureUnitComponent', () => {
         expect(component.lectureUnit()).toEqual(lectureUnit);
     });
 
+    it('should not set current learning object on error', async () => {
+        const completeLectureUnitSpy = jest.spyOn(lectureUnitService, 'completeLectureUnit').mockImplementationOnce(() => {});
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        component.setLearningObjectCompletion({ completed: true, lectureUnit: lectureUnit });
+
+        expect(completeLectureUnitSpy).toHaveBeenCalledExactlyOnceWith(lectureUnit.lecture, {
+            completed: true,
+            lectureUnit: lectureUnit,
+        });
+        expect(setLearningObjectCompletionSpy).not.toHaveBeenCalled();
+    });
+
+    it('should set current learning object completion', async () => {
+        const completeLectureUnitSpy = jest
+            .spyOn(lectureUnitService, 'completeLectureUnit')
+            .mockImplementationOnce((lecture: Lecture, completionEvent: LectureUnitCompletionEvent) => (completionEvent.lectureUnit.completed = completionEvent.completed));
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        component.setLearningObjectCompletion({ completed: true, lectureUnit: lectureUnit });
+
+        expect(completeLectureUnitSpy).toHaveBeenCalledExactlyOnceWith(lectureUnit.lecture, {
+            completed: true,
+            lectureUnit: lectureUnit,
+        });
+        expect(setLearningObjectCompletionSpy).toHaveBeenCalledExactlyOnceWith(true);
+    });
+
     it('should set loading state correctly', async () => {
-        const setIsLoadingSpy = jest.spyOn(component.isLectureUnitLoading, 'set');
+        const setIsLoadingSpy = jest.spyOn(component.isLoading, 'set');
         fixture.detectChanges();
         await fixture.whenStable();
         fixture.detectChanges();
@@ -110,4 +158,27 @@ describe('LearningPathLectureUnitComponent', () => {
         expect(setIsLoadingSpy).toHaveBeenCalledWith(true);
         expect(setIsLoadingSpy).toHaveBeenCalledWith(false);
     });
+
+    it('should show discussion section when communication is enabled', async () => {
+        fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeTruthy();
+    });
+
+    it('should not show discussion section when communication is disabled', async () => {
+        const lecture = {
+            ...lectureUnit.lecture,
+            course: { courseInformationSharingConfiguration: CourseInformationSharingConfiguration.DISABLED },
+        };
+        getLectureUnitByIdSpy.mockReturnValue(of({ ...lectureUnit, lecture }));
+
+        fixture.detectChanges();
+        await fixture.whenStable();
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeFalsy();
+    });
 });
diff --git a/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts
index 7469f93f790d..bf1140cc06fb 100644
--- a/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts
+++ b/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts
@@ -8,7 +8,7 @@ import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTo
 import { ExerciseNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { Exercise } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 
 describe('ExerciseNodeDetailsComponent', () => {
     let fixture: ComponentFixture<ExerciseNodeDetailsComponent>;
diff --git a/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts b/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts
index 3c0cc20079f0..9ead2c3a9994 100644
--- a/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts
+++ b/src/test/javascript/spec/component/learning-paths/participate/learning-path-container.component.spec.ts
@@ -13,7 +13,7 @@ import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { LearningPathLectureUnitViewComponent } from 'app/course/learning-paths/participate/lecture-unit/learning-path-lecture-unit-view.component';
 import { CourseExerciseDetailsComponent } from 'app/overview/exercise-details/course-exercise-details.component';
 import { ExerciseEntry, LearningPathStorageService, LectureUnitEntry, StorageEntry } from 'app/course/learning-paths/participate/learning-path-storage.service';
diff --git a/src/test/javascript/spec/component/learning-paths/participate/learning-path-lecture-unit-view.component.spec.ts b/src/test/javascript/spec/component/learning-paths/participate/learning-path-lecture-unit-view.component.spec.ts
index 16fa583ba3c9..ad24cc2dd512 100644
--- a/src/test/javascript/spec/component/learning-paths/participate/learning-path-lecture-unit-view.component.spec.ts
+++ b/src/test/javascript/spec/component/learning-paths/participate/learning-path-lecture-unit-view.component.spec.ts
@@ -10,7 +10,6 @@ import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-manage
 import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { OnlineUnit } from 'app/entities/lecture-unit/onlineUnit.model';
 import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model';
-import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 import { AttachmentUnitComponent } from 'app/overview/course-lectures/attachment-unit/attachment-unit.component';
 import { VideoUnitComponent } from 'app/overview/course-lectures/video-unit/video-unit.component';
 import { OnlineUnitComponent } from 'app/overview/course-lectures/online-unit/online-unit.component';
@@ -105,17 +104,4 @@ describe('LearningPathLectureUnitViewComponent', () => {
         expect(setCompletionStub).toHaveBeenCalledOnce();
         expect(setCompletionStub).toHaveBeenCalledWith(attachment.id, lecture.id, event.completed);
     });
-
-    it('should set properties of child on activate', () => {
-        const attachment = new AttachmentUnit();
-        attachment.id = 3;
-        lecture.lectureUnits = [attachment];
-        comp.lecture = lecture;
-        comp.lectureUnit = attachment;
-        lecture.course = new Course();
-        fixture.detectChanges();
-        const instance = { lecture: undefined } as DiscussionSectionComponent;
-        comp.onChildActivate(instance);
-        expect(instance.lecture).toEqual(lecture);
-    });
 });
diff --git a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts
index 765d4e646a7e..504f8ffd3903 100644
--- a/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/attachment-unit/attachment-unit.service.spec.ts
@@ -199,4 +199,23 @@ describe('AttachmentUnitService', () => {
 
         expect(response.body).toEqual(expected);
     }));
+
+    describe('getAttachmentFile', () => {
+        it('should retrieve a file as Blob for a given course and attachment unit ID', () => {
+            const courseId = 5;
+            const attachmentUnitId = 10;
+            const expectedBlob = new Blob(['example data'], { type: 'application/pdf' });
+
+            service.getAttachmentFile(courseId, attachmentUnitId).subscribe((response) => {
+                expect(response).toEqual(expectedBlob);
+            });
+
+            const req = httpMock.expectOne({
+                url: `api/files/courses/${courseId}/attachment-units/${attachmentUnitId}`,
+                method: 'GET',
+            });
+            expect(req.request.responseType).toBe('blob');
+            req.flush(expectedBlob);
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts
index 4841051e7ad9..c01d76662132 100644
--- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/create-exercise-unit.component.spec.ts
@@ -10,8 +10,8 @@ import { ExerciseUnitService } from 'app/lecture/lecture-unit/lecture-unit-manag
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts
index d44b64a65ff0..5d72248e268d 100644
--- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.component.spec.ts
@@ -4,7 +4,7 @@ import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
 import { Component, Input } from '@angular/core';
 import { Exercise } from 'app/entities/exercise.model';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { By } from '@angular/platform-browser';
 
 @Component({ selector: 'jhi-course-exercise-row', template: '' })
diff --git a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts
index 486196aa88dd..61d60ac7d907 100644
--- a/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/exercise-unit/exercise-unit.service.spec.ts
@@ -7,7 +7,7 @@ import { take } from 'rxjs/operators';
 import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
 import { ExerciseUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/exerciseUnit.service';
 import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 
diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts
index 07fdcc72f02e..bad4cf68f981 100644
--- a/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit-management.component.spec.ts
@@ -28,7 +28,7 @@ import { Competency } from 'app/entities/competency.model';
 import { UnitCreationCardComponent } from 'app/lecture/lecture-unit/lecture-unit-management/unit-creation-card/unit-creation-card.component';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { MockRouterLinkDirective } from '../../helpers/mocks/directive/mock-router-link.directive';
-import { LectureUnit } from 'app/entities/lecture-unit/lectureUnit.model';
+import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { OnlineUnit } from 'app/entities/lecture-unit/onlineUnit.model';
@@ -169,6 +169,14 @@ describe('LectureUnitManagementComponent', () => {
         expect(lectureUnitManagementComponent.getDeleteQuestionKey(new OnlineUnit())).toBe('artemisApp.onlineUnit.delete.question');
     });
 
+    it('should return default question translation key for unhandled types', () => {
+        const mockUnit = {
+            type: null,
+        };
+
+        expect(lectureUnitManagementComponent.getDeleteQuestionKey(mockUnit as unknown as LectureUnit)).toBe('');
+    });
+
     it('should give the correct confirmation text translation key', () => {
         expect(lectureUnitManagementComponent.getDeleteConfirmationTextKey(new AttachmentUnit())).toBe('artemisApp.attachmentUnit.delete.typeNameToConfirm');
         expect(lectureUnitManagementComponent.getDeleteConfirmationTextKey(new ExerciseUnit())).toBe('artemisApp.exerciseUnit.delete.typeNameToConfirm');
@@ -177,6 +185,14 @@ describe('LectureUnitManagementComponent', () => {
         expect(lectureUnitManagementComponent.getDeleteConfirmationTextKey(new OnlineUnit())).toBe('artemisApp.onlineUnit.delete.typeNameToConfirm');
     });
 
+    it('should return default confirmation text translation key for unhandled types', () => {
+        const mockUnit = {
+            type: null,
+        };
+
+        expect(lectureUnitManagementComponent.getDeleteConfirmationTextKey(mockUnit as unknown as LectureUnit)).toBe('');
+    });
+
     it('should give the correct action type', () => {
         expect(lectureUnitManagementComponent.getActionType(new AttachmentUnit())).toEqual(ActionType.Delete);
         expect(lectureUnitManagementComponent.getActionType(new ExerciseUnit())).toEqual(ActionType.Unlink);
@@ -184,4 +200,29 @@ describe('LectureUnitManagementComponent', () => {
         expect(lectureUnitManagementComponent.getActionType(new VideoUnit())).toEqual(ActionType.Delete);
         expect(lectureUnitManagementComponent.getActionType(new OnlineUnit())).toEqual(ActionType.Delete);
     });
+
+    describe('isViewButtonAvailable', () => {
+        it('should return true for an attachment unit with a PDF link', () => {
+            const lectureUnit = {
+                type: LectureUnitType.ATTACHMENT,
+                attachment: { link: 'file.pdf' },
+            } as LectureUnit;
+            expect(lectureUnitManagementComponent.isViewButtonAvailable(lectureUnit)).toBeTrue();
+        });
+
+        it('should return false for file extension different than .pdf', () => {
+            const lectureUnit = {
+                type: LectureUnitType.ATTACHMENT,
+                attachment: { link: 'file.txt' },
+            };
+            expect(lectureUnitManagementComponent.isViewButtonAvailable(lectureUnit)).toBeFalse();
+        });
+
+        it('should return false for a text unit', () => {
+            const lectureUnit = {
+                type: LectureUnitType.TEXT,
+            };
+            expect(lectureUnitManagementComponent.isViewButtonAvailable(lectureUnit)).toBeFalse();
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts
index c068f467ac38..9195af36b64b 100644
--- a/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/lecture-unit.service.spec.ts
@@ -10,7 +10,7 @@ import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { VideoUnit } from 'app/entities/lecture-unit/videoUnit.model';
 import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Attachment, AttachmentType } from 'app/entities/attachment.model';
 import { ArtemisTestModule } from '../../test.module';
 
diff --git a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts
index 0dfc849da228..32f0d6889eec 100644
--- a/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture-unit/text-unit/text-unit-form.component.spec.ts
@@ -12,7 +12,7 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
 import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component';
 
-@Component({ selector: 'jhi-markdown-editor', template: '' })
+@Component({ selector: 'jhi-markdown-editor-monaco', template: '' })
 class MarkdownEditorStubComponent {
     @Input() markdown: string;
     @Input() enableResize = false;
diff --git a/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts
index 773142efa909..72bab398d1f1 100644
--- a/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture/lecture-attachments.component.spec.ts
@@ -20,6 +20,7 @@ import { of, take, throwError } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { LectureService } from 'app/lecture/lecture.service';
+import { RouterModule } from '@angular/router';
 
 describe('LectureAttachmentsComponent', () => {
     let comp: LectureAttachmentsComponent;
@@ -84,7 +85,7 @@ describe('LectureAttachmentsComponent', () => {
 
     beforeEach(() => {
         return TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
+            imports: [ArtemisTestModule, MockDirective(NgbTooltip), RouterModule],
             declarations: [
                 LectureAttachmentsComponent,
                 MockComponent(FormDateTimePickerComponent),
@@ -154,7 +155,7 @@ describe('LectureAttachmentsComponent', () => {
         fixture.detectChanges();
         tick();
         expect(comp.attachments).toHaveLength(3);
-        expect(attachmentServiceFindAllByLectureIdStub).toHaveBeenCalledOnce();
+        expect(attachmentServiceFindAllByLectureIdStub).toHaveBeenCalledTimes(2);
     }));
 
     it('should not accept too large file', fakeAsync(() => {
@@ -379,4 +380,21 @@ describe('LectureAttachmentsComponent', () => {
         expect(comp.attachmentToBeCreated.link).toBe(myBlob1.name);
         expect(attachmentServiceFindAllByLectureIdStub).toHaveBeenCalledOnce();
     }));
+
+    describe('isViewButtonAvailable', () => {
+        it('should return true if the attachment link ends with .pdf', () => {
+            const attachment = { id: 1, link: 'example.pdf', attachmentType: 'FILE' } as Attachment;
+            expect(comp.isViewButtonAvailable(attachment.link!)).toBeTrue();
+        });
+
+        it('should return false if the attachment link does not end with .pdf', () => {
+            const attachment = { id: 2, link: 'example.txt', attachmentType: 'FILE' } as Attachment;
+            expect(comp.isViewButtonAvailable(attachment.link!)).toBeFalse();
+        });
+
+        it.each([['document.docx'], ['spreadsheet.xlsx'], ['presentation.pptx'], ['image.jpeg']])('should return false for common file extension %s', (link) => {
+            const attachment = { link };
+            expect(comp.isViewButtonAvailable(attachment.link)).toBeFalse();
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts b/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts
index c53c66a2034f..03be222b4cb4 100644
--- a/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture/lecture-update.component.spec.ts
@@ -10,7 +10,6 @@ import { LectureUpdateComponent } from 'app/lecture/lecture-update.component';
 import { LectureService } from 'app/lecture/lecture.service';
 import { LectureUpdateWizardComponent } from 'app/lecture/wizard-mode/lecture-update-wizard.component';
 import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
@@ -23,6 +22,7 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate
 import { ArtemisTestModule } from '../../test.module';
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
 import { LectureTitleChannelNameComponent } from 'app/lecture/lecture-title-channel-name.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('LectureUpdateComponent', () => {
     let lectureUpdateWizardComponentFixture: ComponentFixture<LectureUpdateWizardComponent>;
@@ -51,7 +51,7 @@ describe('LectureUpdateComponent', () => {
                 MockComponent(LectureTitleChannelNameComponent),
                 MockComponent(LectureUpdateWizardComponent),
                 MockComponent(FormDateTimePickerComponent),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(DocumentationButtonComponent),
                 MockPipe(ArtemisTranslatePipe),
                 MockPipe(ArtemisDatePipe),
diff --git a/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts b/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts
new file mode 100644
index 000000000000..03e494ccbd41
--- /dev/null
+++ b/src/test/javascript/spec/component/lecture/pdf-preview.component.spec.ts
@@ -0,0 +1,437 @@
+import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
+
+jest.mock('pdfjs-dist', () => {
+    return {
+        getDocument: jest.fn(() => ({
+            promise: Promise.resolve({
+                numPages: 1,
+                getPage: jest.fn(() =>
+                    Promise.resolve({
+                        getViewport: jest.fn(() => ({ width: 600, height: 800, scale: 1 })),
+                        render: jest.fn(() => ({
+                            promise: Promise.resolve(),
+                        })),
+                    }),
+                ),
+            }),
+        })),
+    };
+});
+
+jest.mock('pdfjs-dist/build/pdf.worker', () => {
+    return {};
+});
+
+function createMockEvent(target: Element, eventType = 'click'): MouseEvent {
+    const event = new MouseEvent(eventType, {
+        view: window,
+        bubbles: true,
+        cancelable: true,
+    });
+    Object.defineProperty(event, 'target', { value: target, writable: false });
+    return event;
+}
+
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { of, throwError } from 'rxjs';
+import { AttachmentService } from 'app/lecture/attachment.service';
+import { AttachmentUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/attachmentUnit.service';
+import { PdfPreviewComponent } from 'app/lecture/pdf-preview/pdf-preview.component';
+import { ElementRef } from '@angular/core';
+import { AlertService } from 'app/core/util/alert.service';
+import { HttpErrorResponse } from '@angular/common/http';
+import { TranslateService } from '@ngx-translate/core';
+
+describe('PdfPreviewComponent', () => {
+    let component: PdfPreviewComponent;
+    let fixture: ComponentFixture<PdfPreviewComponent>;
+    let attachmentServiceMock: any;
+    let attachmentUnitServiceMock: any;
+    let alertServiceMock: any;
+    let routeMock: any;
+    let mockCanvasElement: HTMLCanvasElement;
+    let mockEnlargedCanvas: HTMLCanvasElement;
+    let mockContext: any;
+    let mockOverlay: HTMLDivElement;
+
+    beforeEach(async () => {
+        global.URL.createObjectURL = jest.fn().mockReturnValue('mocked_blob_url');
+        attachmentServiceMock = {
+            getAttachmentFile: jest.fn().mockReturnValue(of(new Blob([''], { type: 'application/pdf' }))),
+        };
+        attachmentUnitServiceMock = {
+            getAttachmentFile: jest.fn().mockReturnValue(of(new Blob([''], { type: 'application/pdf' }))),
+        };
+        routeMock = {
+            data: of({
+                course: { id: 1, name: 'Example Course' },
+                attachment: { id: 1, name: 'Example PDF' },
+                attachmentUnit: { id: 1, name: 'Chapter 1' },
+            }),
+        };
+        alertServiceMock = {
+            addAlert: jest.fn(),
+            error: jest.fn(),
+        };
+
+        await TestBed.configureTestingModule({
+            imports: [PdfPreviewComponent],
+            providers: [
+                { provide: ActivatedRoute, useValue: routeMock },
+                { provide: AttachmentService, useValue: attachmentServiceMock },
+                { provide: AttachmentUnitService, useValue: attachmentUnitServiceMock },
+                { provide: AlertService, useValue: alertServiceMock },
+                { provide: TranslateService, useClass: MockTranslateService },
+            ],
+        }).compileComponents();
+
+        const pdfContainerElement = document.createElement('div');
+        Object.defineProperty(pdfContainerElement, 'clientWidth', { value: 800 });
+        Object.defineProperty(pdfContainerElement, 'clientHeight', { value: 600 });
+
+        fixture = TestBed.createComponent(PdfPreviewComponent);
+        component = fixture.componentInstance;
+
+        mockCanvasElement = document.createElement('canvas');
+        mockCanvasElement.width = 800;
+        mockCanvasElement.height = 600;
+
+        jest.spyOn(component, 'updateEnlargedCanvas').mockImplementation(() => {
+            component.enlargedCanvas.nativeElement = mockCanvasElement;
+        });
+
+        mockEnlargedCanvas = document.createElement('canvas');
+        mockEnlargedCanvas.classList.add('enlarged-canvas');
+        component.enlargedCanvas = new ElementRef(mockEnlargedCanvas);
+
+        mockContext = {
+            clearRect: jest.fn(),
+            drawImage: jest.fn(),
+        } as unknown as CanvasRenderingContext2D;
+        jest.spyOn(mockCanvasElement, 'getContext').mockReturnValue(mockContext);
+
+        jest.spyOn(window, 'requestAnimationFrame').mockImplementation((cb: FrameRequestCallback) => {
+            cb(0);
+            return 0;
+        });
+        mockOverlay = document.createElement('div');
+        mockOverlay.style.opacity = '0';
+        mockCanvasElement.appendChild(mockOverlay);
+
+        fixture.detectChanges();
+
+        component.pdfContainer = new ElementRef(document.createElement('div'));
+        component.enlargedCanvas = new ElementRef(document.createElement('canvas'));
+        fixture.detectChanges();
+    });
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+
+    it('should load attachment file and verify service calls when attachment data is available', () => {
+        component.ngOnInit();
+        expect(attachmentServiceMock.getAttachmentFile).toHaveBeenCalledWith(1, 1);
+        expect(attachmentUnitServiceMock.getAttachmentFile).not.toHaveBeenCalled();
+    });
+
+    it('should load attachment unit file and verify service calls when attachment unit data is available', () => {
+        routeMock.data = of({
+            course: { id: 1, name: 'Example Course' },
+            attachmentUnit: { id: 1, name: 'Chapter 1' },
+        });
+        component.ngOnInit();
+        expect(attachmentUnitServiceMock.getAttachmentFile).toHaveBeenCalledWith(1, 1);
+        expect(attachmentServiceMock.getAttachmentFile).toHaveBeenCalled();
+    });
+
+    it('should handle errors and trigger alert when loading an attachment file fails', () => {
+        const errorResponse = new HttpErrorResponse({
+            status: 404,
+            statusText: 'Not Found',
+            error: 'File not found',
+        });
+
+        const attachmentService = TestBed.inject(AttachmentService);
+        jest.spyOn(attachmentService, 'getAttachmentFile').mockReturnValue(throwError(() => errorResponse));
+        const alertServiceSpy = jest.spyOn(alertServiceMock, 'error');
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
+    });
+
+    it('should handle errors and trigger alert when loading an attachment unit file fails', () => {
+        routeMock.data = of({
+            course: { id: 1, name: 'Example Course' },
+            attachmentUnit: { id: 1, name: 'Chapter 1' },
+        });
+        const errorResponse = new HttpErrorResponse({
+            status: 404,
+            statusText: 'Not Found',
+            error: 'File not found',
+        });
+
+        const attachmentUnitService = TestBed.inject(AttachmentUnitService);
+        jest.spyOn(attachmentUnitService, 'getAttachmentFile').mockReturnValue(throwError(() => errorResponse));
+        const alertServiceSpy = jest.spyOn(alertServiceMock, 'error');
+
+        component.ngOnInit();
+        fixture.detectChanges();
+
+        expect(alertServiceSpy).toHaveBeenCalledOnce();
+    });
+
+    it('should load PDF and verify rendering of pages', () => {
+        const mockBlob = new Blob(['PDF content'], { type: 'application/pdf' });
+
+        attachmentServiceMock.getAttachmentFile.mockReturnValue(of(mockBlob));
+        component.ngOnInit();
+
+        expect(URL.createObjectURL).toHaveBeenCalledWith(mockBlob);
+        expect(attachmentServiceMock.getAttachmentFile).toHaveBeenCalledWith(1, 1);
+        expect(component.totalPages).toBeGreaterThan(0);
+    });
+
+    it('should navigate through pages using keyboard in enlarged view', () => {
+        component.isEnlargedView = true;
+        component.totalPages = 5;
+        component.currentPage = 3;
+
+        const eventRight = new KeyboardEvent('keydown', { key: 'ArrowRight' });
+        const eventLeft = new KeyboardEvent('keydown', { key: 'ArrowLeft' });
+
+        component.handleKeyboardEvents(eventRight);
+        expect(component.currentPage).toBe(4);
+
+        component.handleKeyboardEvents(eventLeft);
+        expect(component.currentPage).toBe(3);
+    });
+
+    it('should toggle enlarged view state', () => {
+        const mockCanvas = document.createElement('canvas');
+        component.displayEnlargedCanvas(mockCanvas, 1);
+        expect(component.isEnlargedView).toBeTrue();
+
+        const clickEvent = new MouseEvent('click', {
+            button: 0,
+        });
+
+        component.closeEnlargedView(clickEvent);
+        expect(component.isEnlargedView).toBeFalse();
+    });
+
+    it('should prevent scrolling when enlarged view is active', () => {
+        component.toggleBodyScroll(true);
+        expect(component.pdfContainer.nativeElement.style.overflow).toBe('hidden');
+
+        component.toggleBodyScroll(false);
+        expect(component.pdfContainer.nativeElement.style.overflow).toBe('auto');
+    });
+
+    it('should not update canvas size if not in enlarged view', () => {
+        component.isEnlargedView = false;
+        component.currentPage = 3;
+
+        const spy = jest.spyOn(component, 'updateEnlargedCanvas');
+        component.adjustCanvasSize();
+
+        expect(spy).not.toHaveBeenCalled();
+    });
+
+    it('should not update canvas size if the current page canvas does not exist', () => {
+        component.isEnlargedView = true;
+        component.currentPage = 10;
+
+        const spy = jest.spyOn(component, 'updateEnlargedCanvas');
+        component.adjustCanvasSize();
+
+        expect(spy).not.toHaveBeenCalled();
+    });
+
+    it('should prevent navigation beyond last page', () => {
+        component.currentPage = component.totalPages = 5;
+        component.handleKeyboardEvents(new KeyboardEvent('keydown', { key: 'ArrowRight' }));
+
+        expect(component.currentPage).toBe(5);
+    });
+
+    it('should prevent navigation before first page', () => {
+        component.currentPage = 1;
+        component.handleKeyboardEvents(new KeyboardEvent('keydown', { key: 'ArrowLeft' }));
+
+        expect(component.currentPage).toBe(1);
+    });
+
+    it('should unsubscribe attachment subscription during component destruction', () => {
+        const spySub = jest.spyOn(component.attachmentSub, 'unsubscribe');
+        component.ngOnDestroy();
+        expect(spySub).toHaveBeenCalled();
+    });
+
+    it('should unsubscribe attachmentUnit subscription during component destruction', () => {
+        routeMock.data = of({
+            course: { id: 1, name: 'Example Course' },
+            attachmentUnit: { id: 1, name: 'Chapter 1' },
+        });
+        component.ngOnInit();
+        fixture.detectChanges();
+        expect(component.attachmentUnitSub).toBeDefined();
+        const spySub = jest.spyOn(component.attachmentUnitSub, 'unsubscribe');
+        component.ngOnDestroy();
+        expect(spySub).toHaveBeenCalled();
+    });
+
+    it('should stop event propagation and navigate pages', () => {
+        const navigateSpy = jest.spyOn(component, 'navigatePages');
+        const eventMock = { stopPropagation: jest.fn() } as unknown as MouseEvent;
+
+        component.handleNavigation('next', eventMock);
+
+        expect(eventMock.stopPropagation).toHaveBeenCalled();
+        expect(navigateSpy).toHaveBeenCalledWith('next');
+    });
+
+    it('should call updateEnlargedCanvas when window is resized and conditions are met', () => {
+        component.isEnlargedView = true;
+        component.currentPage = 1;
+
+        const canvas = document.createElement('canvas');
+        const pdfContainer = document.createElement('div');
+        pdfContainer.className = 'pdf-page-container';
+        pdfContainer.appendChild(canvas);
+        component.pdfContainer = {
+            nativeElement: pdfContainer,
+        } as ElementRef;
+
+        const updateEnlargedCanvasSpy = jest.spyOn(component, 'updateEnlargedCanvas');
+        const adjustCanvasSizeSpy = jest.spyOn(component, 'adjustCanvasSize');
+
+        window.dispatchEvent(new Event('resize'));
+        expect(adjustCanvasSizeSpy).toHaveBeenCalled();
+        expect(updateEnlargedCanvasSpy).toHaveBeenCalledWith(canvas);
+    });
+
+    it('should close the enlarged view if click is outside the canvas within the enlarged container', () => {
+        const target = document.createElement('div');
+        target.classList.add('enlarged-container');
+        const mockEvent = createMockEvent(target);
+
+        component.isEnlargedView = true;
+        const closeSpy = jest.spyOn(component, 'closeEnlargedView');
+
+        component.closeIfOutside(mockEvent);
+
+        expect(closeSpy).toHaveBeenCalled();
+        expect(component.isEnlargedView).toBeFalse();
+    });
+
+    it('should not close the enlarged view if the click is on the canvas itself', () => {
+        const mockEvent = createMockEvent(mockEnlargedCanvas);
+        Object.defineProperty(mockEvent, 'target', { value: mockEnlargedCanvas, writable: false });
+
+        component.isEnlargedView = true;
+
+        const closeSpy = jest.spyOn(component, 'closeEnlargedView');
+
+        component.closeIfOutside(mockEvent as unknown as MouseEvent);
+
+        expect(closeSpy).not.toHaveBeenCalled();
+    });
+
+    it('should calculate the correct scale factor based on container and canvas dimensions', () => {
+        Object.defineProperty(component.pdfContainer.nativeElement, 'clientWidth', { value: 1000, configurable: true });
+        Object.defineProperty(component.pdfContainer.nativeElement, 'clientHeight', { value: 800, configurable: true });
+
+        mockCanvasElement.width = 500;
+        mockCanvasElement.height = 400;
+
+        const scaleFactor = component.calculateScaleFactor(mockCanvasElement);
+        expect(scaleFactor).toBe(2);
+    });
+
+    it('should resize the canvas based on the given scale factor', () => {
+        mockCanvasElement.width = 500;
+        mockCanvasElement.height = 400;
+        component.resizeCanvas(mockCanvasElement, 2);
+
+        expect(component.enlargedCanvas.nativeElement.width).toBe(1000);
+        expect(component.enlargedCanvas.nativeElement.height).toBe(800);
+    });
+
+    it('should clear and redraw the canvas with the new dimensions', () => {
+        mockCanvasElement.width = 500;
+        mockCanvasElement.height = 400;
+
+        jest.spyOn(mockContext, 'clearRect');
+        jest.spyOn(mockContext, 'drawImage');
+
+        component.resizeCanvas(mockCanvasElement, 2);
+        component.redrawCanvas(mockCanvasElement);
+
+        expect(component.enlargedCanvas.nativeElement.width).toBe(1000); // 500 * 2
+        expect(component.enlargedCanvas.nativeElement.height).toBe(800); // 400 * 2
+
+        expect(mockContext.clearRect).toHaveBeenCalledWith(0, 0, 1000, 800);
+        expect(mockContext.drawImage).toHaveBeenCalledWith(mockCanvasElement, 0, 0, 1000, 800);
+    });
+
+    it('should correctly position the canvas', () => {
+        const parent = document.createElement('div');
+        component.pdfContainer = { nativeElement: { clientWidth: 1000, clientHeight: 800, scrollTop: 500 } } as ElementRef<HTMLDivElement>;
+        const canvasElem = component.enlargedCanvas.nativeElement;
+        parent.appendChild(canvasElem);
+        canvasElem.width = 500;
+        canvasElem.height = 400;
+        component.positionCanvas();
+        expect(canvasElem.style.left).toBe('250px');
+        expect(canvasElem.style.top).toBe('200px');
+        expect(parent.style.top).toBe('500px');
+    });
+
+    it('should create a container with correct styles and children', () => {
+        const mockCanvas = document.createElement('canvas');
+        mockCanvas.style.width = '600px';
+        mockCanvas.style.height = '400px';
+
+        const container = component.createContainer(mockCanvas, 1);
+        expect(container.tagName).toBe('DIV');
+        expect(container.classList.contains('pdf-page-container')).toBeTruthy();
+        expect(container.style.position).toBe('relative');
+        expect(container.style.display).toBe('inline-block');
+        expect(container.style.width).toBe('600px');
+        expect(container.style.height).toBe('400px');
+        expect(container.style.margin).toBe('20px');
+        expect(container.children).toHaveLength(2);
+
+        expect(container.firstChild).toBe(mockCanvas);
+    });
+
+    it('should handle mouseenter and mouseleave events correctly', () => {
+        const mockCanvas = document.createElement('canvas');
+        const container = component.createContainer(mockCanvas, 1);
+        const overlay = container.children[1] as HTMLElement;
+
+        // Trigger mouseenter
+        const mouseEnterEvent = new Event('mouseenter');
+        container.dispatchEvent(mouseEnterEvent);
+        expect(overlay.style.opacity).toBe('1');
+
+        // Trigger mouseleave
+        const mouseLeaveEvent = new Event('mouseleave');
+        container.dispatchEvent(mouseLeaveEvent);
+        expect(overlay.style.opacity).toBe('0');
+    });
+
+    it('should handle click event on overlay to trigger displayEnlargedCanvas', () => {
+        jest.spyOn(component, 'displayEnlargedCanvas');
+        const mockCanvas = document.createElement('canvas');
+        const container = component.createContainer(mockCanvas, 1);
+        const overlay = container.children[1];
+
+        overlay.dispatchEvent(new Event('click'));
+        expect(component.displayEnlargedCanvas).toHaveBeenCalledWith(mockCanvas, 1);
+    });
+});
diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts
deleted file mode 100644
index 2882280317c4..000000000000
--- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-competencies.component.spec.ts
+++ /dev/null
@@ -1,518 +0,0 @@
-import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
-import { AlertService } from 'app/core/util/alert.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { MockRouter } from '../../../helpers/mocks/mock-router';
-import { of, throwError } from 'rxjs';
-import { HttpResponse } from '@angular/common/http';
-import { Lecture } from 'app/entities/lecture.model';
-import { LectureUpdateWizardCompetenciesComponent } from 'app/lecture/wizard-mode/lecture-wizard-competencies.component';
-import { LectureService } from 'app/lecture/lecture.service';
-import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
-import { TranslateService } from '@ngx-translate/core';
-import { CompetencyService } from 'app/course/competencies/competency.service';
-import { Competency } from 'app/entities/competency.model';
-import { Course } from 'app/entities/course.model';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
-import { ExerciseUnit } from 'app/entities/lecture-unit/exerciseUnit.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { CourseCompetencyFormData } from 'app/course/competencies/forms/course-competency-form.component';
-
-describe('LectureWizardCompetenciesComponent', () => {
-    let wizardCompetenciesComponentFixture: ComponentFixture<LectureUpdateWizardCompetenciesComponent>;
-    let wizardCompetenciesComponent: LectureUpdateWizardCompetenciesComponent;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [],
-            declarations: [LectureUpdateWizardCompetenciesComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)],
-            providers: [
-                MockProvider(AlertService),
-                MockProvider(LectureService),
-                MockProvider(CompetencyService),
-                { provide: TranslateService, useClass: MockTranslateService },
-                { provide: Router, useClass: MockRouter },
-                {
-                    provide: ActivatedRoute,
-                    useValue: { queryParams: of({}) },
-                },
-            ],
-            schemas: [],
-        })
-            .compileComponents()
-            .then(() => {
-                wizardCompetenciesComponentFixture = TestBed.createComponent(LectureUpdateWizardCompetenciesComponent);
-                wizardCompetenciesComponent = wizardCompetenciesComponentFixture.componentInstance;
-
-                const course = new Course();
-                course.id = 2;
-
-                wizardCompetenciesComponent.lecture = new Lecture();
-                wizardCompetenciesComponent.lecture.id = 1;
-                wizardCompetenciesComponent.lecture.course = course;
-            });
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it('should initialize and load data', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        const lecture = new Lecture();
-        lecture.id = 1;
-        const lectureResponse: HttpResponse<Lecture> = new HttpResponse({
-            body: lecture,
-            status: 201,
-        });
-        const lectureStub = jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(of(lectureResponse));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        const competenciesStub = jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-        expect(wizardCompetenciesComponent).not.toBeNull();
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(lectureStub).toHaveBeenCalledOnce();
-            expect(competenciesStub).toHaveBeenCalledOnce();
-
-            expect(wizardCompetenciesComponent.lecture).toBe(lecture);
-            expect(wizardCompetenciesComponent.competencies).toBe(competencies);
-        });
-    }));
-
-    it('should show create form and load lecture when clicked', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        const lecture = new Lecture();
-        lecture.id = 1;
-        const lectureResponse: HttpResponse<Lecture> = new HttpResponse({
-            body: lecture,
-            status: 201,
-        });
-        const lectureStub = jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(of(lectureResponse));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponent.showCreateCompetency();
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(lectureStub).toHaveBeenCalledTimes(2);
-
-            expect(wizardCompetenciesComponent.lecture).toBe(lecture);
-            expect(wizardCompetenciesComponent.isAddingCompetency).toBeTrue();
-        });
-    }));
-
-    it('should show an alert when loading fails', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        const lectureStub = jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        const alertStub = jest.spyOn(alertService, 'error');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(lectureStub).toHaveBeenCalledOnce();
-            expect(alertStub).toHaveBeenCalledOnce();
-        });
-    }));
-
-    it('should show an alert when creating fails', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        const createStub = jest.spyOn(competencyService, 'create').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        const alertStub = jest.spyOn(alertService, 'error');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponent.createCompetency({
-            id: 1,
-            title: 'Competency',
-        });
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(createStub).toHaveBeenCalledOnce();
-            expect(alertStub).toHaveBeenCalledTimes(2);
-        });
-    }));
-
-    it('should show an alert when deleting fails', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        const alertStub = jest.spyOn(alertService, 'error');
-        const deleteStub = jest.spyOn(competencyService, 'delete').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponent.deleteCompetency(competencies[0]);
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(deleteStub).toHaveBeenCalledOnce();
-            expect(alertStub).toHaveBeenCalledOnce();
-        });
-    }));
-
-    it('should show an alert when editing fails', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        const editStub = jest.spyOn(competencyService, 'update').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        const alertStub = jest.spyOn(alertService, 'error');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.currentlyProcessedCompetency = {};
-            wizardCompetenciesComponent.editCompetency({
-                id: 1,
-                title: 'Competency',
-            });
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(editStub).toHaveBeenCalledOnce();
-                expect(alertStub).toHaveBeenCalledTimes(2);
-            });
-        });
-    }));
-
-    it('should close all forms when canceling', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponent.onCompetencyFormCanceled();
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(wizardCompetenciesComponent.isAddingCompetency).toBeFalse();
-            expect(wizardCompetenciesComponent.isEditingCompetency).toBeFalse();
-            expect(wizardCompetenciesComponent.isLoadingCompetencyForm).toBeFalse();
-        });
-    }));
-
-    it('should delete the competency when clicked', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competencies: Competency[] = [{}];
-        const competenciesResponse: HttpResponse<Competency[]> = new HttpResponse({
-            body: competencies,
-            status: 201,
-        });
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(of(competenciesResponse));
-        const deleteStub = jest.spyOn(competencyService, 'delete').mockReturnValue(of(new HttpResponse<any>({ status: 201 })));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        wizardCompetenciesComponent.deleteCompetency(competencies[0]);
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(deleteStub).toHaveBeenCalledOnce();
-        });
-    }));
-
-    it('should open the form when editing', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const competency: Competency = {};
-        competency.id = 12;
-        wizardCompetenciesComponent.startEditCompetency(competency);
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            expect(wizardCompetenciesComponent.isEditingCompetency).toBeTrue();
-            expect(wizardCompetenciesComponent.currentlyProcessedCompetency.id).toBe(12);
-        });
-    }));
-
-    it('should return the connected units for a competency and lecture', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const lectureUnit = new TextUnit();
-        lectureUnit.name = 'Test';
-        lectureUnit.id = 5;
-
-        wizardCompetenciesComponent.lecture.lectureUnits = [lectureUnit];
-
-        const competency: Competency = {};
-        competency.id = 12;
-        competency.lectureUnits = [lectureUnit];
-        const result = wizardCompetenciesComponent.getConnectedUnitsForCompetency(competency);
-
-        expect(result).toBe('Test');
-    }));
-
-    it('should return no connected units for empty competency', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const competency: Competency = {};
-        competency.id = 12;
-        const result = wizardCompetenciesComponent.getConnectedUnitsForCompetency(competency);
-
-        expect(result).toBe('artemisApp.lecture.wizardMode.competencyNoConnectedUnits');
-    }));
-
-    it('should call the service and show an alert when creating a competency', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const createStub = jest.spyOn(competencyService, 'create').mockReturnValue(of(new HttpResponse<any>({ status: 201, body: {} })));
-        const alertStub = jest.spyOn(alertService, 'success');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const formData: CourseCompetencyFormData = {
-            id: 1,
-            title: 'Competency',
-        };
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.isEditingCompetency = false;
-            wizardCompetenciesComponent.onCompetencyFormSubmitted(formData);
-
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(wizardCompetenciesComponent.isAddingCompetency).toBeFalse();
-                expect(createStub).toHaveBeenCalledOnce();
-                expect(alertStub).toHaveBeenCalledOnce();
-            });
-        });
-    }));
-
-    it('should append exercises as units when creating a competency', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competency: Competency = {};
-        const exercise = new TextExercise(undefined, undefined);
-        exercise.id = 2;
-        competency.exercises = [exercise];
-        competency.lectureUnits = [];
-        const createStub = jest.spyOn(competencyService, 'create').mockReturnValue(of(new HttpResponse<any>({ status: 201, body: competency })));
-        const alertStub = jest.spyOn(alertService, 'success');
-
-        const unit = new ExerciseUnit();
-        unit.id = 2;
-        unit.exercise = exercise;
-
-        wizardCompetenciesComponent.lecture.lectureUnits = [unit];
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const formData: CourseCompetencyFormData = {
-            id: 1,
-            title: 'Competency',
-        };
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.lecture.lectureUnits = [unit];
-            wizardCompetenciesComponent.isEditingCompetency = false;
-            wizardCompetenciesComponent.onCompetencyFormSubmitted(formData);
-
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(wizardCompetenciesComponent.isAddingCompetency).toBeFalse();
-                expect(createStub).toHaveBeenCalledOnce();
-                expect(alertStub).toHaveBeenCalledOnce();
-
-                expect(wizardCompetenciesComponent.competencies).toHaveLength(1);
-                expect(wizardCompetenciesComponent.competencies[0]!.lectureUnits![0]!.id).toBe(2);
-            });
-        });
-    }));
-
-    it('should not call the service when creating a competency with an empty form', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const createStub = jest.spyOn(competencyService, 'create').mockReturnValue(of(new HttpResponse<any>({ status: 201, body: {} })));
-        const alertStub = jest.spyOn(alertService, 'success');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const formData: CourseCompetencyFormData = {};
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.createCompetency(formData);
-
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(createStub).not.toHaveBeenCalled();
-                expect(alertStub).not.toHaveBeenCalled();
-            });
-        });
-    }));
-
-    it('should call the service and show an alert when editing a competency', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const editStub = jest.spyOn(competencyService, 'update').mockReturnValue(of(new HttpResponse<any>({ status: 201, body: {} })));
-        const alertStub = jest.spyOn(alertService, 'success');
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const formData: CourseCompetencyFormData = {
-            id: 1,
-            title: 'Competency',
-        };
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.currentlyProcessedCompetency = {};
-            wizardCompetenciesComponent.isEditingCompetency = true;
-            wizardCompetenciesComponent.onCompetencyFormSubmitted(formData);
-
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(wizardCompetenciesComponent.isEditingCompetency).toBeFalse();
-                expect(editStub).toHaveBeenCalledOnce();
-                expect(alertStub).toHaveBeenCalledOnce();
-            });
-        });
-    }));
-
-    it('should append exercises as units when editing a competency', fakeAsync(() => {
-        const lectureService = TestBed.inject(LectureService);
-        const competencyService = TestBed.inject(CompetencyService);
-        const alertService = TestBed.inject(AlertService);
-
-        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(throwError(() => ({ status: 404 })));
-        jest.spyOn(competencyService, 'getAllForCourse').mockReturnValue(throwError(() => ({ status: 404 })));
-
-        const competency: Competency = {};
-        const exercise = new TextExercise(undefined, undefined);
-        exercise.id = 2;
-        competency.exercises = [exercise];
-        competency.lectureUnits = [];
-        const editStub = jest.spyOn(competencyService, 'update').mockReturnValue(of(new HttpResponse<any>({ status: 201, body: competency })));
-        const alertStub = jest.spyOn(alertService, 'success');
-
-        const unit = new ExerciseUnit();
-        unit.id = 2;
-        unit.exercise = exercise;
-
-        wizardCompetenciesComponent.lecture.lectureUnits = [unit];
-
-        wizardCompetenciesComponentFixture.detectChanges();
-
-        const formData: CourseCompetencyFormData = {
-            id: 1,
-            title: 'Competency',
-        };
-
-        wizardCompetenciesComponentFixture.whenStable().then(() => {
-            wizardCompetenciesComponent.currentlyProcessedCompetency = {};
-            wizardCompetenciesComponent.lecture.lectureUnits = [unit];
-            wizardCompetenciesComponent.isEditingCompetency = true;
-            wizardCompetenciesComponent.onCompetencyFormSubmitted(formData);
-
-            wizardCompetenciesComponentFixture.whenStable().then(() => {
-                expect(wizardCompetenciesComponent.isEditingCompetency).toBeFalse();
-                expect(editStub).toHaveBeenCalledOnce();
-                expect(alertStub).toHaveBeenCalledOnce();
-
-                expect(wizardCompetenciesComponent.competencies).toHaveLength(1);
-                expect(wizardCompetenciesComponent.competencies[0]!.lectureUnits![0]!.id).toBe(2);
-            });
-        });
-    }));
-});
diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts
index 2d40c01a5b50..36701004edbb 100644
--- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-title.component.spec.ts
@@ -1,10 +1,10 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { LectureUpdateWizardTitleComponent } from 'app/lecture/wizard-mode/lecture-wizard-title.component';
 import { Lecture } from 'app/entities/lecture.model';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { MockComponent } from 'ng-mocks';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { LectureTitleChannelNameComponent } from 'app/lecture/lecture-title-channel-name.component';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('LectureWizardTitleComponent', () => {
     let wizardTitleComponentFixture: ComponentFixture<LectureUpdateWizardTitleComponent>;
@@ -13,7 +13,7 @@ describe('LectureWizardTitleComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ReactiveFormsModule, FormsModule],
-            declarations: [LectureUpdateWizardTitleComponent, MockComponent(MarkdownEditorComponent), MockComponent(LectureTitleChannelNameComponent)],
+            declarations: [LectureUpdateWizardTitleComponent, MockComponent(MarkdownEditorMonacoComponent), MockComponent(LectureTitleChannelNameComponent)],
             providers: [],
             schemas: [],
         })
diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts
index cb597fb41f64..58113a1c5b16 100644
--- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard-units.component.spec.ts
@@ -163,7 +163,16 @@ describe('LectureWizardUnitComponent', () => {
             name: 'Test',
             releaseDate: dayjs().year(2010).month(3).date(5),
             description: 'Lorem Ipsum',
-            source: 'https://www.youtube.com/embed/8iU8LPEa4o0',
+            source: 'https://youtu.be/dQw4w9WgXcQ',
+            competencies: [
+                {
+                    id: 1,
+                    masteryThreshold: 0,
+                    optional: false,
+                    taxonomy: undefined,
+                    title: 'Test',
+                },
+            ],
         };
 
         const response: HttpResponse<VideoUnit> = new HttpResponse({
@@ -192,6 +201,7 @@ describe('LectureWizardUnitComponent', () => {
             expect(videoUnitCallArgument.description).toEqual(formData.description);
             expect(videoUnitCallArgument.releaseDate).toEqual(formData.releaseDate);
             expect(videoUnitCallArgument.source).toEqual(formData.source);
+            expect(videoUnitCallArgument.competencies).toEqual(formData.competencies);
             expect(lectureIdCallArgument).toBe(1);
 
             expect(createStub).toHaveBeenCalledOnce();
@@ -227,6 +237,15 @@ describe('LectureWizardUnitComponent', () => {
             name: 'Test',
             releaseDate: dayjs().year(2010).month(3).date(5),
             content: 'Lorem Ipsum',
+            competencies: [
+                {
+                    id: 1,
+                    masteryThreshold: 0,
+                    optional: false,
+                    taxonomy: undefined,
+                    title: 'Test',
+                },
+            ],
         };
 
         const persistedTextUnit: TextUnit = new TextUnit();
@@ -254,6 +273,15 @@ describe('LectureWizardUnitComponent', () => {
         wizardUnitComponent.createEditTextUnit(formData);
 
         wizardUnitComponentFixture.whenStable().then(() => {
+            const textUnitCallArgument: TextUnit = createStub.mock.calls[0][0];
+            const lectureIdCallArgument: number = createStub.mock.calls[0][1];
+
+            expect(textUnitCallArgument.name).toEqual(formData.name);
+            expect(textUnitCallArgument.content).toEqual(formData.content);
+            expect(textUnitCallArgument.releaseDate).toEqual(formData.releaseDate);
+            expect(textUnitCallArgument.competencies).toEqual(formData.competencies);
+            expect(lectureIdCallArgument).toBe(1);
+
             expect(createStub).toHaveBeenCalledOnce();
             expect(updateSpy).toHaveBeenCalledOnce();
 
@@ -368,6 +396,15 @@ describe('LectureWizardUnitComponent', () => {
             releaseDate: dayjs().year(2010).month(3).date(5),
             description: 'Lorem Ipsum',
             source: 'https://www.example.com',
+            competencies: [
+                {
+                    id: 1,
+                    masteryThreshold: 0,
+                    optional: false,
+                    taxonomy: undefined,
+                    title: 'Test',
+                },
+            ],
         };
 
         const response: HttpResponse<OnlineUnit> = new HttpResponse({
@@ -396,6 +433,7 @@ describe('LectureWizardUnitComponent', () => {
             expect(onlineUnitCallArgument.description).toEqual(formDate.description);
             expect(onlineUnitCallArgument.releaseDate).toEqual(formDate.releaseDate);
             expect(onlineUnitCallArgument.source).toEqual(formDate.source);
+            expect(onlineUnitCallArgument.competencies).toEqual(formDate.competencies);
             expect(lectureIdCallArgument).toBe(1);
 
             expect(createStub).toHaveBeenCalledOnce();
@@ -436,6 +474,15 @@ describe('LectureWizardUnitComponent', () => {
                 releaseDate: dayjs().year(2010).month(3).date(5),
                 version: 2,
                 updateNotificationText: 'lorem ipsum',
+                competencies: [
+                    {
+                        id: 1,
+                        masteryThreshold: 0,
+                        optional: false,
+                        taxonomy: undefined,
+                        title: 'Test',
+                    },
+                ],
             },
             fileProperties: {
                 file: fakeFile,
@@ -479,7 +526,11 @@ describe('LectureWizardUnitComponent', () => {
         wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData);
 
         wizardUnitComponentFixture.whenStable().then(() => {
+            const lectureIdCallArgument: number = createAttachmentUnitStub.mock.calls[0][1];
+
+            expect(lectureIdCallArgument).toBe(1);
             expect(createAttachmentUnitStub).toHaveBeenCalledWith(formData, 1);
+
             expect(updateSpy).toHaveBeenCalledOnce();
 
             updateSpy.mockRestore();
@@ -605,6 +656,62 @@ describe('LectureWizardUnitComponent', () => {
         });
     }));
 
+    it('should show alert upon unsuccessful attachment form submission with error information', fakeAsync(() => {
+        const attachmentUnitService = TestBed.inject(AttachmentUnitService);
+        const alertService = TestBed.inject(AlertService);
+
+        const fakeFile = new File([''], 'Test-File.pdf', { type: 'application/pdf' });
+
+        const attachmentUnitFormData: AttachmentUnitFormData = {
+            formProperties: {
+                name: 'test',
+                description: 'lorem ipsum',
+                releaseDate: dayjs().year(2010).month(3).date(5),
+                version: 2,
+                updateNotificationText: 'lorem ipsum',
+            },
+            fileProperties: {
+                file: fakeFile,
+                fileName: 'lorem ipsum',
+            },
+        };
+
+        const examplePath = '/path/to/file';
+
+        const attachment = new Attachment();
+        attachment.version = 1;
+        attachment.attachmentType = AttachmentType.FILE;
+        attachment.releaseDate = attachmentUnitFormData.formProperties.releaseDate;
+        attachment.name = attachmentUnitFormData.formProperties.name;
+        attachment.link = examplePath;
+
+        const attachmentUnit = new AttachmentUnit();
+        attachmentUnit.description = attachmentUnitFormData.formProperties.description;
+        attachmentUnit.attachment = attachment;
+
+        const formData = new FormData();
+        formData.append('file', fakeFile, attachmentUnitFormData.fileProperties.fileName);
+        formData.append('attachment', objectToJsonBlob(attachment));
+        formData.append('attachmentUnit', objectToJsonBlob(attachmentUnit));
+
+        const createAttachmentUnitStub = jest
+            .spyOn(attachmentUnitService, 'create')
+            .mockReturnValue(throwError(() => ({ status: 404, error: { params: 'file', title: 'Test Title' } })));
+        const alertStub = jest.spyOn(alertService, 'error');
+
+        wizardUnitComponentFixture.detectChanges();
+        tick();
+
+        wizardUnitComponent.isAttachmentUnitFormOpen = true;
+
+        wizardUnitComponent.createEditAttachmentUnit(attachmentUnitFormData);
+
+        wizardUnitComponentFixture.whenStable().then(() => {
+            expect(createAttachmentUnitStub).toHaveBeenCalledOnce();
+            expect(alertStub).toHaveBeenCalledOnce();
+        });
+    }));
+
     it('should not send POST request upon empty attachment form submission', fakeAsync(() => {
         const attachmentUnitService = TestBed.inject(AttachmentUnitService);
 
diff --git a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard.component.spec.ts b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard.component.spec.ts
index 39f6b3b80998..716de13900a0 100644
--- a/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard.component.spec.ts
+++ b/src/test/javascript/spec/component/lecture/wizard-mode/lecture-wizard.component.spec.ts
@@ -12,7 +12,6 @@ import { LectureUpdateWizardComponent } from 'app/lecture/wizard-mode/lecture-up
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { LectureUpdateWizardStepComponent } from 'app/lecture/wizard-mode/lecture-update-wizard-step.component';
-import { LectureUpdateWizardCompetenciesComponent } from 'app/lecture/wizard-mode/lecture-wizard-competencies.component';
 import { LectureUpdateWizardUnitsComponent } from 'app/lecture/wizard-mode/lecture-wizard-units.component';
 import { LectureUpdateWizardAttachmentsComponent } from 'app/lecture/wizard-mode/lecture-wizard-attachments.component';
 import { LectureUpdateWizardPeriodComponent } from 'app/lecture/wizard-mode/lecture-wizard-period.component';
@@ -32,7 +31,6 @@ describe('LectureWizardComponent', () => {
                 LectureUpdateWizardComponent,
                 MockPipe(ArtemisTranslatePipe),
                 MockComponent(LectureUpdateWizardStepComponent),
-                MockComponent(LectureUpdateWizardCompetenciesComponent),
                 MockComponent(LectureUpdateWizardUnitsComponent),
                 MockComponent(LectureUpdateWizardAttachmentsComponent),
                 MockComponent(LectureUpdateWizardPeriodComponent),
@@ -75,7 +73,7 @@ describe('LectureWizardComponent', () => {
         expect(wizardComponent).not.toBeNull();
 
         wizardComponentFixture.whenStable().then(() => {
-            expect(wizardComponent.currentStep).toBe(5);
+            expect(wizardComponent.currentStep).toBe(4);
         });
     }));
 
@@ -134,7 +132,7 @@ describe('LectureWizardComponent', () => {
         wizardComponentFixture.detectChanges();
 
         wizardComponentFixture.whenStable().then(() => {
-            expect(wizardComponent.currentStep).toBe(5);
+            expect(wizardComponent.currentStep).toBe(4);
             wizardComponent.next();
             expect(saveStub).toHaveBeenCalledOnce();
         });
@@ -150,46 +148,6 @@ describe('LectureWizardComponent', () => {
         });
     }));
 
-    it('should return is completed for smaller step', fakeAsync(() => {
-        wizardComponentFixture.detectChanges();
-
-        wizardComponentFixture.whenStable().then(() => {
-            wizardComponent.currentStep = 2;
-            const result = wizardComponent.isCompleted(1);
-            expect(result).toBeTrue();
-        });
-    }));
-
-    it('should not return is completed for bigger step', fakeAsync(() => {
-        wizardComponentFixture.detectChanges();
-
-        wizardComponentFixture.whenStable().then(() => {
-            wizardComponent.currentStep = 2;
-            const result = wizardComponent.isCompleted(3);
-            expect(result).toBeFalse();
-        });
-    }));
-
-    it('should return is current for same step', fakeAsync(() => {
-        wizardComponentFixture.detectChanges();
-
-        wizardComponentFixture.whenStable().then(() => {
-            wizardComponent.currentStep = 2;
-            const result = wizardComponent.isCurrent(2);
-            expect(result).toBeTrue();
-        });
-    }));
-
-    it('should not return is current for different step', fakeAsync(() => {
-        wizardComponentFixture.detectChanges();
-
-        wizardComponentFixture.whenStable().then(() => {
-            wizardComponent.currentStep = 2;
-            const result = wizardComponent.isCurrent(1);
-            expect(result).toBeFalse();
-        });
-    }));
-
     it('should return correct icon for last step', fakeAsync(() => {
         wizardComponentFixture.detectChanges();
 
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts
index 9b458fcfea34..41ab0dfcea81 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agent-details.component.spec.ts
@@ -2,17 +2,17 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
 import { of } from 'rxjs';
-import { BuildJob } from 'app/entities/build-job.model';
+import { BuildJob } from 'app/entities/programming/build-job.model';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../../test.module';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { DataTableComponent } from 'app/shared/data-table/data-table.component';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable';
-import { BuildAgent } from 'app/entities/build-agent.model';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 import { BuildAgentDetailsComponent } from 'app/localci/build-agents/build-agent-details/build-agent-details/build-agent-details.component';
 import { MockActivatedRoute } from '../../../helpers/mocks/activated-route/mock-activated-route';
 import { ActivatedRoute } from '@angular/router';
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
index 2ffc69f9b823..76a76f16c094 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agent-summary.component.spec.ts
@@ -3,17 +3,17 @@ import { BuildAgentSummaryComponent } from 'app/localci/build-agents/build-agent
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
 import { of } from 'rxjs';
-import { BuildJob } from 'app/entities/build-job.model';
+import { BuildJob } from 'app/entities/programming/build-job.model';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../../test.module';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { DataTableComponent } from 'app/shared/data-table/data-table.component';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable';
-import { BuildAgent } from 'app/entities/build-agent.model';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 
 describe('BuildAgentSummaryComponent', () => {
     let component: BuildAgentSummaryComponent;
diff --git a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
index 20ac1e1e4011..494f211ee2b3 100644
--- a/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-agents/build-agents.service.spec.ts
@@ -3,13 +3,13 @@ import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
-import { BuildJob } from 'app/entities/build-job.model';
+import { BuildJob } from 'app/entities/programming/build-job.model';
 import dayjs from 'dayjs/esm';
 import { BuildAgentsService } from 'app/localci/build-agents/build-agents.service';
-import { BuildAgent } from 'app/entities/build-agent.model';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { BuildAgent } from 'app/entities/programming/build-agent.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 
 describe('BuildAgentsService', () => {
     let service: BuildAgentsService;
diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
index 966e1cdeb551..2d8f1c622405 100644
--- a/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.component.spec.ts
@@ -10,8 +10,8 @@ import { AccountService } from 'app/core/auth/account.service';
 import { DataTableComponent } from 'app/shared/data-table/data-table.component';
 import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable';
 import { ArtemisTestModule } from '../../../test.module';
-import { BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/build-job.model';
-import { TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { BuildJobStatistics, FinishedBuildJob, SpanType } from 'app/entities/programming/build-job.model';
+import { TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { waitForAsync } from '@angular/core/testing';
 import { HttpResponse } from '@angular/common/http';
 import { SortingOrder } from 'app/shared/table/pageable-table';
diff --git a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
index aa1b2ad95943..e762ed0d878b 100644
--- a/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
+++ b/src/test/javascript/spec/component/localci/build-queue/build-queue.service.spec.ts
@@ -8,11 +8,11 @@ import { MockSyncStorage } from '../../../helpers/mocks/service/mock-sync-storag
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { TranslateService } from '@ngx-translate/core';
-import { BuildJob, BuildJobStatistics, SpanType } from 'app/entities/build-job.model';
+import { BuildJob, BuildJobStatistics, SpanType } from 'app/entities/programming/build-job.model';
 import dayjs from 'dayjs/esm';
-import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/repository-info.model';
+import { RepositoryInfo, TriggeredByPushTo } from 'app/entities/programming/repository-info.model';
 import { JobTimingInfo } from 'app/entities/job-timing-info.model';
-import { BuildConfig } from 'app/entities/build-config.model';
+import { BuildConfig } from 'app/entities/programming/build-config.model';
 import { FinishedBuildJobFilter } from 'app/localci/build-queue/build-queue.component';
 
 describe('BuildQueueService', () => {
diff --git a/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts b/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts
index 3fb6e53ee8f7..fb964f7ea127 100644
--- a/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts
+++ b/src/test/javascript/spec/component/localvc/commit-details-view.component.spec.ts
@@ -7,7 +7,7 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import dayjs from 'dayjs/esm';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { Observable, of, throwError } from 'rxjs';
-import { CommitInfo } from 'app/entities/programming-submission.model';
+import { CommitInfo } from 'app/entities/programming/programming-submission.model';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { CommitDetailsViewComponent } from 'app/localvc/commit-details-view/commit-details-view.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
@@ -16,7 +16,7 @@ import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programmin
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { GitDiffReportComponent } from 'app/exercises/programming/hestia/git-diff-report/git-diff-report.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { HttpResponse } from '@angular/common/http';
 
 describe('CommitDetailsViewComponent', () => {
diff --git a/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts b/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts
index 1ab3572e75f4..8c3a628980a6 100644
--- a/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts
+++ b/src/test/javascript/spec/component/localvc/commit-history.component.spec.ts
@@ -8,12 +8,12 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import dayjs from 'dayjs/esm';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { of } from 'rxjs';
-import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { CommitInfo, ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { CommitsInfoComponent } from 'app/exercises/programming/shared/commits-info/commits-info.component';
 import { MockComponent } from 'ng-mocks';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { HttpResponse } from '@angular/common/http';
 
 describe('CommitHistoryComponent', () => {
diff --git a/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts b/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts
index fcc2710140c4..5f4fae4014a9 100644
--- a/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts
+++ b/src/test/javascript/spec/component/localvc/repository-view.component.spec.ts
@@ -13,7 +13,7 @@ import { AccountService } from 'app/core/auth/account.service';
 import { DomainType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { Observable, of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 
diff --git a/src/test/javascript/spec/component/markdown-editor/attachment-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/attachment-command.spec.ts
deleted file mode 100644
index 8e32773497dd..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/attachment-command.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { AttachmentCommand } from 'app/shared/markdown-editor/commands/attachmentCommand';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('AttachmentCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new AttachmentCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add ![](http://) on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('![](http://)');
-    });
-
-    it('should remove ![](http://) on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('![](http://)test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('test');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/bold-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/bold-command.spec.ts
deleted file mode 100644
index c80e43eb0eed..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/bold-command.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { BoldCommand } from 'app/shared/markdown-editor/commands/bold.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('BoldCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new BoldCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add **** on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('bold');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('**bold**');
-    });
-
-    it('should remove **** on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('**bold**');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('bold');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/channelMentionCommand.spec.ts b/src/test/javascript/spec/component/markdown-editor/channelMentionCommand.spec.ts
deleted file mode 100644
index 1f461eab4b56..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/channelMentionCommand.spec.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import { MetisService } from 'app/shared/metis/metis.service';
-import { HttpResponse } from '@angular/common/http';
-import { of } from 'rxjs';
-import { SelectableItem } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-import { ChannelMentionCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/channelMentionCommand';
-import { ChannelService } from 'app/shared/metis/conversations/channel.service';
-import { ChannelIdAndNameDTO } from 'app/entities/metis/conversation/channel.model';
-import { CourseInformationSharingConfiguration } from 'app/entities/course.model';
-
-describe('ChannelMentionCommand', () => {
-    let channelMentionCommand: ChannelMentionCommand;
-    let channelServiceMock: Partial<ChannelService>;
-    let metisServiceMock: Partial<MetisService>;
-    let aceEditorMock: any;
-    let selectWithSearchComponent: any;
-
-    beforeEach(() => {
-        selectWithSearchComponent = {
-            open: () => {},
-            updateSearchTerm: () => {},
-            close: () => {},
-        };
-
-        channelServiceMock = {
-            getPublicChannelsOfCourse: () =>
-                of(
-                    new HttpResponse<ChannelIdAndNameDTO[]>({
-                        body: [
-                            { name: 'Channel 1', id: 1 },
-                            { name: 'Channel 2', id: 2 },
-                        ],
-                    }),
-                ),
-        };
-
-        metisServiceMock = {
-            getCourse: () => ({ id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING }),
-        };
-
-        aceEditorMock = {
-            command: undefined,
-            commands: {
-                addCommand: (obj: any) => {
-                    aceEditorMock.command = obj;
-                },
-            },
-            execCommand: () => {},
-            getCursorPosition: () => ({ row: 0, column: 0 }),
-            focus: () => {},
-            session: {
-                getDocument: () => ({
-                    removeInLine: () => {},
-                }),
-                getLine: () => '',
-            },
-            insert: () => {},
-        };
-
-        // Create an instance of ChannelMentionCommand with mock services
-        channelMentionCommand = new ChannelMentionCommand(channelServiceMock as ChannelService, metisServiceMock as MetisService);
-        channelMentionCommand.setSelectWithSearchComponent(selectWithSearchComponent);
-    });
-
-    it('should create an instance of ChannelMentionCommand', () => {
-        expect(channelMentionCommand).toBeTruthy();
-    });
-
-    it('should perform a channel search and cache result', () => {
-        const getChannelsOfCourseSpy = jest.spyOn(channelServiceMock, 'getPublicChannelsOfCourse');
-
-        channelMentionCommand.performSearch('channel').subscribe((response) => {
-            expect(response.body).toEqual([
-                { name: 'Channel 1', id: 1 },
-                { name: 'Channel 2', id: 2 },
-            ]);
-        });
-
-        channelMentionCommand.performSearch('channel').subscribe();
-
-        expect(getChannelsOfCourseSpy).toHaveBeenCalledExactlyOnceWith(1);
-    });
-
-    it('should filter channels based on searchTerm', () => {
-        const getChannelsOfCourseSpy = jest.spyOn(channelServiceMock, 'getPublicChannelsOfCourse');
-
-        channelMentionCommand.performSearch('1').subscribe((response) => {
-            expect(response.body).toEqual([{ name: 'Channel 1', id: 1 }]);
-        });
-
-        channelMentionCommand.performSearch('2').subscribe((response) => {
-            expect(response.body).toEqual([{ name: 'Channel 2', id: 2 }]);
-        });
-
-        expect(getChannelsOfCourseSpy).toHaveBeenCalledExactlyOnceWith(1);
-    });
-
-    it('should insert selection', () => {
-        channelMentionCommand.setEditor(aceEditorMock);
-
-        const focusSpy = jest.spyOn(aceEditorMock, 'focus');
-
-        // Simulate open selection menu via triggering command
-        aceEditorMock.command.exec(aceEditorMock);
-
-        channelMentionCommand.insertSelection({ name: 'Channel 1', id: 1 } as SelectableItem);
-
-        // The editor is focused twice: Once for the execution of the command, once after the text insertion
-        expect(focusSpy).toHaveBeenCalledTimes(2);
-    });
-
-    it('should execute the command', () => {
-        channelMentionCommand.setEditor(aceEditorMock);
-
-        const execCommandSpy = jest.spyOn(aceEditorMock, 'execCommand');
-
-        channelMentionCommand.execute();
-
-        expect(execCommandSpy).toHaveBeenCalledExactlyOnceWith('#');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/code-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/code-command.spec.ts
deleted file mode 100644
index eeca9ece8100..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/code-command.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { CodeCommand } from 'app/shared/markdown-editor/commands/code.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('CodeCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new CodeCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add `` on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('code');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('`code`');
-    });
-
-    it('should remove `` on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('`code`');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('code');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/codeblock-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/codeblock-command.spec.ts
deleted file mode 100644
index 60cd66efa68c..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/codeblock-command.spec.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { CodeBlockCommand } from 'app/shared/markdown-editor/commands/codeblock.command';
-
-describe('CodeBlockCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-            });
-    });
-
-    it('should add ```java\n``` on execute', () => {
-        const command = new CodeBlockCommand();
-        comp.defaultCommands = [command];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-        comp.aceEditorContainer.getEditor().setValue('code');
-
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('```java\ncode\n```');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/color-picker-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/color-picker-command.spec.ts
deleted file mode 100644
index ffcf3b04ce5e..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/color-picker-command.spec.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MockComponent } from 'ng-mocks';
-import { FaLayersComponent } from '@fortawesome/angular-fontawesome';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { ColorPickerCommand } from 'app/shared/markdown-editor/commands/colorPicker.command';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('ColorPickerCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-            declarations: [MockComponent(FaLayersComponent)],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new ColorPickerCommand();
-                comp.colorCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    const colorTable = [
-        ['#ca2024', 'red'],
-        ['#3ea119', 'green'],
-        ['#ffffff', 'white'],
-        ['#fffa5c', 'yellow'],
-        ['#0d3cc2', 'blue'],
-        ['#b05db8', 'lila'],
-        ['#d86b1f', 'orange'],
-    ];
-
-    it.each(colorTable)('should add color %s on execute', (hex, color) => {
-        comp.aceEditorContainer.getEditor().setValue('test');
-        command.execute(hex);
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('<span class="' + color + '">test</span>');
-    });
-
-    it('should add color black on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('test');
-        command.execute('#000000');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('test');
-    });
-
-    it.each(colorTable)('should remove color %s on execute', (hex, color) => {
-        comp.aceEditorContainer.getEditor().setValue('<span class="' + color + '">test</span>');
-        command.execute('#ffffff');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('test');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts
deleted file mode 100644
index a11404b80e20..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/fullscreen-command.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { FullscreenCommand } from 'app/shared/markdown-editor/commands/fullscreen.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import * as FullscreenUtil from 'app/shared/util/fullscreen.util';
-
-describe('FullscreenCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-            });
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it('should enable fullscreen on execute', () => {
-        jest.spyOn(FullscreenUtil, 'enterFullscreen');
-        jest.spyOn(FullscreenUtil, 'isFullScreen').mockReturnValue(false);
-
-        const command = new FullscreenCommand();
-        comp.defaultCommands = [command];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-
-        command.execute();
-        expect(FullscreenUtil.isFullScreen).toHaveBeenCalledOnce();
-        expect(FullscreenUtil.enterFullscreen).toHaveBeenCalledOnce();
-    });
-
-    it('should disable fullscreen on execute', () => {
-        jest.spyOn(FullscreenUtil, 'exitFullscreen');
-        jest.spyOn(FullscreenUtil, 'isFullScreen').mockReturnValue(true);
-
-        const command = new FullscreenCommand();
-        comp.defaultCommands = [command];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-
-        command.execute();
-        expect(FullscreenUtil.isFullScreen).toHaveBeenCalledOnce();
-        expect(FullscreenUtil.exitFullscreen).toHaveBeenCalledOnce();
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts
deleted file mode 100644
index 5b99e057c7bf..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/gradingInstruction-command.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command';
-import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command';
-import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand';
-import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command';
-import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command';
-import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command';
-import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockDirective, MockPipe } from 'ng-mocks';
-import { NgModel } from '@angular/forms';
-
-describe('Grading Instruction Command', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-            declarations: [MockPipe(ArtemisTranslatePipe), MockDirective(NgModel)],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-            });
-    });
-
-    it('should add instruction identifiers and parameters on execute', () => {
-        const gradingInstructionCommand = new GradingInstructionCommand();
-        comp.domainCommands = [gradingInstructionCommand];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-
-        gradingInstructionCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(
-            '[instruction]' +
-                '\n' +
-                '\t' +
-                ('[credits]' +
-                    CreditsCommand.TEXT +
-                    '\n' +
-                    '\t' +
-                    '[gradingScale]' +
-                    GradingScaleCommand.TEXT +
-                    '\n' +
-                    '\t' +
-                    '[description]' +
-                    InstructionDescriptionCommand.TEXT +
-                    '\n' +
-                    '\t' +
-                    '[feedback]' +
-                    FeedbackCommand.TEXT +
-                    '\n' +
-                    '\t' +
-                    '[maxCountInScore]' +
-                    UsageCountCommand.TEXT) +
-                '\n',
-        );
-    });
-
-    it('should add CriteriaCommand identifier on execute', () => {
-        const criterionCommand = new GradingCriterionCommand();
-        const gradingInstructionCommand = new GradingInstructionCommand();
-        comp.domainCommands = [criterionCommand, gradingInstructionCommand];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-
-        criterionCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('\n' + '[criterion]' + GradingCriterionCommand.TEXT + '\n' + gradingInstructionCommand.instructionText());
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts b/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts
deleted file mode 100644
index 1e842133b7fe..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/headingCommands.spec.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { HeadingOneCommand } from 'app/shared/markdown-editor/commands/headingOne.command';
-import { HeadingTwoCommand } from 'app/shared/markdown-editor/commands/headingTwo.command';
-import { HeadingThreeCommand } from 'app/shared/markdown-editor/commands/headingThree.command';
-
-describe('HeadingOneCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let headingOneCommand = new HeadingOneCommand();
-    let headingTwoCommand = new HeadingTwoCommand();
-    let headingThreeCommand = new HeadingThreeCommand();
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-                headingOneCommand = new HeadingOneCommand();
-                headingTwoCommand = new HeadingTwoCommand();
-                headingThreeCommand = new HeadingThreeCommand();
-                comp.defaultCommands = [headingOneCommand, headingTwoCommand, headingThreeCommand];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add # Heading 1,2,3 on execute when no text is selected', () => {
-        headingOneCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('# Heading 1');
-        comp.aceEditorContainer.getEditor().setValue('');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-        headingTwoCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## Heading 2');
-        comp.aceEditorContainer.getEditor().setValue('');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-        headingThreeCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### Heading 3');
-    });
-
-    it('should add #, ##, ### on execute when text is selected', () => {
-        jest.spyOn(comp.aceEditorContainer.getEditor(), 'getSelectedText').mockReturnValue('lorem');
-
-        headingOneCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('# lorem');
-        comp.aceEditorContainer.getEditor().setValue('lorem');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-        headingTwoCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## lorem');
-        comp.aceEditorContainer.getEditor().setValue('lorem');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-        headingThreeCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### lorem');
-    });
-
-    it('should remove #, ##, ### on execute when text of header selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('# lorem');
-        headingOneCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-        comp.aceEditorContainer.getEditor().setValue('## lorem');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## lorem');
-        headingTwoCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-        comp.aceEditorContainer.getEditor().setValue('### lorem');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### lorem');
-        headingThreeCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-    });
-
-    it('should remove #, ##, ### with Heading text on execute when text of header selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('# Heading 1');
-        headingOneCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-        comp.aceEditorContainer.getEditor().setValue('## Heading 2');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('## Heading 2');
-        headingTwoCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-        comp.aceEditorContainer.getEditor().setValue('### Heading 3');
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('### Heading 3');
-        headingThreeCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts
deleted file mode 100644
index a39dfd15ef90..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/italic-command.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { ItalicCommand } from 'app/shared/markdown-editor/commands/italic.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('ItalicCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new ItalicCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add ** on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('italic');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('*italic*');
-    });
-
-    it('should remove ** on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('*italic*');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('italic');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts
deleted file mode 100644
index 16d34e2a462e..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/katex-command.spec.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { KatexCommand } from 'app/shared/markdown-editor/commands/katex.command';
-import { ArtemisTestModule } from '../../test.module';
-
-describe('KatexCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-            });
-    });
-
-    it('should add insert the sample e-function into the editor on execute', () => {
-        const katexCommand = new KatexCommand();
-        comp.domainCommands = [katexCommand];
-        fixture.detectChanges();
-        comp.ngAfterViewInit();
-
-        katexCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('$$ e^{\\frac{1}{4} y^2} $$');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts
deleted file mode 100644
index 442cfe7212d8..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/link-command.spec.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { LinkCommand } from 'app/shared/markdown-editor/commands/link.command';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('LinkCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new LinkCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add [](http://) on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('[](http://)');
-    });
-
-    it('should remove [](http://) on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('[](http://)test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('test');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts
index 2e0ea029b664..3d1c671dab9a 100644
--- a/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts
+++ b/src/test/javascript/spec/component/markdown-editor/markdown-editor-monaco.component.spec.ts
@@ -7,7 +7,7 @@ import { ComponentFixture, TestBed, fakeAsync, flush } from '@angular/core/testi
 import { FormsModule } from '@angular/forms';
 import { NgbNavModule, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
-import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+import { MarkdownEditorHeight, MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
 import { MonacoColorAction } from 'app/shared/monaco-editor/model/actions/monaco-color.action';
 import { MockResizeObserver } from '../../helpers/mocks/service/mock-resize-observer';
@@ -15,12 +15,12 @@ import { CdkDragMove, DragDropModule } from '@angular/cdk/drag-drop';
 import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { MonacoUrlAction } from 'app/shared/monaco-editor/model/actions/monaco-url.action';
 import { MonacoAttachmentAction } from 'app/shared/monaco-editor/model/actions/monaco-attachment.action';
-import { MarkdownEditorHeight } from 'app/shared/markdown-editor/markdown-editor.component';
 import { MonacoFormulaAction } from 'app/shared/monaco-editor/model/actions/monaco-formula.action';
 import { MonacoTestCaseAction } from 'app/shared/monaco-editor/model/actions/monaco-test-case.action';
 import { MonacoTaskAction } from 'app/shared/monaco-editor/model/actions/monaco-task.action';
 import { MonacoFullscreenAction } from 'app/shared/monaco-editor/model/actions/monaco-fullscreen.action';
 import { MonacoEditorOptionPreset } from 'app/shared/monaco-editor/model/monaco-editor-option-preset.model';
+import { COMMUNICATION_MARKDOWN_EDITOR_OPTIONS } from 'app/shared/monaco-editor/monaco-editor-option.helper';
 
 describe('MarkdownEditorMonacoComponent', () => {
     let fixture: ComponentFixture<MarkdownEditorMonacoComponent>;
@@ -86,11 +86,28 @@ describe('MarkdownEditorMonacoComponent', () => {
         fixture.detectChanges();
         const adjustEditorDimensionsSpy = jest.spyOn(comp, 'adjustEditorDimensions');
         const focusSpy = jest.spyOn(comp.monacoEditor, 'focus');
-        comp.onNavChanged({ nextId: 'editor', activeId: 'editor_preview', preventDefault: jest.fn() });
+        comp.onNavChanged({ nextId: MarkdownEditorMonacoComponent.TAB_EDIT, activeId: MarkdownEditorMonacoComponent.TAB_PREVIEW, preventDefault: jest.fn() });
         expect(adjustEditorDimensionsSpy).toHaveBeenCalledOnce();
         expect(focusSpy).toHaveBeenCalledOnce();
     });
 
+    it('should emit when leaving the visual tab', () => {
+        const emitSpy = jest.spyOn(comp.onLeaveVisualTab, 'emit');
+        fixture.detectChanges();
+        comp.onNavChanged({ nextId: MarkdownEditorMonacoComponent.TAB_EDIT, activeId: MarkdownEditorMonacoComponent.TAB_VISUAL, preventDefault: jest.fn() });
+        expect(emitSpy).toHaveBeenCalledOnce();
+    });
+
+    it.each([
+        { tab: MarkdownEditorMonacoComponent.TAB_EDIT, flags: [true, false, false] },
+        { tab: MarkdownEditorMonacoComponent.TAB_PREVIEW, flags: [false, true, false] },
+        { tab: MarkdownEditorMonacoComponent.TAB_VISUAL, flags: [false, false, true] },
+    ])(`should set the correct flags when navigating to $tab`, ({ tab, flags }) => {
+        fixture.detectChanges();
+        comp.onNavChanged({ nextId: tab, activeId: MarkdownEditorMonacoComponent.TAB_EDIT, preventDefault: jest.fn() });
+        expect([comp.inEditMode, comp.inPreviewMode, comp.inVisualMode]).toEqual(flags);
+    });
+
     it('should embed manually uploaded files', () => {
         const embedFilesStub = jest.spyOn(comp, 'embedFiles').mockImplementation();
         fixture.detectChanges();
@@ -213,11 +230,9 @@ describe('MarkdownEditorMonacoComponent', () => {
 
     it('should react to content height changes if the height is linked to the editor', () => {
         comp.linkEditorHeightToContentHeight = true;
-        comp.initialEditorHeight = MarkdownEditorHeight.MEDIUM;
-        comp.resizableMinHeight = MarkdownEditorHeight.SMALL;
         comp.resizableMaxHeight = MarkdownEditorHeight.LARGE;
         fixture.detectChanges();
-        expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.MEDIUM);
+        expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.SMALL);
         comp.onContentHeightChanged(1500);
         expect(comp.targetWrapperHeight).toBe(MarkdownEditorHeight.LARGE);
         comp.onContentHeightChanged(20);
@@ -235,11 +250,11 @@ describe('MarkdownEditorMonacoComponent', () => {
         expect(comp.targetWrapperHeight).toBe(300 - wrapperTop - dragElemHeight / 2);
     });
 
-    it('should forward enableTextFieldMode call', () => {
+    it('should use the correct options to enable text field mode', () => {
         fixture.detectChanges();
-        const setTextFieldModeSpy = jest.spyOn(comp.monacoEditor, 'enableTextFieldMode');
+        const applySpy = jest.spyOn(comp.monacoEditor, 'applyOptionPreset');
         comp.enableTextFieldMode();
-        expect(setTextFieldModeSpy).toHaveBeenCalledOnce();
+        expect(applySpy).toHaveBeenCalledExactlyOnceWith(COMMUNICATION_MARKDOWN_EDITOR_OPTIONS);
     });
 
     it('should apply option presets to the editor', () => {
diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts
new file mode 100644
index 000000000000..99b9ec09559f
--- /dev/null
+++ b/src/test/javascript/spec/component/markdown-editor/markdown-editor-parsing.helper.spec.ts
@@ -0,0 +1,51 @@
+import { parseMarkdownForDomainActions } from 'app/shared/markdown-editor/monaco/markdown-editor-parsing.helper';
+import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action';
+import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action';
+
+describe('MarkdownEditorParsingHelper', () => {
+    it('should parse markdown without domain action identifiers', () => {
+        const markdown = 'This is some text that uses no domain action identifiers.';
+        const result = parseMarkdownForDomainActions(markdown, []);
+        expect(result).toEqual([{ text: markdown, action: undefined }]);
+    });
+
+    it('should parse single-line text with one domain action identifier', () => {
+        const action = new MonacoGradingDescriptionAction();
+        const markdown = 'This is some text. [description] This is a description.';
+        const result = parseMarkdownForDomainActions(markdown, [action]);
+        expect(result).toEqual([
+            { text: 'This is some text.', action: undefined },
+            { text: 'This is a description.', action },
+        ]);
+    });
+
+    it('should parse single-line text with multiple domain action identifiers', () => {
+        const descriptionAction = new MonacoGradingDescriptionAction();
+        const feedbackAction = new MonacoGradingFeedbackAction();
+        const markdown = 'This is some text. [description] This is a description. [feedback] This is some feedback.';
+        const result = parseMarkdownForDomainActions(markdown, [descriptionAction, feedbackAction]);
+        expect(result).toEqual([
+            { text: 'This is some text.', action: undefined },
+            { text: 'This is a description.', action: descriptionAction },
+            { text: 'This is some feedback.', action: feedbackAction },
+        ]);
+    });
+
+    it('should parse multi-line text without domain action identifiers', () => {
+        const markdown = 'This is some text that uses no domain action identifiers.\nThis is a second line.';
+        const result = parseMarkdownForDomainActions(markdown, []);
+        expect(result).toEqual([{ text: markdown, action: undefined }]);
+    });
+
+    it('should parse multi-line text with multiple domain action identifiers', () => {
+        const descriptionAction = new MonacoGradingDescriptionAction();
+        const feedbackAction = new MonacoGradingFeedbackAction();
+        const markdown = 'This is some text. [description] This is a description.\n [feedback] This is some feedback.';
+        const result = parseMarkdownForDomainActions(markdown, [descriptionAction, feedbackAction]);
+        expect(result).toEqual([
+            { text: 'This is some text.', action: undefined },
+            { text: 'This is a description.', action: descriptionAction },
+            { text: 'This is some feedback.', action: feedbackAction },
+        ]);
+    });
+});
diff --git a/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts b/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts
deleted file mode 100644
index b89259161e85..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/markdown-editor.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { AceEditorComponent } from 'app/shared/markdown-editor/ace-editor/ace-editor.component';
-import { ColorSelectorComponent } from 'app/shared/color-selector/color-selector.component';
-import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import { FileUploaderService } from 'app/shared/http/file-uploader.service';
-import { AlertService } from 'app/core/util/alert.service';
-import { NgbNav } from '@ng-bootstrap/ng-bootstrap';
-import { ArtemisTestModule } from '../../test.module';
-import { NegatedTypeCheckPipe } from 'app/shared/pipes/negated-type-check.pipe';
-import { TypeCheckPipe } from 'app/shared/pipes/type-check.pipe';
-
-describe('MarkdownEditorComponent', () => {
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let component: MarkdownEditorComponent;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            providers: [MockProvider(FileUploaderService), MockProvider(AlertService)],
-            imports: [FormsModule, NgbNav, ArtemisTestModule, MockDirective(NgbTooltip)],
-            declarations: [
-                MarkdownEditorComponent,
-                MockComponent(AceEditorComponent),
-                MockComponent(ColorSelectorComponent),
-                MockDirective(NgbTooltip),
-                MockPipe(ArtemisTranslatePipe),
-                MockPipe(NegatedTypeCheckPipe),
-                MockPipe(TypeCheckPipe),
-            ],
-        }).compileComponents();
-        fixture = TestBed.createComponent(MarkdownEditorComponent);
-        component = fixture.componentInstance;
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it('should embed files when at least one file is uploaded', () => {
-        // Arrange
-        const files = [new File([], 'file1.png')];
-        const event = {
-            target: {
-                files: files,
-            },
-        };
-
-        const embedFilesSpy = jest.spyOn(component, 'embedFiles').mockImplementation();
-
-        // Act
-        component.onFileUpload(event as any);
-
-        // Assert
-        expect(embedFilesSpy).toHaveBeenCalledWith(files);
-    });
-
-    it('should not embed files when no file is uploaded', () => {
-        // Arrange
-        const event = {
-            target: {
-                files: [],
-            },
-        };
-
-        const embedFilesSpy = jest.spyOn(component, 'embedFiles');
-
-        // Act
-        component.onFileUpload(event as any);
-
-        // Assert
-        expect(embedFilesSpy).not.toHaveBeenCalled();
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts b/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts
deleted file mode 100644
index 73f8446acc67..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/metisReference-commands.spec.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { MetisService } from 'app/shared/metis/metis.service';
-import { MockMetisService } from '../../helpers/mocks/service/mock-metis-service.service';
-import { ExerciseReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/exerciseReferenceCommand';
-import { metisExercise, metisLecture, metisLecture2, metisLecture3 } from '../../helpers/sample/metis-sample-data';
-import { LectureAttachmentReferenceCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/lectureAttachmentReferenceCommand';
-import { ReferenceType } from 'app/shared/metis/metis.util';
-import { LectureService } from 'app/lecture/lecture.service';
-import { MockProvider } from 'ng-mocks';
-import { HttpResponse } from '@angular/common/http';
-import { of } from 'rxjs';
-import { Slide } from 'app/entities/lecture-unit/slide.model';
-import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
-
-describe('Exercise Lecture Attachment Reference Commands', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let exerciseReferenceCommand: ExerciseReferenceCommand;
-    let lectureReferenceCommand: LectureAttachmentReferenceCommand;
-
-    let metisService: MetisService;
-    let lectureService: LectureService;
-    let findLectureWithDetailsSpy: jest.SpyInstance;
-    let findAllLecturesWithDetailsSpy: jest.SpyInstance;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-            providers: [{ provide: MetisService, useClass: MockMetisService }, MockProvider(LectureService)],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-                metisService = TestBed.inject(MetisService);
-                lectureService = TestBed.inject(LectureService);
-                findLectureWithDetailsSpy = jest.spyOn(lectureService, 'findWithDetailsWithSlides');
-                findAllLecturesWithDetailsSpy = jest.spyOn(lectureService, 'findAllByCourseIdWithSlides');
-            });
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it('should initialize exercise reference command correctly', () => {
-        exerciseReferenceCommand = new ExerciseReferenceCommand(metisService);
-        expect(exerciseReferenceCommand.getValues()).toEqual(
-            metisService.getCourse().exercises!.map((exercise) => ({ id: exercise.id!.toString(), value: exercise.title!, type: exercise.type })),
-        );
-    });
-
-    it('should initialize lecture attachment reference command correctly', () => {
-        const attachmentUnit = new AttachmentUnit();
-        attachmentUnit.id = 3;
-        const slide = new Slide();
-        slide.id = 3;
-        slide.slideNumber = 3;
-        slide.slideImagePath = 'directory/attachments/slides/Metis-Slide-3.png';
-        attachmentUnit.slides?.push(slide);
-        metisLecture3.lectureUnits?.push(attachmentUnit);
-        const returnValue = of(new HttpResponse({ body: [metisLecture, metisLecture2, metisLecture3], status: 200 }));
-
-        findAllLecturesWithDetailsSpy.mockReturnValue(returnValue);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-        expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce();
-
-        expect(lectureReferenceCommand.getValues()).toEqual([
-            {
-                id: metisLecture.id!.toString(),
-                value: metisLecture.title!,
-                type: ReferenceType.LECTURE,
-                elements: metisLecture.attachments?.map((attachment: any) => ({
-                    id: attachment.id!.toString(),
-                    value: attachment.name!,
-                    courseArtifactType: ReferenceType.ATTACHMENT,
-                })),
-            },
-            {
-                id: metisLecture2.id!.toString(),
-                value: metisLecture2.title!,
-                type: ReferenceType.LECTURE,
-                elements: metisLecture2.attachments?.map((attachment: any) => ({
-                    id: attachment.id!.toString(),
-                    value: attachment.name!,
-                    courseArtifactType: ReferenceType.ATTACHMENT,
-                })),
-                attachmentUnits: metisLecture2.lectureUnits?.map((unit: any) => {
-                    return {
-                        id: unit.id!.toString(),
-                        value: unit.name!,
-                        slides: unit.slides
-                            ?.map((slide: Slide) => {
-                                return {
-                                    id: slide.id!.toString(),
-                                    slideNumber: slide.slideNumber!,
-                                    slideImagePath: slide.slideImagePath!,
-                                    courseArtifactType: ReferenceType.SLIDE,
-                                };
-                            })
-                            .sort((a: Slide, b: Slide) => a.slideNumber! - b.slideNumber!),
-                        courseArtifactType: ReferenceType.ATTACHMENT_UNITS,
-                    };
-                }),
-            },
-            {
-                id: metisLecture3.id!.toString(),
-                value: metisLecture3.title!,
-                type: ReferenceType.LECTURE,
-                elements: metisLecture3.attachments?.map((attachment: any) => ({
-                    id: attachment.id!.toString(),
-                    value: attachment.name!,
-                    courseArtifactType: ReferenceType.ATTACHMENT,
-                })),
-                attachmentUnits: metisLecture3.lectureUnits?.map((unit: any) => {
-                    return {
-                        id: unit.id!.toString(),
-                        value: unit.name!,
-                        slides: unit.slides
-                            ?.map((slide: Slide) => {
-                                return {
-                                    id: slide.id!.toString(),
-                                    slideNumber: slide.slideNumber!,
-                                    slideImagePath: slide.slideImagePath!,
-                                    courseArtifactType: ReferenceType.SLIDE,
-                                };
-                            })
-                            .sort((a: Slide, b: Slide) => a.slideNumber! - b.slideNumber!),
-                        courseArtifactType: ReferenceType.ATTACHMENT_UNITS,
-                    };
-                }),
-            },
-        ]);
-    });
-
-    it('should insert correct reference link for exercise to markdown editor on execute', () => {
-        exerciseReferenceCommand = new ExerciseReferenceCommand(metisService);
-
-        comp.defaultCommands = [exerciseReferenceCommand];
-        fixture.detectChanges();
-
-        comp.aceEditorContainer.getEditor().setValue('');
-
-        const referenceRouterLinkToExercise = `[${metisExercise.type}]${metisExercise.title}(${metisService.getLinkForExercise(metisExercise.id!.toString())})[/${
-            metisExercise.type
-        }]`;
-        exerciseReferenceCommand.execute(metisExercise.id!.toString());
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToExercise);
-    });
-
-    it('should insert correct reference link for lecture to markdown editor on execute', () => {
-        const returnValue = of(new HttpResponse({ body: [metisLecture], status: 200 }));
-        findAllLecturesWithDetailsSpy.mockReturnValue(returnValue);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-        expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce();
-
-        const returnValueDetail = of(new HttpResponse({ body: metisLecture, status: 200 }));
-        findLectureWithDetailsSpy.mockReturnValue(returnValueDetail);
-
-        comp.defaultCommands = [lectureReferenceCommand];
-        fixture.detectChanges();
-
-        comp.aceEditorContainer.getEditor().setValue('');
-
-        const referenceRouterLinkToLecture = `[lecture]${metisLecture.title}(${metisService.getLinkForLecture(metisLecture.id!.toString())})[/lecture]`;
-        lectureReferenceCommand.execute(metisLecture.id!.toString(), ReferenceType.LECTURE);
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLecture);
-    });
-
-    it('should insert correct reference link for attachment to markdown editor on execute', () => {
-        const returnValue = of(new HttpResponse({ body: [], status: 200 }));
-        findAllLecturesWithDetailsSpy.mockReturnValue(returnValue);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-        expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce();
-
-        const returnValueDetail = of(new HttpResponse({ body: {}, status: 200 }));
-        findLectureWithDetailsSpy.mockReturnValue(returnValueDetail);
-
-        comp.defaultCommands = [lectureReferenceCommand];
-        fixture.detectChanges();
-
-        comp.aceEditorContainer.getEditor().setValue('');
-
-        const shortLink = metisLecture.attachments?.first() ? metisLecture.attachments?.first()?.link!.split('attachments/')[1] : '';
-        const referenceRouterLinkToLecture = `[attachment]${metisLecture.attachments?.first()?.name}(${shortLink})[/attachment]`;
-        lectureReferenceCommand.execute(metisLecture.id!.toString(), ReferenceType.ATTACHMENT, metisLecture.attachments?.first()?.id!.toString());
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLecture);
-    });
-
-    it('should insert correct reference link for attachment unit to markdown editor on execute', () => {
-        const returnValue = of(new HttpResponse({ body: [metisLecture3], status: 200 }));
-        findAllLecturesWithDetailsSpy.mockReturnValue(returnValue);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-        expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce();
-
-        const returnValueDetail = of(new HttpResponse({ body: metisLecture3, status: 200 }));
-        findLectureWithDetailsSpy.mockReturnValue(returnValueDetail);
-
-        comp.defaultCommands = [lectureReferenceCommand];
-        fixture.detectChanges();
-
-        comp.aceEditorContainer.getEditor().setValue('');
-
-        const selectedUnit: AttachmentUnit = metisLecture3.lectureUnits?.first() as AttachmentUnit;
-        const shortLink = selectedUnit?.attachment ? selectedUnit?.attachment?.link!.split('attachments/')[1] : '';
-        const referenceRouterLinkToLectureUnit = `[lecture-unit]${metisLecture3.lectureUnits?.first()?.name}(${shortLink})[/lecture-unit]`;
-        lectureReferenceCommand.execute(metisLecture3.id!.toString(), ReferenceType.ATTACHMENT_UNITS, undefined, selectedUnit?.id!.toString());
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToLectureUnit);
-    });
-
-    it('should insert correct reference link for attachment unit SLIDE to markdown editor on execute', () => {
-        const returnValue = of(new HttpResponse({ body: [metisLecture3], status: 200 }));
-        findAllLecturesWithDetailsSpy.mockReturnValue(returnValue);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-        expect(findAllLecturesWithDetailsSpy).toHaveBeenCalledOnce();
-
-        const returnValueDetail = of(new HttpResponse({ body: metisLecture3, status: 200 }));
-        findLectureWithDetailsSpy.mockReturnValue(returnValueDetail);
-        lectureReferenceCommand = new LectureAttachmentReferenceCommand(metisService, lectureService);
-
-        comp.defaultCommands = [lectureReferenceCommand];
-        fixture.detectChanges();
-
-        comp.aceEditorContainer.getEditor().setValue('');
-
-        const selectedUnit: AttachmentUnit = metisLecture3.lectureUnits?.first() as AttachmentUnit;
-        const selectedSlide: Slide = selectedUnit.slides?.first() as Slide;
-        const shortLink = selectedSlide.slideImagePath!.split('attachments/')[1];
-        // Use a regular expression and the replace() method to remove the file name and last slash
-        const shortLinkWithoutFileName: string = shortLink.replace(new RegExp(`[^/]*${'.png'}`), '').replace(/\/$/, '');
-        const referenceRouterLinkToSlide = `[slide]${metisLecture3.lectureUnits?.first()?.name} Slide ${selectedSlide.slideNumber}(${shortLinkWithoutFileName})[/slide]`;
-        lectureReferenceCommand.execute(metisLecture3.id!.toString(), ReferenceType.ATTACHMENT_UNITS, undefined, selectedUnit?.id!.toString(), selectedSlide?.id!.toString());
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe(referenceRouterLinkToSlide);
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/ordered-list-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/ordered-list-command.spec.ts
deleted file mode 100644
index f42c65cba12c..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/ordered-list-command.spec.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { OrderedListCommand } from 'app/shared/markdown-editor/commands/orderedListCommand';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('OrderedListCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new OrderedListCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add ordered list to lines on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('line 1\nline 2');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. line 1\n2. line 2');
-    });
-
-    it('should add new ordered list on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. ');
-    });
-
-    it('should remove ordered list on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. line 1\n2. line 2');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('line 1\nline 2');
-    });
-
-    it('should handle empty lines and create new list', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test\n\nTest');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. Test\n\n2. Test');
-    });
-
-    it('should handle empty lines and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. Test\n2.\n3. Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n\nTest');
-    });
-
-    it('should handle multiple sequential empty lines and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. Test\n\n3. Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n\nTest');
-    });
-
-    it('should handle dots in sentences and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. Test with dot at the end.\n2. Test with dot. in the center\n3. .Test with dot at the start');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test with dot at the end.\nTest with dot. in the center\n.Test with dot at the start');
-    });
-
-    it('should handle dots in sentences and create lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test with dot at the end.\nTest with dot. in the center\n.Test with dot at the start');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. Test with dot at the end.\n2. Test with dot. in the center\n3. .Test with dot at the start');
-    });
-
-    it('should handle single empty lines and create list', () => {
-        comp.aceEditorContainer.getEditor().setValue('');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. ');
-    });
-
-    it('should handle single empty lines and remove list', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. ');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-    });
-
-    it('should keep whitespaces at the beginning and create list', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test\n   Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('1. Test\n   2. Test');
-    });
-
-    it('should keep whitespaces at the beginning and remove list', () => {
-        comp.aceEditorContainer.getEditor().setValue('1. Test\n   2. Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n   Test');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/reference-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/reference-command.spec.ts
deleted file mode 100644
index 2cfc5ed19ed6..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/reference-command.spec.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { ReferenceCommand } from 'app/shared/markdown-editor/commands/reference.command';
-
-describe('ReferenceCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let referenceCommand: ReferenceCommand;
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                referenceCommand = new ReferenceCommand();
-                comp.defaultCommands = [referenceCommand];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add > Reference on execute when no text is selected', () => {
-        referenceCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('> Reference');
-    });
-
-    it('should remove > lorem on execute when reference is selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('> lorem');
-        referenceCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-    });
-
-    it('should remove > Reference on execute when reference is selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('> Reference');
-        referenceCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-    });
-
-    it('should add > on execute when text is selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('lorem');
-        referenceCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('> lorem');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/underline-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/underline-command.spec.ts
deleted file mode 100644
index ef851a0a03d3..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/underline-command.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { UnderlineCommand } from 'app/shared/markdown-editor/commands/underline.command';
-
-describe('Underline Command', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let underlineCommand: UnderlineCommand;
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                underlineCommand = new UnderlineCommand();
-                comp.defaultCommands = [underlineCommand];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    it('should add <ins></ins> brackets on execute when no text is selected', () => {
-        underlineCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('<ins></ins>');
-    });
-
-    it('should add <ins></ins> around selected text on execute when text is selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('lorem');
-        underlineCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('<ins>lorem</ins>');
-    });
-
-    it('should remove <ins></ins> around selected text on execute when text is selected', () => {
-        comp.aceEditorContainer.getEditor().setValue('<ins>lorem</ins>');
-        underlineCommand.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('lorem');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/unordered-list-command.spec.ts b/src/test/javascript/spec/component/markdown-editor/unordered-list-command.spec.ts
deleted file mode 100644
index e3fade1b6863..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/unordered-list-command.spec.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { AceEditorModule } from 'app/shared/markdown-editor/ace-editor/ace-editor.module';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
-import { ArtemisMarkdownEditorModule } from 'app/shared/markdown-editor/markdown-editor.module';
-import { ArtemisTestModule } from '../../test.module';
-import { UnorderedListCommand } from 'app/shared/markdown-editor/commands/unorderedListCommand';
-import { Command } from 'app/shared/markdown-editor/commands/command';
-
-describe('UnorderedListCommand', () => {
-    let comp: MarkdownEditorComponent;
-    let fixture: ComponentFixture<MarkdownEditorComponent>;
-    let command: Command;
-
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, AceEditorModule, ArtemisMarkdownEditorModule],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(MarkdownEditorComponent);
-                comp = fixture.componentInstance;
-
-                command = new UnorderedListCommand();
-                comp.defaultCommands = [command];
-                fixture.detectChanges();
-                comp.ngAfterViewInit();
-            });
-    });
-
-    afterEach(() => {
-        jest.restoreAllMocks();
-    });
-
-    it('should add ordered list to lines on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('line 1\nline 2');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- line 1\n- line 2');
-    });
-
-    it('should add new ordered list on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- ');
-    });
-
-    it('should remove ordered list on execute', () => {
-        comp.aceEditorContainer.getEditor().setValue('- line 1\n- line 2');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('line 1\nline 2');
-    });
-
-    it('should handle empty lines and create new list', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test\n\nTest');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- Test\n\n- Test');
-    });
-
-    it('should handle empty lines and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('- Test\n- \n- Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n\nTest');
-    });
-
-    it('should handle multiple sequential empty lines and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('- Test\n\n- Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n\nTest');
-    });
-
-    it('should handle dots in sentences and remove lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('- Test with dash at the end-\n- Test with dash- in the center\n- -Test with dash at the start');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test with dash at the end-\nTest with dash- in the center\n-Test with dash at the start');
-    });
-
-    it('should handle dots in sentences and create lists', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test with dash at the end-\nTest with dash- in the center\n-Test with dash at the start');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- Test with dash at the end-\n- Test with dash- in the center\n- -Test with dash at the start');
-    });
-
-    it('should handle single empty lines and remove list', () => {
-        comp.aceEditorContainer.getEditor().setValue('- ');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('');
-    });
-
-    it('should keep whitespaces at the beginning and create list', () => {
-        comp.aceEditorContainer.getEditor().setValue('Test\n   Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- Test\n   - Test');
-    });
-
-    it('should keep whitespaces at the beginning and remove list', () => {
-        comp.aceEditorContainer.getEditor().setValue('- Test\n  - Test');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('Test\n  Test');
-    });
-
-    it('should handle single dash and remove list', () => {
-        comp.aceEditorContainer.getEditor().setValue('- -');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('-');
-    });
-
-    it('should handle single dash and create list', () => {
-        comp.aceEditorContainer.getEditor().setValue('-');
-        command.execute();
-        expect(comp.aceEditorContainer.getEditor().getValue()).toBe('- -');
-    });
-});
diff --git a/src/test/javascript/spec/component/markdown-editor/userMentionCommand.spec.ts b/src/test/javascript/spec/component/markdown-editor/userMentionCommand.spec.ts
deleted file mode 100644
index 853013fdb62c..000000000000
--- a/src/test/javascript/spec/component/markdown-editor/userMentionCommand.spec.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { MetisService } from 'app/shared/metis/metis.service';
-import { ConversationUserDTO } from 'app/entities/metis/conversation/conversation-user-dto.model';
-import { HttpResponse } from '@angular/common/http';
-import { of } from 'rxjs';
-import { UserMentionCommand } from 'app/shared/markdown-editor/commands/courseArtifactReferenceCommands/userMentionCommand';
-import { CourseManagementService } from 'app/course/manage/course-management.service';
-import { SelectableItem } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-
-describe('UserMentionCommand', () => {
-    let userMentionCommand: UserMentionCommand;
-    let courseManagementServiceMock: Partial<CourseManagementService>;
-    let metisServiceMock: Partial<MetisService>;
-    let aceEditorMock: any;
-    let selectWithSearchComponent: any;
-
-    beforeEach(() => {
-        selectWithSearchComponent = {
-            open: () => {},
-            updateSearchTerm: () => {},
-            close: () => {},
-        };
-
-        courseManagementServiceMock = {
-            searchMembersForUserMentions: () =>
-                of(
-                    new HttpResponse<ConversationUserDTO[]>({
-                        body: [
-                            { name: 'User 1', login: 'user1' },
-                            { name: 'User 2', login: 'user2' },
-                        ],
-                    }),
-                ),
-        };
-
-        metisServiceMock = {
-            getCourse: () => ({ id: 123 }),
-        };
-
-        aceEditorMock = {
-            command: undefined,
-            commands: {
-                addCommand: (obj: any) => {
-                    aceEditorMock.command = obj;
-                },
-            },
-            execCommand: () => {},
-            getCursorPosition: () => ({ row: 0, column: 0 }),
-            focus: () => {},
-            session: {
-                getDocument: () => ({
-                    removeInLine: () => {},
-                }),
-                getLine: () => '',
-            },
-            insert: () => {},
-            renderer: {
-                textToScreenCoordinates: () => {},
-            },
-        };
-
-        // Create an instance of UserMentionCommand with mock services
-        userMentionCommand = new UserMentionCommand(courseManagementServiceMock as CourseManagementService, metisServiceMock as MetisService);
-        userMentionCommand.setSelectWithSearchComponent(selectWithSearchComponent);
-    });
-
-    it('should create an instance of UserMentionCommand', () => {
-        expect(userMentionCommand).toBeTruthy();
-    });
-
-    it('should perform a user search', () => {
-        const searchTerm = 'user';
-
-        const searchMembersForUserMentionsSpy = jest.spyOn(courseManagementServiceMock, 'searchMembersForUserMentions');
-
-        userMentionCommand.performSearch(searchTerm).subscribe((response) => {
-            expect(response.body).toEqual([
-                { name: 'User 1', login: 'user1' },
-                { name: 'User 2', login: 'user2' },
-            ]);
-        });
-
-        expect(searchMembersForUserMentionsSpy).toHaveBeenCalledExactlyOnceWith(123, searchTerm);
-    });
-
-    it('should insert selection', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-
-        const focusSpy = jest.spyOn(aceEditorMock, 'focus');
-
-        // Simulate open selection menu via triggering command
-        aceEditorMock.command.exec(aceEditorMock);
-
-        userMentionCommand.insertSelection({ name: 'User 1', login: 'user1' } as SelectableItem);
-
-        // the editor is focues twice: Once for the execution of the command, once after the text insertion
-        expect(focusSpy).toHaveBeenCalledTimes(2);
-    });
-
-    it('should not be able to call command twice while active', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-
-        const openSpy = jest.spyOn(selectWithSearchComponent, 'open');
-
-        // Simulate open selection menu via triggering command
-        aceEditorMock.command.exec(aceEditorMock);
-        aceEditorMock.command.exec(aceEditorMock);
-
-        expect(openSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should add command when setting editor', () => {
-        const addCommandSpy = jest.spyOn(aceEditorMock.commands, 'addCommand');
-
-        userMentionCommand.setEditor(aceEditorMock);
-
-        expect(addCommandSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should execute the command', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-
-        const execCommandSpy = jest.spyOn(aceEditorMock, 'execCommand');
-
-        userMentionCommand.execute();
-
-        expect(execCommandSpy).toHaveBeenCalledExactlyOnceWith('@');
-    });
-
-    it('should calculate screen coordinates', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-
-        const textToScreenCoordinatesSpy = jest.spyOn(aceEditorMock.renderer, 'textToScreenCoordinates');
-
-        userMentionCommand.getCursorScreenPosition();
-
-        expect(textToScreenCoordinatesSpy).toHaveBeenCalledOnce();
-    });
-
-    it('should update search term correctly based on cursor position', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-        aceEditorMock.command.exec(aceEditorMock);
-        aceEditorMock.getCursorPosition = jest.fn(() => ({ row: 0, column: 10 }));
-        aceEditorMock.session.getLine = jest.fn(() => 'Hello @user');
-
-        const updateSearchTermSpy = jest.spyOn(selectWithSearchComponent, 'updateSearchTerm');
-
-        userMentionCommand.updateSearchTerm();
-
-        expect(updateSearchTermSpy).toHaveBeenCalledExactlyOnceWith('user');
-    });
-
-    it('should not update search term if menu not open', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-
-        const updateSearchTermSpy = jest.spyOn(selectWithSearchComponent, 'updateSearchTerm');
-
-        userMentionCommand.updateSearchTerm();
-
-        expect(updateSearchTermSpy).not.toHaveBeenCalled();
-    });
-
-    it('should close selectWithSearchComponent if there is no "@" sign', () => {
-        userMentionCommand.setEditor(aceEditorMock);
-        aceEditorMock.command.exec(aceEditorMock);
-        aceEditorMock.getCursorPosition = jest.fn(() => ({ row: 0, column: 6 }));
-        aceEditorMock.session.getLine = jest.fn(() => 'Hello ');
-
-        const closeSpy = jest.spyOn(selectWithSearchComponent, 'close');
-
-        userMentionCommand.updateSearchTerm();
-
-        expect(closeSpy).toHaveBeenCalledOnce();
-    });
-});
diff --git a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
index 2bdc08914731..7bbd4b2e71a7 100644
--- a/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-assessment-editor/modeling-assessment-editor.component.spec.ts
@@ -12,7 +12,7 @@ import { AssessmentType } from 'app/entities/assessment-type.model';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
@@ -20,7 +20,7 @@ import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Result } from 'app/entities/result.model';
 import { getLatestSubmissionResult } from 'app/entities/submission.model';
 import { ModelingAssessmentEditorComponent } from 'app/exercises/modeling/assess/modeling-assessment-editor/modeling-assessment-editor.component';
diff --git a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts
index b05efdeb91e5..ccbc08667bd0 100644
--- a/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-exercise/modeling-exercise-update.component.spec.ts
@@ -12,7 +12,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import dayjs from 'dayjs/esm';
 import { TranslateService } from '@ngx-translate/core';
 import { MockComponent, MockProvider } from 'ng-mocks';
@@ -27,6 +27,7 @@ import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiari
 import { NgModel } from '@angular/forms';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { UMLDiagramType } from '@ls1intum/apollon';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
 
 describe('ModelingExerciseUpdateComponent', () => {
     let comp: ModelingExerciseUpdateComponent;
@@ -34,7 +35,8 @@ describe('ModelingExerciseUpdateComponent', () => {
     let service: ModelingExerciseService;
     let courseService: CourseManagementService;
     let exerciseService: ExerciseService;
-    const categories = [{ category: 'testCat' }, { category: 'testCat2' }];
+    const categories = [new ExerciseCategory('testCat', undefined), new ExerciseCategory('testCat2', undefined)];
+
     const categoriesStringified = categories.map((cat) => JSON.stringify(cat));
 
     beforeEach(() => {
@@ -262,7 +264,8 @@ describe('ModelingExerciseUpdateComponent', () => {
         const modelingExercise = new ModelingExercise(UMLDiagramType.ClassDiagram, undefined, undefined);
         modelingExercise.categories = categories;
         comp.modelingExercise = modelingExercise;
-        const newCategories = [{ category: 'newCat1' }, { category: 'newCat2' }];
+        const newCategories = [new ExerciseCategory('newCat1', undefined), new ExerciseCategory('newCat2', undefined)];
+
         comp.updateCategories(newCategories);
         expect(comp.modelingExercise.categories).toEqual(newCategories);
     });
@@ -285,7 +288,7 @@ describe('ModelingExerciseUpdateComponent', () => {
     it('should updateCategories properly by making category available for selection again when removing it', () => {
         comp.modelingExercise = new ModelingExercise(UMLDiagramType.ClassDiagram, undefined, undefined);
         comp.exerciseCategories = [];
-        const newCategories = [{ category: 'Easy' }, { category: 'Hard' }];
+        const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)];
 
         comp.updateCategories(newCategories);
 
diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts
index c6019160c79c..0f44f1b0e6fd 100644
--- a/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission-team.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of, throwError } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
@@ -47,8 +46,6 @@ import { ExerciseMode } from 'app/entities/exercise.model';
 import { SubmissionPatch } from 'app/entities/submission-patch.model';
 
 describe('ModelingSubmissionComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
     let comp: ModelingSubmissionComponent;
     let fixture: ComponentFixture<ModelingSubmissionComponent>;
     let debugElement: DebugElement;
diff --git a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts
index 7ab3c3b3d2fa..439db7c5dcb9 100644
--- a/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts
+++ b/src/test/javascript/spec/component/modeling-submission/modeling-submission.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { BehaviorSubject, of, throwError } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
@@ -45,8 +44,6 @@ import { GradingInstruction } from 'app/exercises/shared/structured-grading-crit
 import { AlertService } from 'app/core/util/alert.service';
 
 describe('ModelingSubmissionComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
     let comp: ModelingSubmissionComponent;
     let fixture: ComponentFixture<ModelingSubmissionComponent>;
     let debugElement: DebugElement;
diff --git a/src/test/javascript/spec/component/multiple-choice-question/multiple-choice-question-edit.component.spec.ts b/src/test/javascript/spec/component/multiple-choice-question/multiple-choice-question-edit.component.spec.ts
index 04a5b5b9e616..763122daee76 100644
--- a/src/test/javascript/spec/component/multiple-choice-question/multiple-choice-question-edit.component.spec.ts
+++ b/src/test/javascript/spec/component/multiple-choice-question/multiple-choice-question-edit.component.spec.ts
@@ -7,12 +7,6 @@ import { QuizScoringInfoModalComponent } from 'app/exercises/quiz/manage/quiz-sc
 import { DragAndDropQuestionComponent } from 'app/exercises/quiz/shared/questions/drag-and-drop-question/drag-and-drop-question.component';
 import { MultipleChoiceQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-question.component';
 import { SecuredImageComponent } from 'app/shared/image/secured-image.component';
-import { CorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/correctOptionCommand';
-import { ExplanationCommand } from 'app/shared/markdown-editor/domainCommands/explanation.command';
-import { HintCommand } from 'app/shared/markdown-editor/domainCommands/hint.command';
-import { IncorrectOptionCommand } from 'app/shared/markdown-editor/domainCommands/incorrectOptionCommand';
-import { TestCaseCommand } from 'app/shared/markdown-editor/domainCommands/programming-exercise/testCase.command';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { DragDropModule } from '@angular/cdk/drag-drop';
@@ -21,6 +15,12 @@ import { NgbCollapseMocksModule } from '../../helpers/mocks/directive/ngbCollaps
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { MultipleChoiceVisualQuestionComponent } from 'app/exercises/quiz/shared/questions/multiple-choice-question/multiple-choice-visual-question.component';
 import { ScoringType } from 'app/entities/quiz/quiz-question.model';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action';
+import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action';
+import { MonacoTestCaseAction } from 'app/shared/monaco-editor/model/actions/monaco-test-case.action';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('MultipleChoiceQuestionEditComponent', () => {
     let fixture: ComponentFixture<MultipleChoiceQuestionEditComponent>;
@@ -47,7 +47,7 @@ describe('MultipleChoiceQuestionEditComponent', () => {
                 MultipleChoiceQuestionEditComponent,
                 MockPipe(ArtemisTranslatePipe),
                 MockComponent(QuizScoringInfoModalComponent),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(SecuredImageComponent),
                 MockComponent(DragAndDropQuestionComponent),
                 MockComponent(MultipleChoiceQuestionComponent),
@@ -91,12 +91,12 @@ describe('MultipleChoiceQuestionEditComponent', () => {
     });
 
     it('should parse answer options but not question titles', () => {
-        component.domainCommandsFound([
-            ['text1', new TestCaseCommand()],
-            ['text2', new CorrectOptionCommand()],
-            ['text3', new IncorrectOptionCommand()],
-            ['text4', new ExplanationCommand()],
-            ['text5', new HintCommand()],
+        component.domainActionsFound([
+            { text: 'text1', action: new MonacoTestCaseAction() },
+            { text: 'text2', action: new MonacoCorrectMultipleChoiceAnswerAction() },
+            { text: 'text3', action: new MonacoWrongMultipleChoiceAnswerAction() },
+            { text: 'text4', action: new MonacoQuizExplanationAction() },
+            { text: 'text5', action: new MonacoQuizHintAction() },
         ]);
 
         const expected: MultipleChoiceQuestion = {
@@ -129,12 +129,12 @@ describe('MultipleChoiceQuestionEditComponent', () => {
     });
 
     it('should parse answer options with question titles', () => {
-        component.domainCommandsFound([
-            ['text1', new ExplanationCommand()],
-            ['text2', new HintCommand()],
-            ['text3', new TestCaseCommand()],
-            ['text4', new CorrectOptionCommand()],
-            ['text5', new IncorrectOptionCommand()],
+        component.domainActionsFound([
+            { text: 'text1', action: new MonacoQuizExplanationAction() },
+            { text: 'text2', action: new MonacoQuizHintAction() },
+            { text: 'text3', action: new MonacoTestCaseAction() },
+            { text: 'text4', action: new MonacoCorrectMultipleChoiceAnswerAction() },
+            { text: 'text5', action: new MonacoWrongMultipleChoiceAnswerAction() },
         ]);
 
         const expected: MultipleChoiceQuestion = {
@@ -165,7 +165,7 @@ describe('MultipleChoiceQuestionEditComponent', () => {
     });
 
     it('should parse question titles', () => {
-        component.domainCommandsFound([['text1', null]]);
+        component.domainActionsFound([{ text: 'text1', action: undefined }]);
 
         const expected: MultipleChoiceQuestion = {
             id: question.id,
@@ -183,8 +183,8 @@ describe('MultipleChoiceQuestionEditComponent', () => {
         expect(component.showMultipleChoiceQuestionPreview).toBeTrue();
     });
 
-    it('should find no domain commands', () => {
-        component.domainCommandsFound([]);
+    it('should find no domain actions', () => {
+        component.domainActionsFound([]);
 
         expectCleanupQuestion();
         expect(component.showMultipleChoiceQuestionPreview).toBeTrue();
diff --git a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts
index a01c3b4bdbd5..e81ad3cbd435 100644
--- a/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts
+++ b/src/test/javascript/spec/component/non-programming-exercise-detail-common-actions.component.spec.ts
@@ -6,11 +6,11 @@ import { MockFileUploadExerciseService } from '../helpers/mocks/service/mock-fil
 import { SubmissionExportButtonComponent } from 'app/exercises/shared/submission-export/submission-export-button.component';
 import { MockComponent, MockDirective, MockProvider } from 'ng-mocks';
 import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
 import { of } from 'rxjs';
diff --git a/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts b/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts
index 5350df402a29..fc43be446641 100644
--- a/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts
+++ b/src/test/javascript/spec/component/orion/orion-code-editor-instructor-and-editor-container.component.spec.ts
@@ -19,7 +19,7 @@ import { MockRouter } from '../../helpers/mocks/mock-router';
 import { Router } from '@angular/router';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 describe('CodeEditorInstructorAndEditorOrionContainerComponent', () => {
     let comp: CodeEditorInstructorAndEditorOrionContainerComponent;
diff --git a/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts b/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts
index d5688eb628cf..430f28bee09f 100644
--- a/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts
+++ b/src/test/javascript/spec/component/orion/orion-exercise-assessment-dashboard.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { OrionExerciseAssessmentDashboardComponent } from 'app/orion/assessment/orion-exercise-assessment-dashboard.component';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { TutorParticipationStatus } from 'app/entities/participation/tutor-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { BehaviorSubject, of, throwError } from 'rxjs';
 import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
diff --git a/src/test/javascript/spec/component/overview/course-card.component.spec.ts b/src/test/javascript/spec/component/overview/course-card.component.spec.ts
index 9c22d764106f..fbe16f160c51 100644
--- a/src/test/javascript/spec/component/overview/course-card.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-card.component.spec.ts
@@ -9,7 +9,7 @@ import { Exercise } from 'app/entities/exercise.model';
 import { MockComponent, MockDirective, MockModule, MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { SubmissionExerciseType } from 'app/entities/submission.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe';
 import { PieChartModule } from '@swimlane/ngx-charts';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
diff --git a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts
index 384e0875b8cd..658cc5b4f7ae 100644
--- a/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-competencies/course-competencies-details.component.spec.ts
@@ -20,7 +20,7 @@ import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { Competency, CompetencyProgress } from 'app/entities/competency.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { HttpResponse } from '@angular/common/http';
 import { MockHasAnyAuthorityDirective } from '../../../helpers/mocks/directive/mock-has-any-authority.directive';
diff --git a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts
index 61f94f5c2cfc..5dba62cd4934 100644
--- a/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component.spec.ts
@@ -5,7 +5,7 @@ import {
 } from 'app/overview/course-conversations/dialogs/conversation-add-users-dialog/add-users-form/conversation-add-users-form.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { CourseUsersSelectorComponent } from 'app/shared/course-users-selector/course-users-selector.component';
 import { ConversationDTO } from 'app/entities/metis/conversation/conversation.model';
 import { generateExampleChannelDTO, generateExampleGroupChatDTO } from '../../../helpers/conversationExampleModels';
@@ -13,6 +13,7 @@ import { Course } from 'app/entities/course.model';
 import { isChannelDTO } from 'app/entities/metis/conversation/channel.model';
 import { By } from '@angular/platform-browser';
 import { UserPublicInfoDTO } from 'app/core/user/user.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 const examples: ConversationDTO[] = [generateExampleGroupChatDTO({}), generateExampleChannelDTO({})];
 examples.forEach((activeConversation) => {
@@ -24,7 +25,7 @@ examples.forEach((activeConversation) => {
         beforeEach(waitForAsync(() => {
             TestBed.configureTestingModule({
                 imports: [ReactiveFormsModule, FormsModule],
-                declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe)],
+                declarations: [ConversationAddUsersFormComponent, MockComponent(CourseUsersSelectorComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)],
             }).compileComponents();
         }));
 
diff --git a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts
index cabb62f2ae39..60590bae4bde 100644
--- a/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-exams/course-exams.component.spec.ts
@@ -2,23 +2,24 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { CourseExamsComponent } from 'app/overview/course-exams/course-exams.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ArtemisTestModule } from '../../../test.module';
 import dayjs from 'dayjs/esm';
-import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
+import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { Observable, of } from 'rxjs';
 import { ArtemisServerDateService } from 'app/shared/server-date.service';
 import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { CourseStorageService } from 'app/course/manage/course-storage.service';
-import { SidebarComponent } from '../../../../../../main/webapp/app/shared/sidebar/sidebar.component';
+import { SidebarComponent } from 'app/shared/sidebar/sidebar.component';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
 import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe';
 import { RouterTestingModule } from '@angular/router/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
 import { CourseOverviewService } from 'app/overview/course-overview.service';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('CourseExamsComponent', () => {
     let component: CourseExamsComponent;
@@ -100,7 +101,7 @@ describe('CourseExamsComponent', () => {
         router.navigate.mockImplementation(() => Promise.resolve(true));
 
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)],
+            imports: [ArtemisTestModule, RouterTestingModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)],
             declarations: [CourseExamsComponent, SidebarComponent, SearchFilterComponent, MockPipe(ArtemisTranslatePipe), MockPipe(SearchFilterPipe)],
             providers: [
                 { provide: Router, useValue: router },
diff --git a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
index f5eecf4d351c..101871555716 100644
--- a/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-lectures/course-lecture-details.component.spec.ts
@@ -2,14 +2,13 @@ import { DebugElement } from '@angular/core';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
-import { RouterTestingModule } from '@angular/router/testing';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { TranslateService } from '@ngx-translate/core';
 import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { AlertService } from 'app/core/util/alert.service';
 import { BehaviorSubject, of } from 'rxjs';
-import { CourseLectureDetailsComponent } from '../../../../../../main/webapp/app/overview/course-lectures/course-lecture-details.component';
+import { CourseLectureDetailsComponent } from 'app/overview/course-lectures/course-lecture-details.component';
 import { AttachmentUnitComponent } from 'app/overview/course-lectures/attachment-unit/attachment-unit.component';
 import { ExerciseUnitComponent } from 'app/overview/course-lectures/exercise-unit/exercise-unit.component';
 import { TextUnitComponent } from 'app/overview/course-lectures/text-unit/text-unit.component';
@@ -21,14 +20,14 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe';
 import { SidePanelComponent } from 'app/shared/side-panel/side-panel.component';
 import { Lecture } from 'app/entities/lecture.model';
-import { Course } from 'app/entities/course.model';
+import { Course, CourseInformationSharingConfiguration } from 'app/entities/course.model';
 import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
 import { Attachment, AttachmentType } from 'app/entities/attachment.model';
 import { TextUnit } from 'app/entities/lecture-unit/textUnit.model';
 import { FileService } from 'app/shared/http/file.service';
 import { LectureService } from 'app/lecture/lecture.service';
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import { HttpHeaders, HttpResponse, provideHttpClient } from '@angular/common/http';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
 import { SubmissionResultStatusComponent } from 'app/overview/submission-result-status.component';
 import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component';
@@ -39,31 +38,36 @@ import { CourseExerciseRowComponent } from 'app/overview/course-exercises/course
 import { MockFileService } from '../../../helpers/mocks/service/mock-file.service';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
-import { NgbCollapse, NgbPopover, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { ScienceService } from 'app/shared/science/science.service';
 import * as DownloadUtils from 'app/shared/util/download.util';
-import { ProfileService } from '../../../../../../main/webapp/app/shared/layouts/profiles/profile.service';
-import { ProfileInfo } from '../../../../../../main/webapp/app/shared/layouts/profiles/profile-info.model';
+import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { MockProfileService } from '../../../helpers/mocks/service/mock-profile.service';
 import { OnlineUnitComponent } from 'app/overview/course-lectures/online-unit/online-unit.component';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
+import { NgbCollapse, NgbPopover, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
 
 describe('CourseLectureDetailsComponent', () => {
     let fixture: ComponentFixture<CourseLectureDetailsComponent>;
     let courseLecturesDetailsComponent: CourseLectureDetailsComponent;
     let lecture: Lecture;
+    let course: Course;
     let lectureUnit1: AttachmentUnit;
     let lectureUnit2: AttachmentUnit;
     let lectureUnit3: TextUnit;
     let debugElement: DebugElement;
     let profileService: ProfileService;
+    let lectureService: LectureService;
 
     let getProfileInfoMock: jest.SpyInstance;
 
-    beforeEach(() => {
+    beforeEach(async () => {
         const releaseDate = dayjs('18-03-2020', 'DD-MM-YYYY');
 
-        const course = new Course();
+        course = new Course();
         course.id = 456;
+        course.courseInformationSharingConfiguration = CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING;
 
         lecture = new Lecture();
         lecture.id = 1;
@@ -88,8 +92,8 @@ describe('CourseLectureDetailsComponent', () => {
         headers = headers.set('Content-Type', 'application/json; charset=utf-8');
         const response = of(new HttpResponse({ body: lecture, headers, status: 200 }));
 
-        TestBed.configureTestingModule({
-            imports: [RouterTestingModule, MockDirective(NgbTooltip), MockDirective(NgbCollapse), MockDirective(NgbPopover)],
+        await TestBed.configureTestingModule({
+            imports: [MockDirective(NgbTooltip), MockDirective(NgbCollapse), MockDirective(NgbPopover)],
             declarations: [
                 CourseLectureDetailsComponent,
                 MockComponent(AttachmentUnitComponent),
@@ -112,8 +116,11 @@ describe('CourseLectureDetailsComponent', () => {
                 MockComponent(FaIconComponent),
                 MockDirective(TranslateDirective),
                 MockComponent(SubmissionResultStatusComponent),
+                MockComponent(DiscussionSectionComponent),
             ],
             providers: [
+                provideHttpClient(),
+                provideHttpClientTesting(),
                 MockProvider(LectureService, {
                     find: () => {
                         return response;
@@ -136,20 +143,22 @@ describe('CourseLectureDetailsComponent', () => {
                 MockProvider(Router),
                 MockProvider(ScienceService),
             ],
-        })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(CourseLectureDetailsComponent);
-                courseLecturesDetailsComponent = fixture.componentInstance;
-                debugElement = fixture.debugElement;
-
-                // mock profileService
-                profileService = fixture.debugElement.injector.get(ProfileService);
-                getProfileInfoMock = jest.spyOn(profileService, 'getProfileInfo');
-                const profileInfo = { inProduction: false } as ProfileInfo;
-                const profileInfoSubject = new BehaviorSubject<ProfileInfo | null>(profileInfo);
-                getProfileInfoMock.mockReturnValue(profileInfoSubject);
-            });
+        }).compileComponents();
+
+        lectureService = TestBed.inject(LectureService);
+        jest.spyOn(lectureService, 'findWithDetails').mockReturnValue(response);
+        jest.spyOn(lectureService, 'find').mockReturnValue(response);
+
+        fixture = TestBed.createComponent(CourseLectureDetailsComponent);
+        courseLecturesDetailsComponent = fixture.componentInstance;
+        debugElement = fixture.debugElement;
+
+        // mock profileService
+        profileService = fixture.debugElement.injector.get(ProfileService);
+        getProfileInfoMock = jest.spyOn(profileService, 'getProfileInfo');
+        const profileInfo = { inProduction: false } as ProfileInfo;
+        const profileInfoSubject = new BehaviorSubject<ProfileInfo | null>(profileInfo);
+        getProfileInfoMock.mockReturnValue(profileInfoSubject);
     });
 
     afterEach(() => {
@@ -247,6 +256,27 @@ describe('CourseLectureDetailsComponent', () => {
         expect(courseLecturesDetailsComponent.attachmentExtension(attachment)).toBe('N/A');
     }));
 
+    it('should show discussion section when communication is enabled', fakeAsync(() => {
+        fixture.detectChanges();
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeTruthy();
+    }));
+
+    it('should not show discussion section when communication is disabled', fakeAsync(() => {
+        const lecture = {
+            ...lectureUnit3.lecture,
+            course: { courseInformationSharingConfiguration: CourseInformationSharingConfiguration.DISABLED },
+        };
+        const response = of(new HttpResponse({ body: { ...lecture }, status: 200 }));
+        jest.spyOn(TestBed.inject(LectureService), 'findWithDetails').mockReturnValue(response);
+
+        fixture.detectChanges();
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeFalsy();
+    }));
+
     it('should download file for attachment', fakeAsync(() => {
         const fileService = TestBed.inject(FileService);
         const downloadFileSpy = jest.spyOn(fileService, 'downloadFile');
diff --git a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts
index ea11d9ecd2a4..b38eefa60f4e 100644
--- a/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/course-statistics/course-statistics.component.spec.ts
@@ -14,7 +14,7 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { TreeviewModule } from 'app/exercises/programming/shared/code-editor/treeview/treeview.module';
 import { CourseCompetenciesComponent } from 'app/overview/course-competencies/course-competencies.component';
@@ -29,6 +29,7 @@ import { MockComponent, MockModule, MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import { MockTranslateValuesDirective } from '../../../helpers/mocks/directive/mock-translate-values.directive';
 import { ArtemisTestModule } from '../../../test.module';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('CourseStatisticsComponent', () => {
     let comp: CourseStatisticsComponent;
@@ -336,6 +337,7 @@ describe('CourseStatisticsComponent', () => {
                 MockComponent(DocumentationButtonComponent),
                 MockTranslateValuesDirective,
                 ArtemisTranslatePipe,
+                TranslateDirective,
             ],
             providers: [
                 MockProvider(ArtemisNavigationUtilService),
@@ -376,11 +378,11 @@ describe('CourseStatisticsComponent', () => {
         fixture.detectChanges();
         expect(comp.ngxExerciseGroups.size).toBe(4);
         const modelingWrapper = fixture.debugElement.query(By.css('#modeling-wrapper'));
-        expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.exerciseCount ');
-        expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints ');
-        expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints ');
-        expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints ');
-        expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.presentationScore ');
+        expect(modelingWrapper.query(By.css('h4')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.exerciseCount');
+        expect(modelingWrapper.query(By.css('#absolute-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints');
+        expect(modelingWrapper.query(By.css('#reachable-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints');
+        expect(modelingWrapper.query(By.css('#max-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints');
+        expect(fixture.debugElement.query(By.css('#presentation-score')).nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.presentationScore');
 
         const programming: NgxExercise = comp.ngxExerciseGroups.get(ExerciseType.PROGRAMMING)![0];
         expect(programming.series).toHaveLength(6);
@@ -444,11 +446,11 @@ describe('CourseStatisticsComponent', () => {
 
         // check that html file displays the correct elements
         let debugElement = fixture.debugElement.query(By.css('#absolute-course-score'));
-        expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.yourPoints ');
+        expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.yourPoints');
         debugElement = fixture.debugElement.query(By.css('#reachable-course-score'));
-        expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.reachablePoints ');
+        expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.reachablePoints');
         debugElement = fixture.debugElement.query(By.css('#max-course-score'));
-        expect(debugElement.nativeElement.textContent).toBe(' artemisApp.courseOverview.statistics.totalPoints ');
+        expect(debugElement.nativeElement.textContent).toBe('artemisApp.courseOverview.statistics.totalPoints');
     });
 
     it('should set the course after being notified about a course update', () => {
diff --git a/src/test/javascript/spec/component/overview/discussion-section/discussion-section.component.spec.ts b/src/test/javascript/spec/component/overview/discussion-section/discussion-section.component.spec.ts
index 55a145f49666..f1f6ec890ecf 100644
--- a/src/test/javascript/spec/component/overview/discussion-section/discussion-section.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/discussion-section/discussion-section.component.spec.ts
@@ -1,8 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { HttpResponse, provideHttpClient } from '@angular/common/http';
-import { MockComponent, MockModule, MockPipe, MockProvider } from 'ng-mocks';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { MockComponent, MockModule, MockProvider } from 'ng-mocks';
 import { MetisService } from 'app/shared/metis/metis.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { MockExerciseService } from '../../../helpers/mocks/service/mock-exercise.service';
@@ -13,8 +12,6 @@ import { MockPostService } from '../../../helpers/mocks/service/mock-post.servic
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../../../helpers/mocks/service/mock-account.service';
 import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
-import { PostingThreadComponent } from 'app/shared/metis/posting-thread/posting-thread.component';
-import { PostCreateEditModalComponent } from 'app/shared/metis/posting-create-edit-modal/post-create-edit-modal/post-create-edit-modal.component';
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
@@ -25,7 +22,6 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockLocalStorageService } from '../../../helpers/mocks/service/mock-local-storage.service';
 import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { getElement, getElements } from '../../../helpers/utils/general.utils';
-import { ButtonComponent } from 'app/shared/components/button.component';
 import {
     messagesBetweenUser1User2,
     metisCourse,
@@ -47,6 +43,7 @@ import { MetisConversationService } from 'app/shared/metis/metis-conversation.se
 import { MockMetisConversationService } from '../../../helpers/mocks/service/mock-metis-conversation.service';
 import { NotificationService } from 'app/shared/notification/notification.service';
 import { MockNotificationService } from '../../../helpers/mocks/service/mock-notification.service';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 
 @Directive({
     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -66,11 +63,12 @@ describe('DiscussionSectionComponent', () => {
     let getChannelOfLectureSpy: jest.SpyInstance;
     let getChannelOfExerciseSpy: jest.SpyInstance;
 
-    beforeEach(() => {
-        TestBed.configureTestingModule({
-            imports: [MockModule(FormsModule), MockModule(ReactiveFormsModule), MockModule(NgbTooltipModule)],
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [MockModule(FormsModule), MockModule(ReactiveFormsModule), MockModule(NgbTooltipModule), DiscussionSectionComponent],
             providers: [
                 provideHttpClient(),
+                provideHttpClientTesting(),
                 FormBuilder,
                 MockProvider(SessionStorageService),
                 MockProvider(ChannelService),
@@ -89,48 +87,36 @@ describe('DiscussionSectionComponent', () => {
                     useValue: new MockActivatedRoute({ postId: metisPostTechSupport.id, courseId: metisCourse.id }),
                 },
             ],
-            declarations: [
-                DiscussionSectionComponent,
-                InfiniteScrollStubDirective,
-                MockComponent(PostingThreadComponent),
-                MockComponent(PostCreateEditModalComponent),
-                MockComponent(FaIconComponent),
-                MockComponent(ButtonComponent),
-                MockPipe(ArtemisTranslatePipe),
-            ],
+            declarations: [InfiniteScrollStubDirective, MockComponent(FaIconComponent)],
         })
             .overrideComponent(DiscussionSectionComponent, {
                 set: {
                     providers: [{ provide: MetisService, useClass: MetisService }],
                 },
             })
-            .compileComponents()
-            .then(() => {
-                fixture = TestBed.createComponent(DiscussionSectionComponent);
-                component = fixture.componentInstance;
-                metisService = fixture.debugElement.injector.get(MetisService);
-                channelService = TestBed.inject(ChannelService);
-                getChannelOfLectureSpy = jest.spyOn(channelService, 'getChannelOfLecture').mockReturnValue(
-                    of(
-                        new HttpResponse({
-                            body: metisLectureChannelDTO,
-                            status: 200,
-                        }),
-                    ),
-                );
-                getChannelOfExerciseSpy = jest.spyOn(channelService, 'getChannelOfExercise').mockReturnValue(
-                    of(
-                        new HttpResponse({
-                            body: metisExerciseChannelDTO,
-                            status: 200,
-                        }),
-                    ),
-                );
-                metisServiceGetFilteredPostsSpy = jest.spyOn(metisService, 'getFilteredPosts');
-                component.lecture = { ...metisLecture, course: metisCourse };
-                component.ngOnInit();
-                fixture.detectChanges();
-            });
+            .compileComponents();
+
+        fixture = TestBed.createComponent(DiscussionSectionComponent);
+        component = fixture.componentInstance;
+        metisService = fixture.debugElement.injector.get(MetisService);
+        channelService = TestBed.inject(ChannelService);
+        getChannelOfLectureSpy = jest.spyOn(channelService, 'getChannelOfLecture').mockReturnValue(
+            of(
+                new HttpResponse({
+                    body: metisLectureChannelDTO,
+                    status: 200,
+                }),
+            ),
+        );
+        getChannelOfExerciseSpy = jest.spyOn(channelService, 'getChannelOfExercise').mockReturnValue(
+            of(
+                new HttpResponse({
+                    body: metisExerciseChannelDTO,
+                    status: 200,
+                }),
+            ),
+        );
+        metisServiceGetFilteredPostsSpy = jest.spyOn(metisService, 'getFilteredPosts');
     });
 
     afterEach(() => {
@@ -138,8 +124,8 @@ describe('DiscussionSectionComponent', () => {
     });
 
     it('should set course and messages for lecture with lecture channel on initialization', fakeAsync(() => {
-        component.lecture = { ...metisLecture, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('lecture', { ...metisLecture, course: metisCourse });
+        fixture.detectChanges();
         tick();
         expect(component.course).toEqual(metisCourse);
         expect(component.createdPost).toBeDefined();
@@ -149,9 +135,8 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should set course and messages for exercise with exercise channel on initialization', fakeAsync(() => {
-        component.lecture = undefined;
-        component.exercise = { ...metisExercise, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
+        fixture.detectChanges();
         tick();
         expect(component.course).toEqual(metisCourse);
         expect(component.createdPost).toBeDefined();
@@ -161,6 +146,8 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should reset current post', fakeAsync(() => {
+        fixture.componentRef.setInput('lecture', { ...metisLecture, course: metisCourse });
+        fixture.detectChanges();
         component.resetCurrentPost();
         tick();
         expect(component.currentPost).toBeUndefined();
@@ -168,9 +155,8 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should initialize correctly for exercise posts with default settings', fakeAsync(() => {
-        component.lecture = undefined;
-        component.exercise = { ...metisExercise, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
+        fixture.detectChanges();
         tick();
         expect(component.formGroup.get('filterToUnresolved')?.value).toBeFalse();
         expect(component.formGroup.get('filterToOwn')?.value).toBeFalse();
@@ -182,32 +168,32 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should display one new message button for more then 3 messages in channel', fakeAsync(() => {
-        component.exercise = { ...metisExercise, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
+        fixture.detectChanges();
         tick();
         fixture.detectChanges();
         tick();
         component.posts = metisExercisePosts;
         fixture.detectChanges();
         tick();
-        const newPostButtons = getElements(fixture.debugElement, '.btn-primary');
+        const newPostButtons = getElements(fixture.debugElement, '#new-post');
         expect(newPostButtons).not.toBeNull();
         expect(newPostButtons).toHaveLength(1);
     }));
 
     it('should display one new message button', fakeAsync(() => {
-        component.exercise = { ...metisExercise, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
+        fixture.detectChanges();
         tick();
         fixture.detectChanges();
-        const newPostButtons = getElements(fixture.debugElement, '.btn-primary');
+        const newPostButtons = getElements(fixture.debugElement, '#new-post');
         expect(newPostButtons).not.toBeNull();
         expect(newPostButtons).toHaveLength(1);
     }));
 
     it('should show search-bar and filters if not focused to a post', fakeAsync(() => {
-        component.exercise = { ...metisExercise, course: metisCourse };
-        component.ngOnInit();
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
+        fixture.detectChanges();
         tick();
         fixture.detectChanges();
         const searchInput = getElement(fixture.debugElement, 'input[name=searchText]');
@@ -222,8 +208,7 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should hide search-bar and filters if focused to a post', fakeAsync(() => {
-        component.lecture = undefined;
-        component.ngOnInit();
+        fixture.detectChanges();
         tick();
         fixture.detectChanges();
         const searchInput = getElement(fixture.debugElement, 'input[name=searchText]');
@@ -238,9 +223,9 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('triggering filters should invoke the metis service', fakeAsync(() => {
-        component.exercise = { ...metisExercise, course: metisCourse };
+        fixture.componentRef.setInput('exercise', { ...metisExercise, course: metisCourse });
         metisServiceGetFilteredPostsSpy.mockReset();
-        component.ngOnInit();
+        fixture.detectChanges();
         tick();
         fixture.detectChanges();
         component.formGroup.patchValue({
@@ -268,8 +253,8 @@ describe('DiscussionSectionComponent', () => {
 
     it('loads exercise messages if communication only', fakeAsync(() => {
         component.course = { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_ONLY } as Course;
-        component.exercise = { id: 2 } as Exercise;
-        component.lecture = undefined;
+        fixture.componentRef.setInput('exercise', { id: 2 } as Exercise);
+        fixture.detectChanges();
 
         component.setChannel(1);
 
@@ -283,7 +268,8 @@ describe('DiscussionSectionComponent', () => {
 
     it('loads lecture messages if communication only', fakeAsync(() => {
         component.course = { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_ONLY } as Course;
-        component.lecture = { id: 2 } as Lecture;
+        fixture.componentRef.setInput('lecture', { id: 2 } as Lecture);
+        fixture.detectChanges();
 
         component.setChannel(1);
 
@@ -297,7 +283,8 @@ describe('DiscussionSectionComponent', () => {
 
     it('collapses sidebar if no channel exists', fakeAsync(() => {
         component.course = { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_ONLY } as Course;
-        component.lecture = { id: 2 } as Lecture;
+        fixture.componentRef.setInput('lecture', { id: 2 } as Lecture);
+        fixture.detectChanges();
         getChannelOfLectureSpy = jest.spyOn(channelService, 'getChannelOfLecture').mockReturnValue(
             of(
                 new HttpResponse({
@@ -315,6 +302,9 @@ describe('DiscussionSectionComponent', () => {
     }));
 
     it('should react to srcoll up event', fakeAsync(() => {
+        component.course = { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_ONLY } as Course;
+        fixture.componentRef.setInput('lecture', { id: 2 } as Lecture);
+        fixture.detectChanges();
         const fetchNextPageSpy = jest.spyOn(component, 'fetchNextPage');
 
         const scrolledUp = new CustomEvent('scrolledUp');
@@ -332,6 +322,7 @@ describe('DiscussionSectionComponent', () => {
     });
 
     it('should change sort direction', () => {
+        fixture.detectChanges();
         component.currentSortDirection = SortDirection.ASCENDING;
         component.onChangeSortDir();
         expect(component.currentSortDirection).toBe(SortDirection.DESCENDING);
@@ -340,6 +331,9 @@ describe('DiscussionSectionComponent', () => {
     });
 
     it('fetches new messages on scroll up if more messages are available', fakeAsync(() => {
+        component.course = { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_ONLY } as Course;
+        fixture.componentRef.setInput('lecture', { id: 2 } as Lecture);
+        fixture.detectChanges();
         component.posts = [];
         const commandMetisToFetchPostsSpy = jest.spyOn(component, 'fetchNextPage');
 
diff --git a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts
index 957b1b6738ce..efb66d508837 100644
--- a/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/exercise-details/course-exercise-details.component.spec.ts
@@ -9,7 +9,7 @@ import { Participation, ParticipationType } from 'app/entities/participation/par
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Result } from 'app/entities/result.model';
 import { TeamAssignmentPayload } from 'app/entities/team.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { ProgrammingSubmissionService } from 'app/exercises/programming/participate/programming-submission.service';
 import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component';
 import { QuizExerciseService } from 'app/exercises/quiz/manage/quiz-exercise.service';
@@ -45,15 +45,15 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { ExtensionPointDirective } from 'app/shared/extension-point/extension-point.directive';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-students/complaints-student-view.component';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { provideHttpClientTesting } from '@angular/common/http/testing';
 import { MockRouterLinkDirective } from '../../../helpers/mocks/directive/mock-router-link.directive';
 import { LtiInitializerComponent } from 'app/overview/exercise-details/lti-initializer.component';
 import { ModelingEditorComponent } from 'app/exercises/modeling/shared/modeling-editor.component';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { MockCourseManagementService } from '../../../helpers/mocks/service/mock-course-management.service';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { DiscussionSectionComponent } from 'app/overview/discussion-section/discussion-section.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SubmissionPolicyService } from 'app/exercises/programming/manage/services/submission-policy.service';
 import { LockRepositoryPolicy } from 'app/entities/submission-policy.model';
 import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service';
@@ -71,6 +71,8 @@ import { MockScienceService } from '../../../helpers/mocks/service/mock-science-
 import { ScienceEventType } from 'app/shared/science/science.model';
 import { PROFILE_IRIS } from 'app/app.constants';
 import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
+import { CourseInformationSharingConfiguration } from 'app/entities/course.model';
+import { provideHttpClient } from '@angular/common/http';
 
 describe('CourseExerciseDetailsComponent', () => {
     let comp: CourseExerciseDetailsComponent;
@@ -92,7 +94,15 @@ describe('CourseExerciseDetailsComponent', () => {
     let scienceService: ScienceService;
     let logEventStub: jest.SpyInstance;
 
-    const exercise = { id: 42, type: ExerciseType.TEXT, studentParticipations: [], course: {} } as unknown as Exercise;
+    const exercise = {
+        id: 42,
+        type: ExerciseType.TEXT,
+        studentParticipations: [],
+        course: {
+            id: 1,
+            courseInformationSharingConfiguration: CourseInformationSharingConfiguration.COMMUNICATION_AND_MESSAGING,
+        },
+    } as unknown as Exercise;
 
     const textExercise = {
         id: 24,
@@ -119,11 +129,15 @@ describe('CourseExerciseDetailsComponent', () => {
 
     const parentParams = { courseId: 1 };
     const parentRoute = { parent: { parent: { params: of(parentParams) } } } as any as ActivatedRoute;
-    const route = { params: of({ exerciseId: exercise.id }), parent: parentRoute, queryParams: of({ welcome: '' }) } as any as ActivatedRoute;
+    const route = {
+        params: of({ exerciseId: exercise.id }),
+        parent: parentRoute,
+        queryParams: of({ welcome: '' }),
+    } as any as ActivatedRoute;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [HttpClientTestingModule],
+            imports: [MockComponent(DiscussionSectionComponent)],
             declarations: [
                 CourseExerciseDetailsComponent,
                 MockPipe(ArtemisTranslatePipe),
@@ -152,6 +166,8 @@ describe('CourseExerciseDetailsComponent', () => {
                 MockComponent(ExerciseInfoComponent),
             ],
             providers: [
+                provideHttpClient(),
+                provideHttpClientTesting(),
                 { provide: ActivatedRoute, useValue: route },
                 { provide: Router, useClass: MockRouter },
                 { provide: ProfileService, useClass: MockProfileService },
@@ -195,7 +211,11 @@ describe('CourseExerciseDetailsComponent', () => {
 
                 // mock teamService, needed for team assignment
                 teamService = fixture.debugElement.injector.get(TeamService);
-                const teamAssignmentPayload = { exerciseId: 2, teamId: 2, studentParticipations: [] } as TeamAssignmentPayload;
+                const teamAssignmentPayload = {
+                    exerciseId: 2,
+                    teamId: 2,
+                    studentParticipations: [],
+                } as TeamAssignmentPayload;
                 jest.spyOn(teamService, 'teamAssignmentUpdates', 'get').mockReturnValue(Promise.resolve(of(teamAssignmentPayload)));
 
                 // mock participationService, needed for team assignment
@@ -313,14 +333,6 @@ describe('CourseExerciseDetailsComponent', () => {
         expect(comp.exampleSolutionCollapsed).toBeFalse();
     });
 
-    it('should store a reference to child component', () => {
-        comp.exercise = exercise;
-
-        const childComponent = {} as DiscussionSectionComponent;
-        comp.onChildActivate(childComponent);
-        expect(childComponent.exercise).toEqual(exercise);
-    });
-
     it('should activate hint', () => {
         comp.availableExerciseHints = [{ id: 1 }, { id: 2 }];
         comp.activatedExerciseHints = [];
@@ -331,10 +343,47 @@ describe('CourseExerciseDetailsComponent', () => {
         expect(comp.activatedExerciseHints).toContain(activatedHint);
     });
 
-    it('should handle new programming exercise', () => {
-        const childComponent = {} as DiscussionSectionComponent;
-        comp.onChildActivate(childComponent);
+    it('should sort results by completion date in ascending order', () => {
+        const result1 = { completionDate: dayjs().subtract(2, 'days') } as Result;
+        const result2 = { completionDate: dayjs().subtract(1, 'day') } as Result;
+        const result3 = { completionDate: dayjs() } as Result;
+
+        const results = [result3, result1, result2];
+        results.sort((a, b) => comp['resultSortFunction'](a, b));
+
+        expect(results).toEqual([result1, result2, result3]);
+    });
+
+    it('should handle results with undefined completion dates', () => {
+        const result1 = { completionDate: dayjs().subtract(2, 'days') } as Result;
+        const result2 = { completionDate: undefined } as Result;
+        const result3 = { completionDate: dayjs() } as Result;
+
+        const results = [result3, result1, result2];
+        results.sort((a, b) => comp['resultSortFunction'](a, b));
+
+        expect(results).toEqual([result1, result3, result2]);
+    });
+
+    it('should handle empty results array', () => {
+        const results: Result[] = [];
+        results.sort((a, b) => comp['resultSortFunction'](a, b));
+
+        expect(results).toEqual([]);
+    });
+
+    it('should handle results with same completion dates', () => {
+        const date = dayjs();
+        const result1 = { completionDate: date } as Result;
+        const result2 = { completionDate: date } as Result;
+
+        const results = [result2, result1];
+        results.sort((a, b) => comp['resultSortFunction'](a, b));
+
+        expect(results).toEqual([result2, result1]);
+    });
 
+    it('should handle new programming exercise', () => {
         const courseId = programmingExercise.course!.id!;
 
         comp.courseId = courseId;
@@ -343,7 +392,6 @@ describe('CourseExerciseDetailsComponent', () => {
         expect(comp.baseResource).toBe(`/course-management/${courseId}/${programmingExercise.type}-exercises/${programmingExercise.id}/`);
         expect(comp.allowComplaintsForAutomaticAssessments).toBeTrue();
         expect(comp.submissionPolicy).toEqual(submissionPolicy);
-        expect(childComponent.exercise).toEqual(programmingExercise);
     });
 
     it('should handle error when getting latest rated result', fakeAsync(() => {
@@ -432,4 +480,25 @@ describe('CourseExerciseDetailsComponent', () => {
         fixture.detectChanges();
         expect(logEventStub).toHaveBeenCalledExactlyOnceWith(ScienceEventType.EXERCISE__OPEN, exercise.id);
     });
+
+    it('should not show discussion section when communication is disabled', fakeAsync(() => {
+        const newExercise = {
+            ...exercise,
+            course: { id: 1, courseInformationSharingConfiguration: CourseInformationSharingConfiguration.DISABLED },
+        };
+        getExerciseDetailsMock.mockReturnValue(of({ body: newExercise }));
+
+        comp.handleNewExercise({ exercise });
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeFalsy();
+    }));
+
+    it('should show discussion section when communication is enabled', fakeAsync(() => {
+        fixture.detectChanges();
+        tick(500);
+
+        const discussionSection = fixture.nativeElement.querySelector('jhi-discussion-section');
+        expect(discussionSection).toBeTruthy();
+    }));
 });
diff --git a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
index 9a0a2327c015..99068b63a154 100644
--- a/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
+++ b/src/test/javascript/spec/component/overview/exercise-details/exercise-details-student-actions.component.spec.ts
@@ -9,10 +9,10 @@ import { Exercise, ExerciseMode, ExerciseType } from 'app/entities/exercise.mode
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizBatch, QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { Team } from 'app/entities/team.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { CourseExerciseService } from 'app/exercises/shared/course-exercises/course-exercise.service';
 import { ExerciseDetailsStudentActionsComponent } from 'app/overview/exercise-details/exercise-details-student-actions.component';
 import { CodeButtonComponent } from 'app/shared/components/code-button/code-button.component';
@@ -55,6 +55,7 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
         secondCorrectionEnabled: false,
         studentAssignedTeamIdComputed: false,
     };
+
     const teamExerciseWithoutTeamAssigned: Exercise = {
         ...exercise,
         mode: ExerciseMode.TEAM,
@@ -607,18 +608,58 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
 
     it.each([
         [
-            'start theia button should be visible when profile is active and url is set',
+            'start theia button should be visible when profile is active and theia is configured',
             {
                 activeProfiles: [PROFILE_THEIA],
                 theiaPortalURL: 'https://theia.test',
             },
+            {
+                allowOnlineIde: true,
+            },
+            {
+                theiaImage: 'this-is-a-theia-image',
+            },
             true,
         ],
+        [
+            'start theia button should not be visible when profile is active but theia is ill-configured',
+            {
+                activeProfiles: [PROFILE_THEIA],
+                theiaPortalURL: 'https://theia.test',
+            },
+            {
+                allowOnlineIde: true,
+            },
+            {
+                theiaImage: undefined,
+            },
+            false,
+        ],
+        [
+            'start theia button should not be visible when profile is active but onlineIde is not activated',
+            {
+                activeProfiles: [PROFILE_THEIA],
+                theiaPortalURL: 'https://theia.test',
+            },
+            {
+                allowOnlineIde: false,
+            },
+            {
+                theiaImage: 'this-is-an-old-image',
+            },
+            false,
+        ],
         [
             'start theia button should not be visible when profile is active but url is not set',
             {
                 activeProfiles: [PROFILE_THEIA],
             },
+            {
+                allowOnlineIde: true,
+            },
+            {
+                theiaImage: 'this-is-a-theia-image',
+            },
             false,
         ],
         [
@@ -626,12 +667,20 @@ describe('ExerciseDetailsStudentActionsComponent', () => {
             {
                 theiaPortalURL: 'https://theia.test',
             },
+            {
+                allowOnlineIde: true,
+            },
+            {
+                theiaImage: 'this-is-a-theia-image',
+            },
             false,
         ],
-    ])('%s', (description, profileInfo, expectedVisibility) => {
+    ])('%s', (description, profileInfo, programmingExercise, buildConfig, expectedVisibility) => {
         getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
         getProfileInfoSub.mockReturnValue(of(profileInfo as ProfileInfo));
-        comp.exercise = exercise;
+
+        // Expand the programmingExercise by given properties
+        comp.exercise = { ...exercise, ...programmingExercise, buildConfig: buildConfig } as ProgrammingExercise;
 
         fixture.detectChanges();
 
diff --git a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts
index 3e18c92b27c0..43b16fc6e6d0 100644
--- a/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts
+++ b/src/test/javascript/spec/component/participation-submission/participation-submission.component.spec.ts
@@ -20,15 +20,15 @@ import { ComplaintsForTutorComponent } from 'app/complaints/complaints-for-tutor
 import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component';
 import { Submission, SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
diff --git a/src/test/javascript/spec/component/participation/participation.component.spec.ts b/src/test/javascript/spec/component/participation/participation.component.spec.ts
index 569fc6ab73bb..7c96169e95ff 100644
--- a/src/test/javascript/spec/component/participation/participation.component.spec.ts
+++ b/src/test/javascript/spec/component/participation/participation.component.spec.ts
@@ -7,7 +7,7 @@ import { ParticipationService } from 'app/exercises/shared/participation/partici
 import { ParticipationComponent } from 'app/exercises/shared/participation/participation.component';
 import { Course } from 'app/entities/course.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { of, throwError } from 'rxjs';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import dayjs from 'dayjs/esm';
@@ -31,7 +31,7 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { ArtemisTestModule } from '../../test.module';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { FormDateTimePickerComponent } from 'app/shared/date-time-picker/date-time-picker.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { GradeStepsDTO } from 'app/entities/grade-step.model';
 import { AlertService } from 'app/core/util/alert.service';
diff --git a/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts b/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts
index feeb959ee591..9b85c7b332f4 100644
--- a/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/exercise-update-plagiarism.component.spec.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_PLAGIARISM_DETECTION_CONFIG, Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Subject } from 'rxjs';
 
 describe('Exercise Update Plagiarism Component', () => {
diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts
index fa2105078290..c66f5a72b3c1 100644
--- a/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/plagiarism-case-instructor-detail-view.component.spec.ts
@@ -8,7 +8,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase';
 import { HttpResponse } from '@angular/common/http';
 import { Observable, ReplaySubject, of } from 'rxjs';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict';
 import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-storage.service';
 import { MetisService } from 'app/shared/metis/metis.service';
diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts
index 29248886bc42..5b4ecff30533 100644
--- a/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/plagiarism-case-student-detail-view.component.spec.ts
@@ -12,7 +12,7 @@ import { MockLocalStorageService } from '../../helpers/mocks/service/mock-local-
 import { MetisService } from 'app/shared/metis/metis.service';
 import { TranslateService } from '@ngx-translate/core';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict';
 import dayjs from 'dayjs/esm';
 import { NotificationService } from 'app/shared/notification/notification.service';
diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts
index 6d04c479847c..4a6bda12288c 100644
--- a/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/plagiarism-cases-instructor-view.component.spec.ts
@@ -8,7 +8,7 @@ import { Observable, of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase';
 import { TranslateService } from '@ngx-translate/core';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { PlagiarismVerdict } from 'app/exercises/shared/plagiarism/types/PlagiarismVerdict';
 import * as DownloadUtil from 'app/shared/util/download.util';
 import dayjs from 'dayjs/esm';
diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts
index ebb90a9f69a2..55b1e0eb0ea4 100644
--- a/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/plagiarism-inspector.component.spec.ts
@@ -11,8 +11,8 @@ import { ModelingPlagiarismResult } from 'app/exercises/shared/plagiarism/types/
 import { PlagiarismStatus } from 'app/exercises/shared/plagiarism/types/PlagiarismStatus';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { TextPlagiarismResult } from 'app/exercises/shared/plagiarism/types/text/TextPlagiarismResult';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
diff --git a/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts b/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts
index 7c95bd6dacb2..4b06a312d72c 100644
--- a/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/plagiarism-split-view.component.spec.ts
@@ -7,7 +7,7 @@ import { PlagiarismComparison } from 'app/exercises/shared/plagiarism/types/Plag
 import { PlagiarismSplitViewComponent } from 'app/exercises/shared/plagiarism/plagiarism-split-view/plagiarism-split-view.component';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission';
 import { FromToElement, TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement';
 import { PlagiarismMatch, SimpleMatch } from 'app/exercises/shared/plagiarism/types/PlagiarismMatch';
diff --git a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts
index 225fc1227220..2118d941e1df 100644
--- a/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts
+++ b/src/test/javascript/spec/component/plagiarism/text-submission-viewer.component.spec.ts
@@ -7,9 +7,9 @@ import { TextSubmissionViewerComponent } from 'app/exercises/shared/plagiarism/p
 import { CodeEditorRepositoryFileService } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { DomainChange, DomainType, FileType } from 'app/exercises/programming/shared/code-editor/model/code-editor.model';
 import { PlagiarismSubmission } from 'app/exercises/shared/plagiarism/types/PlagiarismSubmission';
 import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement';
diff --git a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts
index 417004d212de..92350e8377d9 100644
--- a/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-assessment/code-editor-tutor-assessment-container.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { DebugElement } from '@angular/core';
@@ -15,10 +14,10 @@ import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { RepositoryFileService } from 'app/exercises/shared/result/repository.service';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ProgrammingAssessmentRepoExportButtonComponent } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export-button.component';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { ProgrammingAssessmentManualResultService } from 'app/exercises/programming/assess/manual-result/programming-assessment-manual-result.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Complaint } from 'app/entities/complaint.model';
 import { ComplaintService } from 'app/complaints/complaint.service';
 import { MockRepositoryFileService } from '../../helpers/mocks/service/mock-repository-file.service';
@@ -86,8 +85,6 @@ function addFeedbackAndValidateScore(comp: CodeEditorTutorAssessmentContainerCom
 }
 
 describe('CodeEditorTutorAssessmentContainerComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
     let comp: CodeEditorTutorAssessmentContainerComponent;
     let fixture: ComponentFixture<CodeEditorTutorAssessmentContainerComponent>;
     let debugElement: DebugElement;
@@ -267,7 +264,7 @@ describe('CodeEditorTutorAssessmentContainerComponent', () => {
         // Stub
         const getFilesWithContentStub = jest.spyOn(repositoryFileService, 'getFilesWithContent');
         getFilesWithContentStub.mockReturnValue(of(templateFileSessionReturn));
-        // Stub for ace editor
+        // Stub for code editor
         const getFileStub = jest.spyOn(repositoryFileService, 'getFile');
         const fileSubject = new BehaviorSubject({ fileContent: 'new file text' });
         getFileStub.mockReturnValue(fileSubject);
diff --git a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts
index 28d7a4ff4867..5766fd56beda 100644
--- a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-button.component.spec.ts
@@ -1,7 +1,7 @@
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockTranslateValuesDirective } from '../../helpers/mocks/directive/mock-translate-values.directive';
diff --git a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts
index c137b2e2db37..7f9e8d1d6ed4 100644
--- a/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-assessment/programming-assessment-repo-export-dialog.component.spec.ts
@@ -6,7 +6,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingAssessmentRepoExportDialogComponent } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export-dialog.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { ProgrammingAssessmentRepoExportService } from 'app/exercises/programming/assess/repo-export/programming-assessment-repo-export.service';
diff --git a/src/test/javascript/spec/component/programming-diff-report-detail.component.spec.ts b/src/test/javascript/spec/component/programming-diff-report-detail.component.spec.ts
new file mode 100644
index 000000000000..9f1940740640
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-diff-report-detail.component.spec.ts
@@ -0,0 +1,45 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { MockNgbModalService } from '../helpers/mocks/service/mock-ngb-modal.service';
+import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
+import { ProgrammingDiffReportDetailComponent } from 'app/detail-overview-list/components/programming-diff-report-detail/programming-diff-report-detail.component';
+import { TranslateService } from '@ngx-translate/core';
+import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
+import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
+import { MockProgrammingExerciseService } from '../helpers/mocks/service/mock-programming-exercise.service';
+import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
+import { MockProgrammingExerciseParticipationService } from '../helpers/mocks/service/mock-programming-exercise-participation.service';
+
+describe('ProgrammingDiffReportDetailComponent', () => {
+    let component: ProgrammingDiffReportDetailComponent;
+    let fixture: ComponentFixture<ProgrammingDiffReportDetailComponent>;
+    let modalService: NgbModal;
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [ProgrammingDiffReportDetailComponent],
+            providers: [
+                { provide: NgbModal, useClass: MockNgbModalService },
+                { provide: TranslateService, useClass: MockTranslateService },
+                { provide: ProgrammingExerciseService, useClass: MockProgrammingExerciseService },
+                { provide: ProgrammingExerciseParticipationService, useClass: MockProgrammingExerciseParticipationService },
+            ],
+        }).compileComponents();
+        fixture = TestBed.createComponent(ProgrammingDiffReportDetailComponent);
+
+        modalService = fixture.debugElement.injector.get(NgbModal);
+        component = fixture.componentInstance;
+    });
+
+    it('should open git diff modal', () => {
+        const modalSpy = jest.spyOn(modalService, 'open');
+        component.showGitDiff({} as unknown as ProgrammingExerciseGitDiffReport);
+        expect(modalSpy).toHaveBeenCalledOnce();
+    });
+
+    it('should not open git diff modal', () => {
+        const modalSpy = jest.spyOn(modalService, 'open');
+        component.showGitDiff(undefined);
+        expect(modalSpy).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts
index a62e6c9be607..b629be2732b0 100644
--- a/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/build-plan-editor.component.spec.ts
@@ -6,7 +6,7 @@ import { ProgrammingExerciseService } from 'app/exercises/programming/manage/ser
 import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service';
 import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route';
 import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { BuildPlan } from 'app/entities/build-plan.model';
+import { BuildPlan } from 'app/entities/programming/build-plan.model';
 import { of, throwError } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { MockBuildPlanService } from '../../helpers/mocks/service/mock-build-plan.service';
@@ -15,7 +15,7 @@ import { MockComponent } from 'ng-mocks';
 import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component';
 import { NgbTooltipMocksModule } from '../../helpers/mocks/directive/ngbTooltipMocks.module';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AlertService } from 'app/core/util/alert.service';
 import { MockAlertService } from '../../helpers/mocks/service/mock-alert.service';
 import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts
index 3a8cce90d652..17fee925d299 100644
--- a/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/category-issues-chart.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { CategoryIssuesChartComponent } from 'app/exercises/programming/manage/grading/charts/category-issues-chart.component';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
 
 describe('CategoryIssuesChartComponent', () => {
     let fixture: ComponentFixture<CategoryIssuesChartComponent>;
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts
new file mode 100644
index 000000000000..0e9387b93e5b
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.component.spec.ts
@@ -0,0 +1,65 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
+import { ArtemisTestModule } from '../../../test.module';
+import { FeedbackAnalysisComponent } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.component';
+import { FeedbackAnalysisService } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+import { FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+
+describe('FeedbackAnalysisComponent', () => {
+    let fixture: ComponentFixture<FeedbackAnalysisComponent>;
+    let component: FeedbackAnalysisComponent;
+    let feedbackAnalysisService: FeedbackAnalysisService;
+    let getFeedbackDetailsSpy: jest.SpyInstance;
+
+    const feedbackMock: FeedbackDetail[] = [
+        { detailText: 'Test feedback 1 detail', testCaseName: 'test1', count: 10, relativeCount: 50, taskNumber: 1 },
+        { detailText: 'Test feedback 2 detail', testCaseName: 'test2', count: 5, relativeCount: 25, taskNumber: 2 },
+    ];
+
+    beforeEach(async () => {
+        await TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, TranslateModule.forRoot(), FeedbackAnalysisComponent],
+            declarations: [],
+            providers: [
+                {
+                    provide: TranslateService,
+                    useClass: MockTranslateService,
+                },
+                FeedbackAnalysisService,
+            ],
+        }).compileComponents();
+        fixture = TestBed.createComponent(FeedbackAnalysisComponent);
+        component = fixture.componentInstance;
+        component.exerciseId = 1;
+        feedbackAnalysisService = fixture.debugElement.injector.get(FeedbackAnalysisService);
+        getFeedbackDetailsSpy = jest.spyOn(feedbackAnalysisService, 'getFeedbackDetailsForExercise').mockResolvedValue(feedbackMock);
+    });
+
+    describe('ngOnInit', () => {
+        it('should call loadFeedbackDetails when exerciseId is provided', async () => {
+            component.ngOnInit();
+            await fixture.whenStable();
+
+            expect(getFeedbackDetailsSpy).toHaveBeenCalledWith(1);
+            expect(component.feedbackDetails).toEqual(feedbackMock);
+        });
+    });
+
+    describe('loadFeedbackDetails', () => {
+        it('should load feedback details and update the component state', async () => {
+            await component.loadFeedbackDetails(1);
+            expect(component.feedbackDetails).toEqual(feedbackMock);
+        });
+
+        it('should handle error while loading feedback details', async () => {
+            getFeedbackDetailsSpy.mockRejectedValue(new Error('Error loading feedback details'));
+
+            try {
+                await component.loadFeedbackDetails(1);
+            } catch {
+                expect(component.feedbackDetails).toEqual([]);
+            }
+        });
+    });
+});
diff --git a/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts
new file mode 100644
index 000000000000..a4f9a2a3ee42
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/feedback-analysis/feedback-analysis.service.spec.ts
@@ -0,0 +1,50 @@
+import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { FeedbackAnalysisService, FeedbackDetail } from 'app/exercises/programming/manage/grading/feedback-analysis/feedback-analysis.service';
+
+describe('FeedbackAnalysisService', () => {
+    let service: FeedbackAnalysisService;
+    let httpMock: HttpTestingController;
+
+    const feedbackDetailsMock: FeedbackDetail[] = [
+        { detailText: 'Feedback 1', testCaseName: 'test1', count: 5, relativeCount: 25.0, taskNumber: 1 },
+        { detailText: 'Feedback 2', testCaseName: 'test2', count: 3, relativeCount: 15.0, taskNumber: 2 },
+    ];
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [HttpClientTestingModule],
+            providers: [FeedbackAnalysisService],
+        });
+
+        service = TestBed.inject(FeedbackAnalysisService);
+        httpMock = TestBed.inject(HttpTestingController);
+    });
+
+    afterEach(() => {
+        httpMock.verify();
+    });
+
+    describe('getFeedbackDetailsForExercise', () => {
+        it('should retrieve feedback details for a given exercise', async () => {
+            const responsePromise = service.getFeedbackDetailsForExercise(1);
+
+            const req = httpMock.expectOne('api/exercises/1/feedback-details');
+            expect(req.request.method).toBe('GET');
+            req.flush(feedbackDetailsMock);
+
+            const result = await responsePromise;
+            expect(result).toEqual(feedbackDetailsMock);
+        });
+
+        it('should handle errors while retrieving feedback details', async () => {
+            const responsePromise = service.getFeedbackDetailsForExercise(1);
+
+            const req = httpMock.expectOne('api/exercises/1/feedback-details');
+            expect(req.request.method).toBe('GET');
+            req.flush('Something went wrong', { status: 500, statusText: 'Server Error' });
+
+            await expect(responsePromise).rejects.toThrow('Internal server error');
+        });
+    });
+});
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts
index 603c70222109..714f39e19564 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-configure-grading.component.spec.ts
@@ -7,10 +7,10 @@ import { NgxDatatableModule } from '@flaviosantoro92/ngx-datatable';
 import { NgbModal, NgbModalRef, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { AlertService } from 'app/core/util/alert.service';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
+import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
 import { CategoryIssuesChartComponent } from 'app/exercises/programming/manage/grading/charts/category-issues-chart.component';
 import { ScaCategoryDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/sca-category-distribution-chart.component';
 import { TestCaseDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts
index 17f226cd84d6..630029986a67 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-create-buttons.component.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseComponent } from 'app/exercises/programming/manage/programming-exercise.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts
index 93e57264bd42..8b59cc5e8c6b 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-aeolus-build-plan.component.spec.ts
@@ -1,16 +1,10 @@
 import { TestBed } from '@angular/core/testing';
+import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action';
+import { DockerConfiguration } from 'app/entities/programming/docker.configuration';
+import { WindFile } from 'app/entities/programming/wind.file';
+import { WindMetadata } from 'app/entities/programming/wind.metadata';
 import { ArtemisTestModule } from '../../test.module';
-import {
-    BuildAction,
-    DockerConfiguration,
-    PlatformAction,
-    ProgrammingExercise,
-    ProgrammingLanguage,
-    ProjectType,
-    ScriptAction,
-    WindFile,
-    WindMetadata,
-} from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { ProgrammingExerciseCustomAeolusBuildPlanComponent } from 'app/exercises/programming/manage/update/update-components/custom-build-plans/programming-exercise-custom-aeolus-build-plan.component';
@@ -33,7 +27,7 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
 
     const route = { snapshot: { paramMap: convertToParamMap({ courseId: course.id }) } } as any as ActivatedRoute;
     let programmingExercise = new ProgrammingExercise(course, undefined);
-    let windFile: WindFile = new WindFile();
+    let windfile: WindFile = new WindFile();
     let actions: BuildAction[] = [];
     let gradleBuildAction: ScriptAction = new ScriptAction();
     let cleanBuildAction: ScriptAction = new ScriptAction();
@@ -45,11 +39,11 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
     beforeEach(() => {
         programmingExercise = new ProgrammingExercise(course, undefined);
         programmingExercise.customizeBuildPlanWithAeolus = true;
-        windFile = new WindFile();
+        windfile = new WindFile();
         const metadata = new WindMetadata();
         metadata.docker = new DockerConfiguration();
         metadata.docker.image = 'testImage';
-        windFile.metadata = metadata;
+        windfile.metadata = metadata;
         actions = [];
         gradleBuildAction = new ScriptAction();
         gradleBuildAction.name = 'gradle';
@@ -65,8 +59,8 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
         actions.push(gradleBuildAction);
         actions.push(cleanBuildAction);
         actions.push(platformAction);
-        windFile.actions = actions;
-        programmingExercise.buildConfig!.windFile = windFile;
+        windfile.actions = actions;
+        programmingExercise.buildConfig!.windfile = windfile;
 
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule],
@@ -114,19 +108,19 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
 
     it('should delete action', () => {
         comp.deleteAction('gradle');
-        const size = programmingExercise.buildConfig?.windFile?.actions.length;
+        const size = programmingExercise.buildConfig?.windfile?.actions.length;
         expect(size).toBeDefined();
         const realSize = size!;
-        expect(programmingExercise.buildConfig?.windFile?.actions.length).toBe(realSize);
+        expect(programmingExercise.buildConfig?.windfile?.actions.length).toBe(realSize);
         comp.deleteAction('clean');
-        expect(programmingExercise.buildConfig?.windFile?.actions.length).toBe(realSize - 1);
+        expect(programmingExercise.buildConfig?.windfile?.actions.length).toBe(realSize - 1);
     });
 
     it('should add action', () => {
-        const size = programmingExercise.buildConfig?.windFile?.actions.length;
+        const size = programmingExercise.buildConfig?.windfile?.actions.length;
         expect(size).toBeDefined();
         comp.addAction('gradle clean');
-        expect(programmingExercise.buildConfig?.windFile?.actions.length).toBe(size! + 1);
+        expect(programmingExercise.buildConfig?.windfile?.actions.length).toBe(size! + 1);
     });
 
     it('should accept editor', () => {
@@ -152,7 +146,7 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
     });
 
     it('should do nothing without a Windfile', () => {
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         comp.code = 'this should not change';
         comp.changeActiveAction('');
         expect(comp.code).toBe('this should not change');
@@ -206,12 +200,12 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
     });
 
     it('should reset buildplan', () => {
-        programmingExercise.buildConfig!.windFile = windFile;
+        programmingExercise.buildConfig!.windfile = windfile;
         programmingExercise.buildConfig!.buildPlanConfiguration = 'some build plan';
-        expect(programmingExercise.buildConfig?.windFile).toBeDefined();
+        expect(programmingExercise.buildConfig?.windfile).toBeDefined();
         expect(programmingExercise.buildConfig?.buildPlanConfiguration).toBeDefined();
         comp.resetCustomBuildPlan();
-        expect(programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(programmingExercise.buildConfig?.windfile).toBeUndefined();
         expect(programmingExercise.buildConfig?.buildPlanConfiguration).toBeUndefined();
     });
 
@@ -264,28 +258,28 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
     });
 
     it('should update windfile', () => {
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         programmingExerciseCreationConfigMock.customBuildPlansSupported = PROFILE_AEOLUS;
         comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
-        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windFile))));
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windfile))));
         comp.loadAeolusTemplate();
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeDefined();
-        expect(comp.programmingExercise.buildConfig?.windFile).toEqual(windFile);
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeDefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toEqual(windfile);
     });
 
     it('should call this.resetCustomBuildPlan', () => {
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         programmingExerciseCreationConfigMock.customBuildPlansSupported = PROFILE_AEOLUS;
         comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
         const resetSpy = jest.spyOn(comp, 'resetCustomBuildPlan');
         jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.error('error')));
         comp.loadAeolusTemplate();
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeUndefined();
         expect(resetSpy).toHaveBeenCalled();
     });
 
     it('should parse windfile correctly', () => {
-        const parsedWindFile = mockAeolusService.parseWindFile(mockAeolusService.serializeWindFile(windFile));
+        const parsedWindFile = mockAeolusService.parseWindFile(mockAeolusService.serializeWindFile(windfile));
         expect(parsedWindFile).toBeDefined();
         expect(parsedWindFile?.actions.length).toBe(3);
         expect(parsedWindFile?.actions[0]).toBeInstanceOf(ScriptAction);
@@ -341,12 +335,41 @@ describe('ProgrammingExercise Aeolus Custom Build Plan', () => {
     });
 
     it('should set docker image correctly', () => {
-        comp.programmingExercise.buildConfig!.windFile = windFile;
-        comp.programmingExercise.buildConfig!.windFile.metadata.docker.image = 'old';
+        comp.programmingExercise.buildConfig!.windfile = windfile;
+        comp.programmingExercise.buildConfig!.windfile.metadata.docker.image = 'old';
         comp.setDockerImage('testImage');
-        expect(comp.programmingExercise.buildConfig?.windFile?.metadata.docker.image).toBe('testImage');
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        expect(comp.programmingExercise.buildConfig?.windfile?.metadata.docker.image).toBe('testImage');
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         comp.setDockerImage('testImage');
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeUndefined();
+    });
+
+    it('should not call getAeolusTemplateScript when import from file if script present', () => {
+        comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
+        comp.programmingExerciseCreationConfig.isImportFromFile = true;
+        programmingExercise.buildConfig!.buildScript = 'echo "test"';
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateScript').mockReturnValue(new Observable((subscriber) => subscriber.error('error')));
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windfile))));
+        comp.ngOnChanges({
+            programmingExercise: {
+                currentValue: programmingExercise,
+                previousValue: undefined,
+                firstChange: false,
+                isFirstChange: function (): boolean {
+                    throw new Error('Function not implemented.');
+                },
+            },
+            programmingExerciseCreationConfig: {
+                currentValue: JSON.parse(JSON.stringify(comp.programmingExerciseCreationConfig)),
+                previousValue: undefined,
+                firstChange: false,
+                isFirstChange: function (): boolean {
+                    throw new Error('Function not implemented.');
+                },
+            },
+        });
+        expect(mockAeolusService.getAeolusTemplateScript).not.toHaveBeenCalled();
+        expect(mockAeolusService.getAeolusTemplateFile).not.toHaveBeenCalled();
+        expect(comp.programmingExercise.buildConfig?.buildScript).toBe('echo "test"');
     });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts
index 8ce4d5ab6f3c..b2ec21d46f82 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-custom-build-plan.component.spec.ts
@@ -1,16 +1,10 @@
 import { TestBed } from '@angular/core/testing';
+import { BuildAction, PlatformAction, ScriptAction } from 'app/entities/programming/build.action';
+import { DockerConfiguration } from 'app/entities/programming/docker.configuration';
+import { WindFile } from 'app/entities/programming/wind.file';
+import { WindMetadata } from 'app/entities/programming/wind.metadata';
 import { ArtemisTestModule } from '../../test.module';
-import {
-    BuildAction,
-    DockerConfiguration,
-    PlatformAction,
-    ProgrammingExercise,
-    ProgrammingLanguage,
-    ProjectType,
-    ScriptAction,
-    WindFile,
-    WindMetadata,
-} from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
 import { Course } from 'app/entities/course.model';
 import { ElementRef, Renderer2 } from '@angular/core';
@@ -33,7 +27,7 @@ describe('ProgrammingExercise Custom Build Plan', () => {
 
     const route = { snapshot: { paramMap: convertToParamMap({ courseId: course.id }) } } as any as ActivatedRoute;
     let programmingExercise = new ProgrammingExercise(course, undefined);
-    let windFile: WindFile = new WindFile();
+    let windfile: WindFile = new WindFile();
     let actions: BuildAction[] = [];
     let gradleBuildAction: ScriptAction = new ScriptAction();
     let cleanBuildAction: ScriptAction = new ScriptAction();
@@ -45,11 +39,11 @@ describe('ProgrammingExercise Custom Build Plan', () => {
     beforeEach(() => {
         programmingExercise = new ProgrammingExercise(course, undefined);
         programmingExercise.customizeBuildPlanWithAeolus = true;
-        windFile = new WindFile();
+        windfile = new WindFile();
         const metadata = new WindMetadata();
         metadata.docker = new DockerConfiguration();
         metadata.docker.image = 'testImage';
-        windFile.metadata = metadata;
+        windfile.metadata = metadata;
         actions = [];
         gradleBuildAction = new ScriptAction();
         gradleBuildAction.name = 'gradle';
@@ -63,8 +57,8 @@ describe('ProgrammingExercise Custom Build Plan', () => {
         actions.push(gradleBuildAction);
         actions.push(cleanBuildAction);
         actions.push(platformAction);
-        windFile.actions = actions;
-        programmingExercise.buildConfig!.windFile = windFile;
+        windfile.actions = actions;
+        programmingExercise.buildConfig!.windfile = windfile;
 
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule],
@@ -127,12 +121,12 @@ describe('ProgrammingExercise Custom Build Plan', () => {
     });
 
     it('should reset buildplan', () => {
-        programmingExercise.buildConfig!.windFile = windFile;
+        programmingExercise.buildConfig!.windfile = windfile;
         programmingExercise.buildConfig!.buildPlanConfiguration = 'some build plan';
-        expect(programmingExercise.buildConfig?.windFile).toBeDefined();
+        expect(programmingExercise.buildConfig?.windfile).toBeDefined();
         expect(programmingExercise.buildConfig?.buildPlanConfiguration).toBeDefined();
         comp.resetCustomBuildPlan();
-        expect(programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(programmingExercise.buildConfig?.windfile).toBeUndefined();
         expect(programmingExercise.buildConfig?.buildPlanConfiguration).toBeUndefined();
     });
 
@@ -185,23 +179,23 @@ describe('ProgrammingExercise Custom Build Plan', () => {
     });
 
     it('should update windfile', () => {
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         programmingExerciseCreationConfigMock.customBuildPlansSupported = PROFILE_LOCALCI;
         comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
-        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windFile))));
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windfile))));
         jest.spyOn(mockAeolusService, 'getAeolusTemplateScript').mockReturnValue(new Observable((subscriber) => subscriber.next("echo 'test'")));
         comp.loadAeolusTemplate();
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeDefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeDefined();
     });
 
     it('should call this.resetCustomBuildPlan', () => {
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         programmingExerciseCreationConfigMock.customBuildPlansSupported = PROFILE_LOCALCI;
         comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
         const resetSpy = jest.spyOn(comp, 'resetCustomBuildPlan');
         jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.error('error')));
         comp.loadAeolusTemplate();
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeUndefined();
         expect(resetSpy).toHaveBeenCalled();
     });
 
@@ -211,7 +205,7 @@ describe('ProgrammingExercise Custom Build Plan', () => {
         comp.programmingExercise.id = 1;
         jest.spyOn(comp, 'resetCustomBuildPlan');
         jest.spyOn(mockAeolusService, 'getAeolusTemplateScript').mockReturnValue(new Observable((subscriber) => subscriber.next("echo 'test'")));
-        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windFile))));
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windfile))));
         comp.loadAeolusTemplate();
         expect(comp.resetCustomBuildPlan).not.toHaveBeenCalled();
         expect(comp.programmingExercise.buildConfig?.buildScript).toBe("echo 'test'");
@@ -243,12 +237,41 @@ describe('ProgrammingExercise Custom Build Plan', () => {
     });
 
     it('should set docker image correctly', () => {
-        comp.programmingExercise.buildConfig!.windFile = windFile;
-        comp.programmingExercise.buildConfig!.windFile.metadata.docker.image = 'old';
+        comp.programmingExercise.buildConfig!.windfile = windfile;
+        comp.programmingExercise.buildConfig!.windfile.metadata.docker.image = 'old';
         comp.setDockerImage('testImage');
-        expect(comp.programmingExercise.buildConfig?.windFile?.metadata.docker.image).toBe('testImage');
-        comp.programmingExercise.buildConfig!.windFile = undefined;
+        expect(comp.programmingExercise.buildConfig?.windfile?.metadata.docker.image).toBe('testImage');
+        comp.programmingExercise.buildConfig!.windfile = undefined;
         comp.setDockerImage('testImage');
-        expect(comp.programmingExercise.buildConfig?.windFile).toBeUndefined();
+        expect(comp.programmingExercise.buildConfig?.windfile).toBeUndefined();
+    });
+
+    it('should not call getAeolusTemplateScript when import from file if script present', () => {
+        comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
+        comp.programmingExerciseCreationConfig.isImportFromFile = true;
+        programmingExercise.buildConfig!.buildScript = 'echo "test"';
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateScript').mockReturnValue(new Observable((subscriber) => subscriber.error('error')));
+        jest.spyOn(mockAeolusService, 'getAeolusTemplateFile').mockReturnValue(new Observable((subscriber) => subscriber.next(mockAeolusService.serializeWindFile(windfile))));
+        comp.ngOnChanges({
+            programmingExercise: {
+                currentValue: programmingExercise,
+                previousValue: undefined,
+                firstChange: false,
+                isFirstChange: function (): boolean {
+                    throw new Error('Function not implemented.');
+                },
+            },
+            programmingExerciseCreationConfig: {
+                currentValue: JSON.parse(JSON.stringify(comp.programmingExerciseCreationConfig)),
+                previousValue: undefined,
+                firstChange: false,
+                isFirstChange: function (): boolean {
+                    throw new Error('Function not implemented.');
+                },
+            },
+        });
+        expect(mockAeolusService.getAeolusTemplateScript).not.toHaveBeenCalled();
+        expect(mockAeolusService.getAeolusTemplateFile).not.toHaveBeenCalled();
+        expect(comp.programmingExercise.buildConfig?.buildScript).toBe('echo "test"');
     });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts
index 47ea2df80cb5..8563723b42b8 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-detail.component.spec.ts
@@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { of, throwError } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseDetailComponent } from 'app/exercises/programming/manage/programming-exercise-detail.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route';
 import { Course } from 'app/entities/course.model';
 import { TranslateModule } from '@ngx-translate/core';
@@ -11,7 +11,7 @@ import { StatisticsService } from 'app/shared/statistics-graph/statistics.servic
 import { ExerciseManagementStatisticsDto } from 'app/exercises/shared/statistics/exercise-management-statistics-dto';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { MockProfileService } from '../../helpers/mocks/service/mock-profile.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { MockProgrammingExerciseService } from '../../helpers/mocks/service/mock-programming-exercise.service';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
@@ -24,7 +24,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockProgrammingExerciseGradingService } from '../../helpers/mocks/service/mock-programming-exercise-grading.service';
 import { ProgrammingExerciseGitDiffReport } from 'app/entities/hestia/programming-exercise-git-diff-report.model';
 import { ProgrammingExerciseSolutionEntry } from 'app/entities/hestia/programming-exercise-solution-entry.model';
-import { BuildLogStatisticsDTO } from 'app/entities/build-log-statistics-dto';
+import { BuildLogStatisticsDTO } from 'app/entities/programming/build-log-statistics-dto';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { HttpResponse } from '@angular/common/http';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts
index 550e8a533d0c..802cb0180956 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-edit-selected.component.spec.ts
@@ -7,7 +7,7 @@ import dayjs from 'dayjs/esm';
 
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts
index 14ced4c71eea..c00bb591678c 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-editable-instruction.component.spec.ts
@@ -17,7 +17,7 @@ import { TemplateProgrammingExerciseParticipation } from 'app/entities/participa
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { IProgrammingExerciseGradingService, ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseInstructionAnalysisComponent } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component';
 import { ProgrammingExerciseEditableInstructionComponent } from 'app/exercises/programming/manage/instructions-editor/programming-exercise-editable-instruction.component';
 import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction-analysis.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction-analysis.component.spec.ts
index f20ccd999489..32b0e6a0922f 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction-analysis.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction-analysis.component.spec.ts
@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { TaskCommand } from 'app/shared/markdown-editor/domainCommands/programming-exercise/task.command';
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { TaskCountWarningComponent } from 'app/exercises/programming/manage/instructions-editor/analysis/task-count-warning/task-count-warning.component';
 import { ProgrammingExerciseInstructionAnalysisComponent } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component';
@@ -11,6 +10,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MockProgrammingExerciseInstructionAnalysisService } from '../../helpers/mocks/service/mock-programming-exericse-instruction-analysis.service';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { MonacoTaskAction } from 'app/shared/monaco-editor/model/actions/monaco-task.action';
 
 describe('ProgrammingExerciseInstructionInstructorAnalysis', () => {
     let comp: ProgrammingExerciseInstructionAnalysisComponent;
@@ -20,8 +20,7 @@ describe('ProgrammingExerciseInstructionInstructorAnalysis', () => {
     const testCaseOkId = 'instruction_analysis_test-case-ok';
     const testCaseIssuesId = 'instruction_analysis_test-case-issues';
 
-    const taskCommand = new TaskCommand();
-    const taskRegex = taskCommand.getTagRegex('g');
+    const taskRegex = MonacoTaskAction.GLOBAL_TASK_REGEX;
     const exerciseTestCases = ['test1', 'test2', 'test6', 'test7'];
     const problemStatement =
         '1. [task][SortStrategy Interface](test1,test2) \n 2. [task][SortStrategy Interface](test3) \n lorem ipsum \n lorem \n  3. [task][SortStrategy Interface](test2,test4)';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts
index b10b7420640a..3cfff55d7749 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instruction.component.spec.ts
@@ -1,16 +1,15 @@
-import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { ComponentFixture, TestBed, fakeAsync, flush, tick } from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { NgbModal, NgbModalRef, NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
-import { DebugElement } from '@angular/core';
+import { DebugElement, VERSION } from '@angular/core';
 import { Theme, ThemeService } from 'app/core/theme/theme.service';
 import dayjs from 'dayjs/esm';
-import { Subject, Subscription, of, throwError } from 'rxjs';
+import { Subscription, of, throwError } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { MockResultService } from '../../helpers/mocks/service/mock-result.service';
-import { MockRepositoryFileService } from '../../helpers/mocks/service/mock-repository-file.service';
 import {
     problemStatementBubbleSortNotExecutedHtml,
     problemStatementEmptySecondTask,
@@ -28,36 +27,31 @@ import { triggerChanges } from '../../helpers/utils/general.utils';
 import { LocalStorageService } from 'ngx-webstorage';
 import { Participation } from 'app/entities/participation/participation.model';
 import { ResultService } from 'app/exercises/shared/result/result.service';
-import { RepositoryFileService } from 'app/exercises/shared/result/repository.service';
 import { ProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { ProgrammingExerciseInstructionTaskStatusComponent } from 'app/exercises/programming/shared/instructions-render/task/programming-exercise-instruction-task-status.component';
 import { Result } from 'app/entities/result.model';
 import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { MockTranslateService, TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
-import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
 import { MockModule } from 'ng-mocks';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { SafeHtmlPipe } from 'app/shared/pipes/safe-html.pipe';
-import { VERSION } from '@angular/core';
 
 describe('ProgrammingExerciseInstructionComponent', () => {
     let comp: ProgrammingExerciseInstructionComponent;
     let fixture: ComponentFixture<ProgrammingExerciseInstructionComponent>;
     let debugElement: DebugElement;
     let participationWebsocketService: ParticipationWebsocketService;
-    let repositoryFileService: RepositoryFileService;
     let programmingExerciseParticipationService: ProgrammingExerciseParticipationService;
     let programmingExerciseGradingService: ProgrammingExerciseGradingService;
     let modalService: NgbModal;
     let themeService: ThemeService;
 
     let subscribeForLatestResultOfParticipationStub: jest.SpyInstance;
-    let getFileStub: jest.SpyInstance;
     let openModalStub: jest.SpyInstance;
     let getLatestResultWithFeedbacks: jest.SpyInstance;
 
@@ -82,7 +76,6 @@ describe('ProgrammingExerciseInstructionComponent', () => {
                 { provide: ResultService, useClass: MockResultService },
                 { provide: ProgrammingExerciseParticipationService, useClass: MockProgrammingExerciseParticipationService },
                 { provide: ParticipationWebsocketService, useClass: MockParticipationWebsocketService },
-                { provide: RepositoryFileService, useClass: MockRepositoryFileService },
                 { provide: NgbModal, useClass: MockNgbModalService },
                 { provide: ProgrammingExerciseGradingService, useValue: { getTestCases: () => of() } },
             ],
@@ -96,13 +89,11 @@ describe('ProgrammingExerciseInstructionComponent', () => {
                 participationWebsocketService = debugElement.injector.get(ParticipationWebsocketService);
                 programmingExerciseParticipationService = debugElement.injector.get(ProgrammingExerciseParticipationService);
                 programmingExerciseGradingService = debugElement.injector.get(ProgrammingExerciseGradingService);
-                repositoryFileService = debugElement.injector.get(RepositoryFileService);
                 modalService = debugElement.injector.get(NgbModal);
                 themeService = debugElement.injector.get(ThemeService);
 
                 subscribeForLatestResultOfParticipationStub = jest.spyOn(participationWebsocketService, 'subscribeForLatestResultOfParticipation');
                 openModalStub = jest.spyOn(modalService, 'open');
-                getFileStub = jest.spyOn(repositoryFileService, 'get');
                 getLatestResultWithFeedbacks = jest.spyOn(programmingExerciseParticipationService, 'getLatestResultWithFeedback');
 
                 comp.personalParticipation = true;
@@ -113,13 +104,14 @@ describe('ProgrammingExerciseInstructionComponent', () => {
         jest.restoreAllMocks();
     });
 
-    it('should on participation change clear old subscription for participation results set up new one', () => {
+    it('should on participation change clear old subscription for participation results set up new one', fakeAsync(() => {
         const exercise: ProgrammingExercise = {
             id: 1,
             numberOfAssessmentsOfCorrectionRounds: [],
             secondCorrectionEnabled: false,
             studentAssignedTeamIdComputed: false,
             isAtLeastTutor: true,
+            problemStatement: 'lorem ipsum dolor sit amet',
         };
         const oldParticipation: Participation = { id: 1 };
         const result: Result = { id: 1 };
@@ -138,84 +130,11 @@ describe('ProgrammingExerciseInstructionComponent', () => {
         expect(subscribeForLatestResultOfParticipationStub).toHaveBeenCalledOnce();
         expect(subscribeForLatestResultOfParticipationStub).toHaveBeenCalledWith(participation.id, true, exercise.id);
         expect(comp.participationSubscription).not.toEqual(oldSubscription);
+        flush();
         expect(comp.isInitial).toBeTrue();
-    });
-
-    it('should try to fetch README.md from assignment repository if no problemStatement was provided', () => {
-        const result: Result = { id: 1, feedbacks: [] };
-        const participation: Participation = { id: 2 };
-        const exercise: ProgrammingExercise = {
-            id: 3,
-            course: { id: 4 },
-            numberOfAssessmentsOfCorrectionRounds: [],
-            secondCorrectionEnabled: false,
-            studentAssignedTeamIdComputed: false,
-        };
-        const getFileSubject = new Subject<{ fileContent: string; fileName: string }>();
-        const loadInitialResultStub = jest.spyOn(comp, 'loadInitialResult').mockReturnValue(of(result));
-        const updateMarkdownStub = jest.spyOn(comp, 'updateMarkdown');
-        getFileStub.mockReturnValue(getFileSubject);
-        comp.participation = participation;
-        comp.exercise = exercise;
-        comp.isInitial = true;
-        comp.isLoading = false;
-
-        fixture.detectChanges();
-        triggerChanges(comp);
-        fixture.detectChanges();
-        expect(comp.isLoading).toBeTrue();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-loading'))).not.toBeNull();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-content'))).toBeNull();
-        expect(getFileStub).toHaveBeenCalledOnce();
-        expect(getFileStub).toHaveBeenCalledWith(participation.id, 'README.md');
-
-        getFileSubject.next({ fileContent: 'lorem ipsum', fileName: 'README.md' });
-        expect(comp.problemStatement).toBe('lorem ipsum');
-        expect(loadInitialResultStub).toHaveBeenCalledOnce();
-        expect(comp.latestResult).toEqual(result);
-        expect(updateMarkdownStub).toHaveBeenCalledOnce();
-        expect(comp.isInitial).toBeFalse();
-        expect(comp.isLoading).toBeFalse();
-        fixture.detectChanges();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-loading'))).toBeNull();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-content'))).not.toBeNull();
-    });
-
-    it('should NOT try to fetch README.md from assignment repository if a problemStatement was provided', () => {
-        const result: Result = { id: 1, feedbacks: [] };
-        const participation: Participation = { id: 2 };
-        const problemstatement = 'lorem ipsum';
-        const exercise: ProgrammingExercise = {
-            id: 3,
-            course: { id: 4 },
-            problemStatement: problemstatement,
-            numberOfAssessmentsOfCorrectionRounds: [],
-            secondCorrectionEnabled: false,
-            studentAssignedTeamIdComputed: false,
-        };
-        const loadInitialResultStub = jest.spyOn(comp, 'loadInitialResult').mockReturnValue(of(result));
-        const updateMarkdownStub = jest.spyOn(comp, 'updateMarkdown');
-        comp.participation = participation;
-        comp.exercise = exercise;
-        comp.isInitial = true;
-        comp.isLoading = false;
-
-        fixture.detectChanges();
-        triggerChanges(comp);
-
-        expect(getFileStub).not.toHaveBeenCalled();
-        expect(comp.problemStatement).toBe('lorem ipsum');
-        expect(loadInitialResultStub).toHaveBeenCalledOnce();
-        expect(comp.latestResult).toEqual(result);
-        expect(updateMarkdownStub).toHaveBeenCalledOnce();
-        expect(comp.isInitial).toBeFalse();
-        expect(comp.isLoading).toBeFalse();
-        fixture.detectChanges();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-loading'))).toBeNull();
-        expect(debugElement.query(By.css('#programming-exercise-instructions-content'))).not.toBeNull();
-    });
+    }));
 
-    it('should emit that no instructions are available if there is neither a problemStatement provided nor a README.md can be retrieved', () => {
+    it('should emit that no instructions are available if there is no problem statement', () => {
         const result: Result = { id: 1, feedbacks: [] };
         const participation: Participation = { id: 2 };
         const exercise: ProgrammingExercise = {
@@ -225,11 +144,9 @@ describe('ProgrammingExerciseInstructionComponent', () => {
             secondCorrectionEnabled: false,
             studentAssignedTeamIdComputed: false,
         };
-        const getFileSubject = new Subject<{ fileContent: string; fileName: string }>();
         const loadInitialResultStub = jest.spyOn(comp, 'loadInitialResult').mockReturnValue(of(result));
         const updateMarkdownStub = jest.spyOn(comp, 'updateMarkdown');
         const noInstructionsAvailableSpy = jest.spyOn(comp.onNoInstructionsAvailable, 'emit');
-        getFileStub.mockReturnValue(getFileSubject);
         comp.participation = participation;
         comp.exercise = exercise;
         comp.isInitial = true;
@@ -237,11 +154,6 @@ describe('ProgrammingExerciseInstructionComponent', () => {
 
         fixture.detectChanges();
         triggerChanges(comp);
-        expect(comp.isLoading).toBeTrue();
-        expect(getFileStub).toHaveBeenCalledOnce();
-        expect(getFileStub).toHaveBeenCalledWith(participation.id, 'README.md');
-
-        getFileSubject.error('fatal error');
         expect(comp.problemStatement).toBeUndefined();
         expect(loadInitialResultStub).not.toHaveBeenCalled();
         expect(comp.latestResult).toBeUndefined();
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts
index 6f8ec78aa596..0d90f4c63d76 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-status.component.spec.ts
@@ -8,8 +8,8 @@ import { Result } from 'app/entities/result.model';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { ProgrammingExerciseInstructorStatusComponent } from 'app/exercises/programming/manage/status/programming-exercise-instructor-status.component';
-import { ProgrammingExerciseParticipationType } from 'app/entities/programming-exercise-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExerciseParticipationType } from 'app/entities/programming/programming-exercise-participation.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts
index e1638e73e8e8..0a0bee0d069b 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-submission-state.component.spec.ts
@@ -12,7 +12,7 @@ import { ExerciseSubmissionState, ProgrammingSubmissionService, ProgrammingSubmi
 import { ProgrammingExerciseInstructorSubmissionStateComponent } from 'app/exercises/programming/shared/actions/programming-exercise-instructor-submission-state.component';
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { BuildRunState, ProgrammingBuildRunService } from 'app/exercises/programming/participate/programming-build-run.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { MockDirective, MockModule, MockPipe } from 'ng-mocks';
 import { ProgrammingExerciseTriggerAllButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-trigger-all-button.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts
index f488e31968f6..bf9b03e41e6c 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-instructor-trigger-build-button.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { Course } from 'app/entities/course.model';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
index b9bbd8e9ad28..32c41626803d 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-lifecycle.component.spec.ts
@@ -4,7 +4,7 @@ import { ArtemisTestModule } from '../../test.module';
 import { MockComponent, MockDirective } from 'ng-mocks';
 import { ProgrammingExerciseLifecycleComponent } from 'app/exercises/programming/shared/lifecycle/programming-exercise-lifecycle.component';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseTestScheduleDatePickerComponent } from 'app/exercises/programming/shared/lifecycle/programming-exercise-test-schedule-date-picker.component';
 import { NgModel } from '@angular/forms';
 import { AssessmentType } from 'app/entities/assessment-type.model';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts
index 9283221d1266..16bd1cdf33b0 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-re-evaluate-button.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { Course } from 'app/entities/course.model';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts
index ccc542ea3ec5..aa7f5e3e80bb 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-repository-and-build-plan-details.component.spec.ts
@@ -1,11 +1,11 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { CheckoutDirectoriesDto } from 'app/entities/checkout-directories-dto';
-import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { CheckoutDirectoriesDto } from 'app/entities/programming/checkout-directories-dto';
+import { ProgrammingExercise, ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { MockComponent } from 'ng-mocks';
 import { Subscription, of } from 'rxjs';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { SimpleChanges } from '@angular/core';
 import { ProgrammingExerciseBuildPlanCheckoutDirectoriesComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-build-plan-checkout-directories.component';
 import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts
index 6f1c53159b02..596b3dfad522 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-reset-dialog.component.spec.ts
@@ -6,7 +6,7 @@ import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseResetDialogComponent } from 'app/exercises/programming/manage/reset/programming-exercise-reset-dialog.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { ProgrammingExerciseResetOptions, ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { AlertService } from 'app/core/util/alert.service';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts
index 18603184899b..b237c4ad56c7 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-test-case-passed-builds-charts.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 
 import { TestCasePassedBuildsChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component';
-import { TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 
 describe('TestCasePassedBuildsChartComponent', () => {
     let comp: TestCasePassedBuildsChartComponent;
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts
index 019291c960f3..000cf3dbeb54 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-all-button.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { Course } from 'app/entities/course.model';
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts
index 5a74d40dec87..c50aa8ffcea1 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-trigger-build-button.component.spec.ts
@@ -19,7 +19,7 @@ import { ArtemisProgrammingExerciseActionsModule } from 'app/exercises/programmi
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { ProgrammingExerciseStudentTriggerBuildButtonComponent } from 'app/exercises/programming/shared/actions/programming-exercise-student-trigger-build-button.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 
 describe('TriggerBuildButtonSpec', () => {
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
index b5664b00adb5..093df3a0508f 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise-update.component.spec.ts
@@ -2,13 +2,14 @@ import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testin
 import { DebugElement } from '@angular/core';
 import { HttpHeaders, HttpResponse } from '@angular/common/http';
 import { ActivatedRoute, UrlSegment } from '@angular/router';
+import { WindFile } from 'app/entities/programming/wind.file';
 import { Subject, of, throwError } from 'rxjs';
 import dayjs from 'dayjs/esm';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseUpdateComponent } from 'app/exercises/programming/manage/update/programming-exercise-update.component';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise, ProgrammingLanguage, ProjectType, WindFile } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise, ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
@@ -62,11 +63,14 @@ import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { ExerciseUpdateNotificationComponent } from 'app/exercises/shared/exercise-update-notification/exercise-update-notification.component';
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
 import * as Utils from 'app/exercises/shared/course-exercises/course-utils';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 import { AlertService, AlertType } from 'app/core/util/alert.service';
 import { FormStatusBarComponent } from 'app/forms/form-status-bar/form-status-bar.component';
 import { FormFooterComponent } from 'app/forms/form-footer/form-footer.component';
 import { ProgrammingExerciseRepositoryAndBuildPlanDetailsComponent } from 'app/exercises/programming/shared/build-details/programming-exercise-repository-and-build-plan-details.component';
+import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
+import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { PROFILE_THEIA } from 'app/app.constants';
 
 describe('ProgrammingExerciseUpdateComponent', () => {
     const courseId = 1;
@@ -80,6 +84,9 @@ describe('ProgrammingExerciseUpdateComponent', () => {
     let exerciseGroupService: ExerciseGroupService;
     let programmingExerciseFeatureService: ProgrammingLanguageFeatureService;
     let alertService: AlertService;
+    let profileService: ProfileService;
+
+    let getProfileInfoSub: jest.SpyInstance;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -147,6 +154,12 @@ describe('ProgrammingExerciseUpdateComponent', () => {
                 exerciseGroupService = debugElement.injector.get(ExerciseGroupService);
                 programmingExerciseFeatureService = debugElement.injector.get(ProgrammingLanguageFeatureService);
                 alertService = debugElement.injector.get(AlertService);
+                profileService = debugElement.injector.get(ProfileService);
+
+                getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
+                const newProfileInfo = new ProfileInfo();
+                newProfileInfo.activeProfiles = [];
+                getProfileInfoSub.mockReturnValue(of(newProfileInfo));
             });
     });
 
@@ -438,14 +451,14 @@ describe('ProgrammingExerciseUpdateComponent', () => {
             // WHEN
             fixture.detectChanges();
             comp.programmingExercise.buildConfig!.buildPlanConfiguration = 'some custom build definition';
-            comp.programmingExercise.buildConfig!.windFile = new WindFile();
+            comp.programmingExercise.buildConfig!.windfile = new WindFile();
             tick();
             comp.onProgrammingLanguageChange(ProgrammingLanguage.C);
             comp.onProjectTypeChange(ProjectType.FACT);
 
             // THEN
             expect(comp.programmingExercise.buildConfig?.buildPlanConfiguration).toBeUndefined();
-            expect(comp.programmingExercise.buildConfig?.windFile).toBeUndefined();
+            expect(comp.programmingExercise.buildConfig?.windfile).toBeUndefined();
         }));
     });
 
@@ -792,11 +805,56 @@ describe('ProgrammingExerciseUpdateComponent', () => {
             });
         });
 
-        it('find validation errors for invalid ide selection', () => {
+        it.each([
+            [
+                'find validation errors for invalid ide selection',
+                {
+                    activeProfiles: [PROFILE_THEIA],
+                },
+                {
+                    translateKey: 'artemisApp.programmingExercise.allowOnlineEditor.alert',
+                    translateValues: {},
+                },
+            ],
+            [
+                'find validation errors for invalid ide selection without theia profile',
+                {
+                    activeProfiles: [],
+                },
+                {
+                    translateKey: 'artemisApp.programmingExercise.allowOnlineEditor.alertNoTheia',
+                    translateValues: {},
+                },
+            ],
+        ])('%s', (description, profileInfo, expectedException) => {
+            getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
+
+            const newProfileInfo = new ProfileInfo();
+            newProfileInfo.activeProfiles = profileInfo.activeProfiles;
+
+            getProfileInfoSub.mockReturnValue(of(newProfileInfo));
+
+            const route = TestBed.inject(ActivatedRoute);
+            route.params = of({ courseId });
+            route.url = of([{ path: 'new' } as UrlSegment]);
+            route.data = of({ programmingExercise: comp.programmingExercise });
+
+            jest.spyOn(programmingExerciseFeatureService, 'getProgrammingLanguageFeature').mockReturnValue(getProgrammingLanguageFeature(ProgrammingLanguage.JAVA));
+
             comp.programmingExercise.allowOnlineEditor = false;
             comp.programmingExercise.allowOfflineIde = false;
+            comp.programmingExercise.allowOnlineIde = false;
+
+            fixture.detectChanges();
+
+            expect(comp.getInvalidReasons()).toContainEqual(expectedException);
+        });
+
+        it('find validation errors for invalid online IDE image', () => {
+            comp.programmingExercise.allowOnlineIde = true;
+            comp.programmingExercise.buildConfig!.theiaImage = undefined;
             expect(comp.getInvalidReasons()).toContainEqual({
-                translateKey: 'artemisApp.programmingExercise.allowOnlineEditor.alert',
+                translateKey: 'artemisApp.programmingExercise.theiaImage.alert',
                 translateValues: {},
             });
         });
@@ -832,6 +890,7 @@ describe('ProgrammingExerciseUpdateComponent', () => {
             comp.programmingExercise.maxStaticCodeAnalysisPenalty = 60;
             comp.programmingExercise.allowOfflineIde = true;
             comp.programmingExercise.allowOnlineEditor = false;
+            comp.programmingExercise.allowOnlineIde = false;
             comp.programmingExercise.packageName = 'de.tum.in';
             comp.programmingExercise.programmingLanguage = ProgrammingLanguage.JAVA;
 
@@ -975,7 +1034,7 @@ describe('ProgrammingExerciseUpdateComponent', () => {
         fixture.detectChanges();
         tick();
 
-        const categories = [new ExerciseCategory()];
+        const categories = [new ExerciseCategory(undefined, undefined)];
         expect(comp.exerciseCategories).toBeUndefined();
         comp.updateCategories(categories);
         expect(comp.exerciseCategories).toBe(categories);
@@ -1017,6 +1076,7 @@ describe('ProgrammingExerciseUpdateComponent', () => {
 
         comp.programmingExercise.allowOfflineIde = false;
         comp.programmingExercise.allowOnlineEditor = false;
+        comp.programmingExercise.allowOnlineIde = false;
         comp.calculateFormStatusSections();
         expect(comp.formStatusSections[1].valid).toBeFalse();
         comp.programmingExercise.allowOnlineEditor = true;
diff --git a/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts
index 7915f67f8f84..ec6b28b573ab 100644
--- a/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/programming-exercise.component.spec.ts
@@ -3,7 +3,7 @@ import { HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/ht
 import { of, throwError } from 'rxjs';
 import { ArtemisTestModule } from '../../test.module';
 import { ProgrammingExerciseComponent } from 'app/exercises/programming/manage/programming-exercise.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
diff --git a/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts
index fb52afff1ebc..863bb75ed2ca 100644
--- a/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/sca-category-distribution-chart.component.spec.ts
@@ -6,9 +6,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { BarChartModule } from '@swimlane/ngx-charts';
 import { TranslateService } from '@ngx-translate/core';
-import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/static-code-analysis-category.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { CategoryIssuesMap } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { StaticCodeAnalysisCategory, StaticCodeAnalysisCategoryState } from 'app/entities/programming/static-code-analysis-category.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { CategoryIssuesMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 
 describe('SCA category distribution chart', () => {
diff --git a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts
index 760a02a0c910..dea5aea61f5d 100644
--- a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-grading-tasks-table.component.spec.ts
@@ -3,8 +3,8 @@ import { ArtemisTestModule } from '../../../test.module';
 import { ProgrammingExerciseGradingTasksTableComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-grading-tasks-table.component';
 import { ProgrammingExerciseTaskService } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task.service';
 import { Observable, Subject, of } from 'rxjs';
-import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../../../helpers/mocks/service/mock-translate.service';
@@ -12,7 +12,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task';
 import { ButtonComponent } from 'app/shared/components/button.component';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 
 describe('ProgrammingExerciseGradingTasksTableComponent', () => {
     let fixture;
diff --git a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts
index fe23d6eea2d4..2f0c52e95903 100644
--- a/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/tasks/programming-exercise-task.component.spec.ts
@@ -7,7 +7,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockComponent, MockPipe } from 'ng-mocks';
 import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task';
 import { ProgrammingExerciseTaskComponent } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task/programming-exercise-task.component';
-import { Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 import { TestCasePassedBuildsChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-passed-builds-chart.component';
 import { Subject } from 'rxjs';
 
diff --git a/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts
index 32a4f2bd9ab9..f022af2d9cd1 100644
--- a/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/test-case-distribution-chart.component.spec.ts
@@ -5,10 +5,10 @@ import { TranslateService } from '@ngx-translate/core';
 import { TestCaseDistributionChartComponent } from 'app/exercises/programming/manage/grading/charts/test-case-distribution-chart.component';
 import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { BarChartModule } from '@swimlane/ngx-charts';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { TestCaseStatsMap } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { TestCaseStatsMap } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 
 describe('Test case distribution chart', () => {
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts
index d33537559cbd..0b99443e2f99 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-creation-config-mock.ts
@@ -1,8 +1,8 @@
 import { ProgrammingExerciseCreationConfig } from 'app/exercises/programming/manage/update/programming-exercise-creation-config';
 import { Observable } from 'rxjs';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 
 /* eslint-disable @typescript-eslint/no-unused-vars */
 export const programmingExerciseCreationConfigMock: ProgrammingExerciseCreationConfig = {
@@ -69,5 +69,8 @@ export const programmingExerciseCreationConfigMock: ProgrammingExerciseCreationC
     validIdeSelection(): boolean | undefined {
         return true;
     },
+    validOnlineIdeSelection(): boolean | undefined {
+        return true;
+    },
     withDependencies: false,
 };
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts
index 11d63911cc2c..70c70a17dd5b 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-difficulty.component.spec.ts
@@ -1,5 +1,6 @@
-import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockComponent, MockPipe } from 'ng-mocks';
+import { DebugElement } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
@@ -8,15 +9,22 @@ import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValu
 import { DifficultyPickerComponent } from 'app/exercises/shared/difficulty-picker/difficulty-picker.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
 import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
+import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
+import { PROFILE_THEIA } from 'app/app.constants';
+import { ArtemisTestModule } from '../../../test.module';
 
 describe('ProgrammingExerciseDifficultyComponent', () => {
     let fixture: ComponentFixture<ProgrammingExerciseDifficultyComponent>;
     let comp: ProgrammingExerciseDifficultyComponent;
+    let debugElement: DebugElement;
+    let profileService: ProfileService;
+    let getProfileInfoSub: jest.SpyInstance;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [],
+            imports: [ArtemisTestModule],
             declarations: [
                 CheckboxControlValueAccessor,
                 DefaultValueAccessor,
@@ -42,6 +50,11 @@ describe('ProgrammingExerciseDifficultyComponent', () => {
                 comp = fixture.componentInstance;
                 comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
                 comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
+
+                debugElement = fixture.debugElement;
+                profileService = debugElement.injector.get(ProfileService);
+                getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
+                getProfileInfoSub.mockReturnValue(of({ inProduction: false, sshCloneURLTemplate: 'ssh://git@testserver.com:1234/' } as ProfileInfo));
             });
     });
 
@@ -49,8 +62,16 @@ describe('ProgrammingExerciseDifficultyComponent', () => {
         jest.restoreAllMocks();
     });
 
-    it('should initialize', fakeAsync(() => {
+    it('should initialize', () => {
         fixture.detectChanges();
         expect(comp).not.toBeNull();
-    }));
+    });
+
+    it('should initialize theiaEnabled', () => {
+        getProfileInfoSub = jest.spyOn(profileService, 'getProfileInfo');
+        getProfileInfoSub.mockReturnValue(of({ activeProfiles: [PROFILE_THEIA] } as ProfileInfo));
+
+        fixture.detectChanges();
+        expect(comp.theiaEnabled).toBeTrue();
+    });
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
index 2f5ce3fb77d8..8087a70b7cea 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-grading.component.spec.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Subject, of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ProgrammingExerciseGradingComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-grading.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { IncludedInOverallScore } from 'app/entities/exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { SubmissionPolicyType } from 'app/entities/submission-policy.model';
@@ -22,6 +22,7 @@ import { CustomMaxDirective } from 'app/shared/validators/custom-max-validator.d
 import { NgbAlertsMocksModule } from '../../../helpers/mocks/directive/ngbAlertsMocks.module';
 import { NgbCollapse, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('ProgrammingExerciseGradingComponent', () => {
     let fixture: ComponentFixture<ProgrammingExerciseGradingComponent>;
@@ -46,6 +47,7 @@ describe('ProgrammingExerciseGradingComponent', () => {
                 MockComponent(SubmissionPolicyUpdateComponent),
                 MockComponent(PresentationScoreComponent),
                 MockComponent(FaIconComponent),
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 { provide: TranslateService, useClass: MockTranslateService },
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
index 30259859d720..963ef4c6ff37 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-information.component.spec.ts
@@ -6,7 +6,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ProgrammingExerciseInformationComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-information.component';
 import { DefaultValueAccessor, NgModel } from '@angular/forms';
 import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { HelpIconComponent } from 'app/shared/components/help-icon.component';
 import { CategorySelectorComponent } from 'app/shared/category-selector/category-selector.component';
 import { AddAuxiliaryRepositoryButtonComponent } from 'app/exercises/programming/manage/update/add-auxiliary-repository-button.component';
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
index 399f1969f22d..55eefafd0162 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-language.component.spec.ts
@@ -5,19 +5,28 @@ import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { CheckboxControlValueAccessor, DefaultValueAccessor, NgModel, NumberValueAccessor, SelectControlValueAccessor } from '@angular/forms';
 import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseLanguageComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-language.component';
 import { programmingExerciseCreationConfigMock } from './programming-exercise-creation-config-mock';
+import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
+import { provideHttpClient } from '@angular/common/http';
+import { TheiaService } from 'app/exercises/programming/shared/service/theia.service';
 
 describe('ProgrammingExerciseLanguageComponent', () => {
     let fixture: ComponentFixture<ProgrammingExerciseLanguageComponent>;
     let comp: ProgrammingExerciseLanguageComponent;
 
+    let theiaServiceMock!: { getTheiaImages: jest.Mock };
+
     beforeEach(() => {
+        theiaServiceMock = {
+            getTheiaImages: jest.fn(),
+        };
         TestBed.configureTestingModule({
             imports: [],
             declarations: [
                 ProgrammingExerciseLanguageComponent,
+                ProgrammingExerciseTheiaComponent,
                 CheckboxControlValueAccessor,
                 DefaultValueAccessor,
                 SelectControlValueAccessor,
@@ -27,10 +36,15 @@ describe('ProgrammingExerciseLanguageComponent', () => {
                 MockPipe(RemoveKeysPipe),
             ],
             providers: [
+                provideHttpClient(),
                 {
                     provide: ActivatedRoute,
                     useValue: { queryParams: of({}) },
                 },
+                {
+                    provide: TheiaService,
+                    useValue: theiaServiceMock,
+                },
             ],
             schemas: [],
         })
@@ -52,4 +66,19 @@ describe('ProgrammingExerciseLanguageComponent', () => {
         tick();
         expect(comp).not.toBeNull();
     }));
+
+    it('should not load TheiaComponent when online IDE is not allowed', fakeAsync(() => {
+        comp.programmingExercise.allowOnlineIde = false;
+        fixture.detectChanges();
+        tick();
+        expect(comp.programmingExerciseTheiaComponent).toBeUndefined();
+    }));
+
+    it('should load TheiaComponent when online IDE is allowed', fakeAsync(() => {
+        theiaServiceMock.getTheiaImages.mockReturnValue(of({}));
+        comp.programmingExercise.allowOnlineIde = true;
+        fixture.detectChanges();
+        tick();
+        expect(comp.programmingExerciseTheiaComponent).not.toBeNull();
+    }));
 });
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
index b56a555ea0ff..51ded01756bf 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/programming-exercise-problem.component.spec.ts
@@ -4,7 +4,7 @@ import { ActivatedRoute } from '@angular/router';
 import { of } from 'rxjs';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { ProgrammingExerciseProblemComponent } from 'app/exercises/programming/manage/update/update-components/programming-exercise-problem.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component';
 import { NgModel } from '@angular/forms';
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts
index 7cec929c092d..cc205e0a226e 100644
--- a/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/remove-auxiliary-repository-button.component.spec.ts
@@ -4,9 +4,9 @@ import { RemoveAuxiliaryRepositoryButtonComponent } from 'app/exercises/programm
 import { ArtemisTestModule } from '../../../test.module';
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { MockComponent } from 'ng-mocks';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
-import { AuxiliaryRepository } from 'app/entities/programming-exercise-auxiliary-repository-model';
+import { AuxiliaryRepository } from 'app/entities/programming/programming-exercise-auxiliary-repository-model';
 
 describe('RemoveAuxiliaryRepositoryButton', () => {
     let comp: RemoveAuxiliaryRepositoryButtonComponent;
diff --git a/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts b/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts
new file mode 100644
index 000000000000..ab3018105eaa
--- /dev/null
+++ b/src/test/javascript/spec/component/programming-exercise/update-components/theia/programming-exercise-theia.component.spec.ts
@@ -0,0 +1,90 @@
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { MockPipe } from 'ng-mocks';
+import { ActivatedRoute } from '@angular/router';
+import { of } from 'rxjs';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { RemoveKeysPipe } from 'app/shared/pipes/remove-keys.pipe';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { programmingExerciseCreationConfigMock } from '../programming-exercise-creation-config-mock';
+import { ProgrammingExerciseTheiaComponent } from 'app/exercises/programming/manage/update/update-components/theia/programming-exercise-theia.component';
+import { TheiaService } from 'app/exercises/programming/shared/service/theia.service';
+import { ArtemisSharedLibsModule } from 'app/shared/shared-libs.module';
+
+describe('ProgrammingExerciseTheiaComponent', () => {
+    let fixture: ComponentFixture<ProgrammingExerciseTheiaComponent>;
+    let comp: ProgrammingExerciseTheiaComponent;
+
+    let theiaServiceMock!: { getTheiaImages: jest.Mock };
+
+    beforeEach(() => {
+        theiaServiceMock = {
+            getTheiaImages: jest.fn(),
+        };
+        TestBed.configureTestingModule({
+            imports: [ProgrammingExerciseTheiaComponent, ArtemisSharedLibsModule],
+            declarations: [MockPipe(ArtemisTranslatePipe), MockPipe(RemoveKeysPipe)],
+            providers: [
+                {
+                    provide: ActivatedRoute,
+                    useValue: { queryParams: of({}) },
+                },
+                {
+                    provide: TheiaService,
+                    useValue: theiaServiceMock,
+                },
+            ],
+            schemas: [],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(ProgrammingExerciseTheiaComponent);
+        comp = fixture.componentInstance;
+        comp.programmingExerciseCreationConfig = programmingExerciseCreationConfigMock;
+        comp.programmingExercise = new ProgrammingExercise(undefined, undefined);
+        comp.programmingExercise.allowOnlineIde = true;
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should initialize', fakeAsync(() => {
+        fixture.detectChanges();
+        tick();
+        expect(comp).not.toBeNull();
+    }));
+
+    it('should have no selectedImage when no image is available', fakeAsync(() => {
+        theiaServiceMock.getTheiaImages.mockReturnValue(of({}));
+        fixture.detectChanges();
+        comp.loadTheiaImages();
+        tick();
+        expect(comp.programmingExercise.buildConfig?.theiaImage).toBeUndefined();
+    }));
+
+    it('should select first image when none was selected', fakeAsync(() => {
+        theiaServiceMock.getTheiaImages.mockReturnValue(
+            of({
+                'Java-17': 'test-url',
+                'Java-Test': 'test-url-2',
+            }),
+        );
+        fixture.detectChanges();
+        comp.loadTheiaImages();
+        tick();
+        expect(comp.programmingExercise.buildConfig?.theiaImage).toMatch('test-url');
+    }));
+
+    it('should not overwrite selected image when others are loaded', fakeAsync(() => {
+        comp.programmingExercise.buildConfig!.theiaImage = 'test-url-2';
+        theiaServiceMock.getTheiaImages.mockReturnValue(
+            of({
+                'Java-17': 'test-url',
+                'Java-Test': 'test-url-2',
+            }),
+        );
+        fixture.detectChanges();
+        comp.loadTheiaImages();
+        tick();
+        expect(comp.programmingExercise.buildConfig?.theiaImage).toMatch('test-url-2');
+    }));
+});
diff --git a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts
index 60940086d9d3..a93c87bdf3f3 100644
--- a/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/quiz-exercise/quiz-exercise-update.component.spec.ts
@@ -35,13 +35,14 @@ import { MockRouter } from '../../helpers/mocks/mock-router';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { ArtemisTestModule } from '../../test.module';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { MockProvider } from 'ng-mocks';
 import { Duration } from 'app/exercises/quiz/manage/quiz-exercise-interfaces';
 import { QuizQuestionListEditComponent } from 'app/exercises/quiz/manage/quiz-question-list-edit.component';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
 
-describe('QuizExercise Update Detail Component', () => {
+describe('QuizExerciseUpdateComponent', () => {
     let comp: QuizExerciseUpdateComponent;
     let exerciseGroupService: ExerciseGroupService;
     let courseManagementService: CourseManagementService;
@@ -447,7 +448,7 @@ describe('QuizExercise Update Detail Component', () => {
         it('should updateCategories properly by making category available for selection again when removing it', () => {
             comp.quizExercise = quizExercise;
             comp.exerciseCategories = [];
-            const newCategories = [{ category: 'Easy' }, { category: 'Hard' }];
+            const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)];
 
             comp.updateCategories(newCategories);
 
@@ -583,8 +584,8 @@ describe('QuizExercise Update Detail Component', () => {
             it('should update categories to given categories', () => {
                 resetQuizExercise();
                 comp.quizExercise = quizExercise;
-                const exerciseCategory1 = { exerciseId: 1, category: 'category1', color: 'color1' };
-                const exerciseCategory2 = { exerciseId: 1, category: 'category1', color: 'color1' };
+                const exerciseCategory1 = new ExerciseCategory('category1', 'color1');
+                const exerciseCategory2 = new ExerciseCategory('category1', 'color1');
                 const expected = [exerciseCategory1, exerciseCategory2];
                 comp.updateCategories([exerciseCategory1, exerciseCategory2]);
                 expect(comp.quizExercise.categories).toEqual(expected);
diff --git a/src/test/javascript/spec/component/range-slider.component.spec.ts b/src/test/javascript/spec/component/range-slider.component.spec.ts
new file mode 100644
index 000000000000..7e1b747047e0
--- /dev/null
+++ b/src/test/javascript/spec/component/range-slider.component.spec.ts
@@ -0,0 +1,69 @@
+import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MockModule } from 'ng-mocks';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+describe('RangeSliderComponent', () => {
+    let component: RangeSliderComponent;
+    let fixture: ComponentFixture<RangeSliderComponent>;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [MockModule(FormsModule), MockModule(ReactiveFormsModule)],
+            declarations: [RangeSliderComponent],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(RangeSliderComponent);
+        component = fixture.componentInstance;
+
+        component.generalMinValue = 0;
+        component.generalMaxValue = 100;
+        component.selectedMinValue = 20;
+        component.selectedMaxValue = 80;
+        component.step = 5;
+    });
+
+    it('should emit the updated max value', () => {
+        const emitSpy = jest.spyOn(component.selectedMaxValueChange, 'emit');
+
+        component.selectedMaxValue = 90;
+        const event = new Event('input');
+        Object.defineProperty(event, 'target', { value: { className: 'range-max', value: 90 } });
+
+        component.onSelectedMaxValueChanged(event);
+        expect(emitSpy).toHaveBeenCalledWith(90);
+    });
+
+    it('should emit the updated max value rounded up to next selectable value', () => {
+        const emitSpy = jest.spyOn(component.selectedMaxValueChange, 'emit');
+
+        component.selectedMaxValue = 11;
+        const event = new Event('input');
+        Object.defineProperty(event, 'target', { value: { className: 'range-max', value: 11 } });
+
+        component.onSelectedMaxValueChanged(event);
+        expect(emitSpy).toHaveBeenCalledWith(25);
+    });
+
+    it('should emit the updated min value', () => {
+        const emitSpy = jest.spyOn(component.selectedMinValueChange, 'emit');
+
+        component.selectedMinValue = 30;
+        const event = new Event('input');
+        Object.defineProperty(event, 'target', { value: { className: 'range-min', value: 30 } });
+
+        component.onSelectedMinValueChanged(event);
+        expect(emitSpy).toHaveBeenCalledWith(30);
+    });
+
+    it('should emit the updated min value rounded down to next selectable value', () => {
+        const emitSpy = jest.spyOn(component.selectedMinValueChange, 'emit');
+
+        component.selectedMinValue = 99;
+        const event = new Event('input');
+        Object.defineProperty(event, 'target', { value: { className: 'range-min', value: 99 } });
+
+        component.onSelectedMinValueChanged(event);
+        expect(emitSpy).toHaveBeenCalledWith(75);
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/code-button.component.spec.ts b/src/test/javascript/spec/component/shared/code-button.component.spec.ts
index f0fff85034ca..6423338cddbf 100644
--- a/src/test/javascript/spec/component/shared/code-button.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/code-button.component.spec.ts
@@ -28,6 +28,7 @@ import { MockTranslateService } from '../../helpers/mocks/service/mock-translate
 import { ArtemisTestModule } from '../../test.module';
 import { RouterTestingModule } from '@angular/router/testing';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('CodeButtonComponent', () => {
     let component: CodeButtonComponent;
@@ -82,6 +83,7 @@ describe('CodeButtonComponent', () => {
             },
         },
         theiaPortalURL: 'https://theia-test.k8s.ase.cit.tum.de',
+        operatorName: 'TUM',
     };
 
     let participation: ProgrammingExerciseStudentParticipation = new ProgrammingExerciseStudentParticipation();
@@ -96,6 +98,7 @@ describe('CodeButtonComponent', () => {
                 MockPipe(SafeUrlPipe),
                 MockDirective(FeatureToggleDirective),
                 MockComponent(HelpIconComponent),
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 MockProvider(AlertService),
@@ -145,7 +148,7 @@ describe('CodeButtonComponent', () => {
 
         component.ngOnInit();
         tick();
-        expect(component.setupSshKeysUrl).toBe(`${window.location.origin}/user-settings/sshSettings`);
+        expect(component.sshSettingsUrl).toBe(`${window.location.origin}/user-settings/ssh`);
         expect(component.sshTemplateUrl).toBe(info.sshCloneURLTemplate);
         expect(component.sshEnabled).toBe(!!info.sshCloneURLTemplate);
         expect(component.versionControlUrl).toBe(info.versionControlUrl);
@@ -156,13 +159,14 @@ describe('CodeButtonComponent', () => {
         getVcsAccessTokenSpy = jest.spyOn(accountService, 'getVcsAccessToken').mockReturnValue(throwError(() => new HttpErrorResponse({ status: 404, statusText: 'Not found' })));
         stubServices();
         participation.id = 1;
+        component.useParticipationVcsAccessToken = true;
         component.participations = [participation];
         component.ngOnChanges();
         tick();
         component.ngOnInit();
         tick();
 
-        expect(component.useVersionControlAccessToken).toBeTrue();
+        expect(component.accessTokensEnabled).toBeTrue();
         expect(component.user.vcsAccessToken).toEqual(vcsToken);
         expect(getVcsAccessTokenSpy).toHaveBeenCalled();
         expect(createVcsAccessTokenSpy).toHaveBeenCalled();
@@ -171,13 +175,14 @@ describe('CodeButtonComponent', () => {
     it('should not create new vcsAccessToken when it exists', fakeAsync(() => {
         participation.id = 1;
         component.participations = [participation];
+        component.useParticipationVcsAccessToken = true;
         stubServices();
         component.ngOnChanges();
         tick();
         component.ngOnInit();
         tick();
 
-        expect(component.useVersionControlAccessToken).toBeTrue();
+        expect(component.accessTokensEnabled).toBeTrue();
         expect(component.user.vcsAccessToken).toEqual(vcsToken);
         expect(getVcsAccessTokenSpy).toHaveBeenCalled();
         expect(createVcsAccessTokenSpy).not.toHaveBeenCalled();
@@ -205,12 +210,13 @@ describe('CodeButtonComponent', () => {
     it('should not use ssh when ssh is not enabled (even if useSsh is set)', () => {
         participation.repositoryUri = `https://gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git`;
         component.participations = [participation];
-        component.useSsh = true;
+        component.useParticipationVcsAccessToken = true;
+        component.useSsh = false;
         component.isTeamParticipation = false;
-        component.useVersionControlAccessToken = true;
-        component.useToken = true;
+        component.accessTokensEnabled = true;
         component.ngOnInit();
         component.ngOnChanges();
+        component.useToken = true;
 
         const url = component.getHttpOrSshRepositoryUri();
         expect(url).toBe(`https://${component.user.login}:**********@gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git`);
@@ -256,12 +262,13 @@ describe('CodeButtonComponent', () => {
     it('should insert the correct token in the repository uri', () => {
         participation.repositoryUri = `https://${component.user.login}@gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git`;
         component.participations = [participation];
+        component.useParticipationVcsAccessToken = true;
         component.useSsh = false;
-        component.useToken = true;
         component.isTeamParticipation = false;
-        component.useVersionControlAccessToken = true;
+        component.accessTokensEnabled = true;
         component.ngOnInit();
         component.ngOnChanges();
+        component.useToken = true;
 
         // Placeholder is shown
         let url = component.getHttpOrSshRepositoryUri();
@@ -286,12 +293,13 @@ describe('CodeButtonComponent', () => {
     it('should add the user login and token to the URL', () => {
         participation.repositoryUri = `https://gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git`;
         component.participations = [participation];
+        component.useParticipationVcsAccessToken = true;
         component.useSsh = false;
-        component.useToken = true;
         component.isTeamParticipation = false;
-        component.useVersionControlAccessToken = true;
+        component.accessTokensEnabled = true;
         component.ngOnInit();
         component.ngOnChanges();
+        component.useToken = true;
 
         const url = component.getHttpOrSshRepositoryUri();
         expect(url).toBe(`https://${component.user.login}:**********@gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise-team1.git`);
@@ -332,6 +340,22 @@ describe('CodeButtonComponent', () => {
         expect(component.getHttpOrSshRepositoryUri()).toBe('https://user1@gitlab.ase.in.tum.de/scm/ITCPLEASE1/itcplease1-exercise.solution.git');
     });
 
+    it('should set wasCopied to true and back to false after 3 seconds on successful copy', () => {
+        component.ngOnInit();
+        jest.useFakeTimers();
+        component.onCopyFinished(true);
+        expect(component.wasCopied).toBeTrue();
+        jest.advanceTimersByTime(3000);
+        expect(component.wasCopied).toBeFalse();
+        jest.useRealTimers();
+    });
+
+    it('should not change wasCopied if copy is unsuccessful', () => {
+        component.ngOnInit();
+        component.onCopyFinished(false);
+        expect(component.wasCopied).toBeFalse();
+    });
+
     it('should fetch and store ssh preference', fakeAsync(() => {
         stubServices();
 
@@ -345,33 +369,33 @@ describe('CodeButtonComponent', () => {
 
         expect(localStorageUseSshRetrieveStub).toHaveBeenNthCalledWith(1, 'useSsh');
         expect(localStorageUseSshObserveStub).toHaveBeenNthCalledWith(1, 'useSsh');
-        expect(component.useSsh).toBeFalsy();
+        expect(component.useSsh).toBeFalse();
 
         fixture.debugElement.query(By.css('.code-button')).nativeElement.click();
         tick();
         fixture.debugElement.query(By.css('#useSSHButton')).nativeElement.click();
         tick();
         expect(localStorageUseSshStoreStub).toHaveBeenNthCalledWith(1, 'useSsh', true);
-        expect(component.useSsh).toBeTruthy();
+        expect(component.useSsh).toBeTrue();
 
         fixture.debugElement.query(By.css('#useHTTPSButton')).nativeElement.click();
         tick();
         expect(localStorageUseSshStoreStub).toHaveBeenCalledWith('useSsh', false);
-        expect(component.useSsh).toBeFalsy();
+        expect(component.useSsh).toBeFalse();
 
         fixture.debugElement.query(By.css('#useHTTPSWithTokenButton')).nativeElement.click();
         tick();
         expect(localStorageUseSshStoreStub).toHaveBeenCalledWith('useSsh', false);
-        expect(component.useSsh).toBeFalsy();
-        expect(component.useToken).toBeTruthy();
+        expect(component.useSsh).toBeFalse();
+        expect(component.useToken).toBeTrue();
 
         localStorageUseSshObserveStubSubject.next(true);
         tick();
-        expect(component.useSsh).toBeTruthy();
+        expect(component.useSsh).toBeTrue();
 
         localStorageUseSshObserveStubSubject.next(false);
         tick();
-        expect(component.useSsh).toBeFalsy();
+        expect(component.useSsh).toBeFalse();
     }));
 
     it.each([
@@ -418,7 +442,7 @@ describe('CodeButtonComponent', () => {
                 guidedTourSettings: [],
                 login: 'edx_userLogin',
                 internal: true,
-                vcsAccessToken: 'token',
+                vcsAccessToken: vcsToken,
             }),
         );
 
diff --git a/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts b/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts
index 5765ddfd3f8b..ddcf06c215a2 100644
--- a/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/commits-info-group.component.spec.ts
@@ -4,7 +4,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockPipe } from 'ng-mocks';
 import dayjs from 'dayjs/esm';
 import { ArtemisTestModule } from '../../test.module';
-import type { CommitInfo } from 'app/entities/programming-submission.model';
+import type { CommitInfo } from 'app/entities/programming/programming-submission.model';
 import { CommitsInfoRowComponent } from 'app/exercises/programming/shared/commits-info/commits-info-group/commits-info-row/commits-info-row.component';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { TruncatePipe } from 'app/shared/pipes/truncate.pipe';
diff --git a/src/test/javascript/spec/component/shared/commits-info.component.spec.ts b/src/test/javascript/spec/component/shared/commits-info.component.spec.ts
index 0b5dc3c7fae6..3d7c860143ce 100644
--- a/src/test/javascript/spec/component/shared/commits-info.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/commits-info.component.spec.ts
@@ -7,7 +7,7 @@ import { ArtemisTestModule } from '../../test.module';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockPipe } from 'ng-mocks';
 import { of } from 'rxjs';
-import { CommitInfo } from 'app/entities/programming-submission.model';
+import { CommitInfo } from 'app/entities/programming/programming-submission.model';
 import { ProfileService } from 'app/shared/layouts/profiles/profile.service';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
diff --git a/src/test/javascript/spec/component/shared/confirm-entity-name.component.spec.ts b/src/test/javascript/spec/component/shared/confirm-entity-name.component.spec.ts
index 2e37c1da4eeb..17625d2a357b 100644
--- a/src/test/javascript/spec/component/shared/confirm-entity-name.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/confirm-entity-name.component.spec.ts
@@ -65,8 +65,8 @@ describe('ConfirmEntityNameComponent', () => {
 
         beforeEach(async () => {
             await TestBed.configureTestingModule({
-                imports: [FormsModule, ReactiveFormsModule],
-                declarations: [ConfirmEntityNameComponent, TranslateDirective],
+                imports: [FormsModule, ReactiveFormsModule, TranslateDirective],
+                declarations: [ConfirmEntityNameComponent],
                 providers: [{ provide: TranslateService, useClass: MockTranslateService }],
             }).compileComponents();
             fixture = TestBed.createComponent(ConfirmEntityNameComponent);
diff --git a/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts b/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts
index c667429e667b..7093eb87a5d0 100644
--- a/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/course-exam-archive-button.component.spec.ts
@@ -19,7 +19,7 @@ import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.di
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { CourseExamArchiveButtonComponent, CourseExamArchiveState } from 'app/shared/components/course-exam-archive-button/course-exam-archive-button.component';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamManagementService } from 'app/exam/manage/exam-management.service';
 import { AccountService } from 'app/core/auth/account.service';
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref';
diff --git a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
index 99a42141fbd2..ffb59f1825a3 100644
--- a/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/course-users-selector/course-users-selector.component.spec.ts
@@ -1,18 +1,19 @@
 import { ComponentFixture, TestBed, fakeAsync, tick, waitForAsync } from '@angular/core/testing';
-import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component';
-import { ArtemisSharedModule } from 'app/shared/shared.module';
-import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { Component, DebugElement, ViewChild } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
-import { MockPipe, MockProvider } from 'ng-mocks';
 import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
+import { By } from '@angular/platform-browser';
+import { of } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+import { MockPipe, MockProvider } from 'ng-mocks';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { Component, DebugElement, ViewChild } from '@angular/core';
+import { CourseUsersSelectorComponent, SearchRoleGroup } from 'app/shared/course-users-selector/course-users-selector.component';
 import { UserPublicInfoDTO } from 'app/core/user/user.model';
-import { HttpResponse } from '@angular/common/http';
-import { of } from 'rxjs';
-import { By } from '@angular/platform-browser';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { ArtemisSharedModule } from 'app/shared/shared.module';
+import { TranslateModule } from '@ngx-translate/core';
 
 @Component({
     template: `
@@ -32,11 +33,9 @@ class WrapperComponent {
 
     disabled = false;
     courseId = 1;
-    label = 'TestLabel';
     rolesToAllowSearchingIn: SearchRoleGroup[] = ['tutors', 'students', 'instructors'];
     multiSelect = true;
     showUserList = true;
-
     public selectedUsers: UserPublicInfoDTO[] | undefined | null = [];
 }
 
@@ -48,7 +47,7 @@ describe('CourseUsersSelectorComponent', () => {
 
     beforeEach(waitForAsync(() => {
         TestBed.configureTestingModule({
-            imports: [CommonModule, FormsModule, ReactiveFormsModule, ArtemisSharedModule, ArtemisSharedComponentModule, NgbTypeaheadModule],
+            imports: [CommonModule, FormsModule, ReactiveFormsModule, NgbTypeaheadModule, ArtemisSharedModule, ArtemisSharedComponentModule, TranslateModule.forRoot()],
             declarations: [CourseUsersSelectorComponent, WrapperComponent, MockPipe(ArtemisTranslatePipe)],
             providers: [MockProvider(CourseManagementService)],
         }).compileComponents();
@@ -141,61 +140,63 @@ describe('CourseUsersSelectorComponent', () => {
             fixture.detectChanges();
             tick(1000);
             expect(userSelectorComponent.selectedUsers).toEqual([exampleUserPublicInfoDTO]);
-            expect(fixture.debugElement.query(By.css('input')).nativeElement.disabled).toBeTrue();
-            expect(fixture.debugElement.queryAll(By.css('.selected-user'))).toHaveLength(1);
             expect(fixture.debugElement.query(By.css('.delete-user'))).toBeFalsy();
         }));
     });
-});
 
-function getNativeInput(element: HTMLElement): HTMLInputElement {
-    return <HTMLInputElement>element.querySelector('input');
-}
+    function getNativeInput(element: HTMLElement): HTMLInputElement {
+        return <HTMLInputElement>element.querySelector('input');
+    }
 
-function changeInput(element: any, value: string) {
-    const input = getNativeInput(element);
-    input.value = value;
-    const evt = new Event('input', { bubbles: true, cancelable: false });
-    input.dispatchEvent(evt);
-}
+    function changeInput(element: any, value: string) {
+        const input = getNativeInput(element);
+        input.value = value;
+        const evt = new Event('input', { bubbles: true, cancelable: false });
+        input.dispatchEvent(evt);
+    }
 
-function getDropdownButtons(element: DebugElement): DebugElement[] {
-    return Array.from(element.queryAll(By.css('button.dropdown-item')));
-}
+    function getDropdownButtons(element: DebugElement): DebugElement[] {
+        return Array.from(element.queryAll(By.css('button.dropdown-item')));
+    }
 
-function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void {
-    const pages = nativeEl.querySelectorAll('button.dropdown-item');
-    expect(pages).toHaveLength(dropdownEntries.length);
-    for (let i = 0; i < dropdownEntries.length; i++) {
-        const resultDef = dropdownEntries[i];
-        expect(normalizeText(pages[i].textContent)).toEqual(resultDef);
+    function expectDropdownItems(nativeEl: HTMLElement, dropdownEntries: string[]): void {
+        const pages = nativeEl.querySelectorAll('button.dropdown-item');
+        expect(pages).toHaveLength(dropdownEntries.length);
+        for (let i = 0; i < dropdownEntries.length; i++) {
+            const resultDef = dropdownEntries[i];
+            expect(normalizeText(pages[i].textContent)).toEqual(resultDef);
+        }
     }
-}
 
-function normalizeText(txt: string | null): string {
-    return txt ? txt.trim().replace(/\s+/g, ' ') : '';
-}
+    function normalizeText(txt: string | null): string {
+        return txt ? txt.trim().replace(/\s+/g, ' ') : '';
+    }
 
-function generateExampleUserPublicInfoDTO({
-    id = 3,
-    login = 'mort',
-    name = 'Mortimer of Sto Helit',
-    firstName = 'Mortimer',
-    lastName = 'of Sto Helit',
-    isInstructor = false,
-    isEditor = false,
-    isTeachingAssistant = false,
-    isStudent = true,
-}: UserPublicInfoDTO) {
-    const exampleUserPublicInfoDTO = new UserPublicInfoDTO();
-    exampleUserPublicInfoDTO.id = id;
-    exampleUserPublicInfoDTO.login = login;
-    exampleUserPublicInfoDTO.name = name;
-    exampleUserPublicInfoDTO.firstName = firstName;
-    exampleUserPublicInfoDTO.lastName = lastName;
-    exampleUserPublicInfoDTO.isInstructor = isInstructor;
-    exampleUserPublicInfoDTO.isEditor = isEditor;
-    exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant;
-    exampleUserPublicInfoDTO.isStudent = isStudent;
-    return exampleUserPublicInfoDTO;
-}
+    function generateExampleUserPublicInfoDTO({
+        id = 3,
+        login = 'mort',
+        name = 'Mortimer of Sto Helit',
+        firstName = 'Mortimer',
+        lastName = 'of Sto Helit',
+        isInstructor = false,
+        isEditor = false,
+        isTeachingAssistant = false,
+        isStudent = true,
+    }: Partial<UserPublicInfoDTO> = {}): UserPublicInfoDTO {
+        const exampleUserPublicInfoDTO = new UserPublicInfoDTO();
+        exampleUserPublicInfoDTO.id = id;
+        exampleUserPublicInfoDTO.login = login;
+        exampleUserPublicInfoDTO.name = name;
+        exampleUserPublicInfoDTO.firstName = firstName;
+        exampleUserPublicInfoDTO.lastName = lastName;
+        exampleUserPublicInfoDTO.isInstructor = isInstructor;
+        exampleUserPublicInfoDTO.isEditor = isEditor;
+        exampleUserPublicInfoDTO.isTeachingAssistant = isTeachingAssistant;
+        exampleUserPublicInfoDTO.isStudent = isStudent;
+        return exampleUserPublicInfoDTO;
+    }
+
+    afterEach(() => {
+        jest.clearAllMocks();
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/example-solution.component.spec.ts b/src/test/javascript/spec/component/shared/example-solution.component.spec.ts
index 036b0ee9d044..95cc9ddbe47f 100644
--- a/src/test/javascript/spec/component/shared/example-solution.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/example-solution.component.spec.ts
@@ -11,7 +11,7 @@ import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { ExampleSolutionComponent } from 'app/exercises/shared/example-solution/example-solution.component';
 import { ExampleSolutionInfo, ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { HeaderExercisePageWithDetailsComponent } from 'app/exercises/shared/exercise-headers/header-exercise-page-with-details.component';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
diff --git a/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts
new file mode 100644
index 000000000000..3432102e0a9d
--- /dev/null
+++ b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.component.spec.ts
@@ -0,0 +1,259 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ExerciseFilterModalComponent } from 'app/shared/exercise-filter/exercise-filter-modal.component';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { MockComponent, MockModule, MockProvider } from 'ng-mocks';
+import { ArtemisSharedCommonModule } from 'app/shared/shared-common.module';
+import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
+import { CustomExerciseCategoryBadgeComponent } from 'app/shared/exercise-categories/custom-exercise-category-badge/custom-exercise-category-badge.component';
+import { RangeSliderComponent } from 'app/shared/range-slider/range-slider.component';
+import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { RangeFilter } from 'app/types/exercise-filter';
+import { DifficultyLevel, Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { SidebarCardElement } from 'app/types/sidebar';
+import { Result } from 'app/entities/result.model';
+import { StudentParticipation } from 'app/entities/participation/student-participation.model';
+
+const EXERCISE_1 = { categories: [new ExerciseCategory('category1', undefined), new ExerciseCategory('category2', '#1b97ca')], maxPoints: 5, type: ExerciseType.TEXT } as Exercise;
+const EXERCISE_2 = {
+    categories: [new ExerciseCategory('category3', '#0d3cc2'), new ExerciseCategory('category4', '#6ae8ac')],
+    maxPoints: 5,
+    type: ExerciseType.PROGRAMMING,
+} as Exercise;
+const EXERCISE_3 = {
+    categories: [new ExerciseCategory('category1', undefined), new ExerciseCategory('category4', '#6ae8ac')],
+    maxPoints: 8,
+    type: ExerciseType.PROGRAMMING,
+} as Exercise;
+
+const SIDEBAR_CARD_ELEMENT_1 = {
+    exercise: EXERCISE_1,
+    type: ExerciseType.TEXT,
+    difficulty: DifficultyLevel.HARD,
+    studentParticipation: { results: [{ score: 7.7 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_2 = {
+    exercise: EXERCISE_2,
+    type: ExerciseType.PROGRAMMING,
+    difficulty: DifficultyLevel.EASY,
+    studentParticipation: { results: [{ score: 5.0 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_3 = {
+    exercise: EXERCISE_3,
+    type: ExerciseType.PROGRAMMING,
+    difficulty: DifficultyLevel.EASY,
+    studentParticipation: { results: [{ score: 82.3 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+
+const SCORE_FILTER: RangeFilter = {
+    isDisplayed: true,
+    filter: {
+        generalMin: 0,
+        generalMax: 100,
+        selectedMin: 0,
+        selectedMax: 100,
+        step: 5,
+    },
+};
+
+const POINTS_FILTER: RangeFilter = {
+    isDisplayed: true,
+    filter: {
+        generalMin: 0,
+        generalMax: 20,
+        selectedMin: 0,
+        selectedMax: 20,
+        step: 1,
+    },
+};
+
+describe('ExerciseFilterModalComponent', () => {
+    let component: ExerciseFilterModalComponent;
+    let fixture: ComponentFixture<ExerciseFilterModalComponent>;
+    let activeModal: NgbActiveModal;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                MockModule(FormsModule),
+                MockModule(ReactiveFormsModule),
+                MockModule(FontAwesomeModule),
+                MockModule(ArtemisSharedCommonModule),
+                MockModule(ArtemisSharedComponentModule),
+            ],
+            declarations: [ExerciseFilterModalComponent, MockComponent(CustomExerciseCategoryBadgeComponent), MockComponent(RangeSliderComponent)],
+            providers: [MockProvider(NgbActiveModal)],
+        }).compileComponents();
+
+        fixture = TestBed.createComponent(ExerciseFilterModalComponent);
+        component = fixture.componentInstance;
+        activeModal = TestBed.inject(NgbActiveModal);
+
+        component.exerciseFilters = {
+            exerciseTypesFilter: {
+                isDisplayed: true,
+                options: [
+                    { name: 'artemisApp.courseStatistics.programming', value: ExerciseType.PROGRAMMING, checked: false, icon: getIcon(ExerciseType.PROGRAMMING) },
+                    { name: 'artemisApp.courseStatistics.quiz', value: ExerciseType.QUIZ, checked: false, icon: getIcon(ExerciseType.QUIZ) },
+                    { name: 'artemisApp.courseStatistics.modeling', value: ExerciseType.MODELING, checked: false, icon: getIcon(ExerciseType.MODELING) },
+                    { name: 'artemisApp.courseStatistics.text', value: ExerciseType.TEXT, checked: false, icon: getIcon(ExerciseType.TEXT) },
+                    { name: 'artemisApp.courseStatistics.file-upload', value: ExerciseType.FILE_UPLOAD, checked: false, icon: getIcon(ExerciseType.FILE_UPLOAD) },
+                ],
+            },
+            difficultyFilter: {
+                isDisplayed: true,
+                options: [
+                    { name: 'artemisApp.exercise.easy', value: DifficultyLevel.EASY, checked: false },
+                    { name: 'artemisApp.exercise.medium', value: DifficultyLevel.MEDIUM, checked: false },
+                    { name: 'artemisApp.exercise.hard', value: DifficultyLevel.HARD, checked: false },
+                ],
+            },
+            categoryFilter: {
+                isDisplayed: true,
+                options: [
+                    { category: new ExerciseCategory('category1', undefined), searched: false },
+                    { category: new ExerciseCategory('category2', undefined), searched: false },
+                ],
+            },
+            achievedScore: SCORE_FILTER,
+            achievablePoints: POINTS_FILTER,
+        };
+
+        fixture.detectChanges();
+    });
+
+    it('should initialize filters properly', () => {
+        expect(component.categoryFilter).toEqual(component.exerciseFilters?.categoryFilter);
+        expect(component.typeFilter).toEqual(component.exerciseFilters?.exerciseTypesFilter);
+        expect(component.difficultyFilter).toEqual(component.exerciseFilters?.difficultyFilter);
+        expect(component.achievedScore).toEqual(component.exerciseFilters?.achievedScore);
+        expect(component.achievablePoints).toEqual(component.exerciseFilters?.achievablePoints);
+    });
+
+    describe('should close modal', () => {
+        it('with button in upper right corner on click', () => {
+            const closeSpy = jest.spyOn(activeModal, 'close');
+            const closeModalSpy = jest.spyOn(component, 'closeModal');
+
+            const closeButton = fixture.debugElement.query(By.css('.btn-close'));
+            expect(closeButton).not.toBeNull();
+
+            closeButton.nativeElement.click();
+            expect(closeSpy).toHaveBeenCalledOnce();
+            expect(closeModalSpy).toHaveBeenCalledOnce();
+        });
+
+        it('with button in lower right corner on click', () => {
+            const closeSpy = jest.spyOn(activeModal, 'close');
+            const closeModalSpy = jest.spyOn(component, 'closeModal');
+
+            const cancelButton = fixture.debugElement.query(By.css('button[jhiTranslate="entity.action.cancel"]'));
+            expect(cancelButton).not.toBeNull();
+
+            cancelButton.nativeElement.click();
+            expect(closeSpy).toHaveBeenCalledOnce();
+            expect(closeModalSpy).toHaveBeenCalledOnce();
+        });
+    });
+
+    describe('select category', () => {
+        it('should mark a category as selected when category is found', () => {
+            expect(component.categoryFilter?.options[0].searched).toBeFalse(); // if it is not false in the beginning we do not test anything here
+            const onSelectItemSpy = jest.spyOn(component, 'onSelectItem');
+
+            component.model = 'category1';
+            // Simulate selecting an item
+            const event = {
+                item: component.selectableCategoryOptions[0],
+                preventDefault: jest.fn(),
+            };
+            component.onSelectItem(event);
+            fixture.detectChanges();
+
+            expect(onSelectItemSpy).toHaveBeenCalledOnce();
+            expect(component.categoryFilter?.options[0].searched).toBeTrue();
+            expect(component.model).toBeUndefined(); // Clear the input field after selection
+        });
+
+        it('should not change category filter when no item is provided', () => {
+            expect(component.categoryFilter?.options[0].searched).toBeFalse(); // if it is not false in the beginning we do not test anything here
+            const onSelectItemSpy = jest.spyOn(component, 'onSelectItem');
+
+            component.model = 'categoryThatIsNotDefinedAndSearchedViaEnter';
+            const event = {
+                item: undefined,
+                preventDefault: jest.fn(),
+                stopPropagation: jest.fn(),
+            };
+            component.onSelectItem(event);
+            fixture.detectChanges();
+
+            expect(onSelectItemSpy).toHaveBeenCalledOnce();
+            expect(component.categoryFilter?.options[0].searched).toBeFalse();
+            expect(component.model).toBe('categoryThatIsNotDefinedAndSearchedViaEnter');
+        });
+    });
+
+    it('should reset all filters when button is clicked', () => {
+        component.categoryFilter!.options[0].searched = true;
+        component.categoryFilter!.options[1].searched = true;
+        component.typeFilter!.options[0].checked = true;
+        component.typeFilter!.options[1].checked = true;
+        component.difficultyFilter!.options[0].checked = true;
+        component.difficultyFilter!.options[1].checked = false;
+        component.achievablePoints!.filter.selectedMax = 10;
+        component.achievedScore!.filter.selectedMin = 10;
+        const resetFilterSpy = jest.spyOn(component, 'clearFilter');
+
+        const resetButton = fixture.debugElement.query(By.css('span[jhiTranslate="artemisApp.courseOverview.exerciseFilter.clearFilter"]'));
+        expect(resetButton).not.toBeNull();
+        resetButton.nativeElement.click();
+
+        expect(resetFilterSpy).toHaveBeenCalledOnce();
+        expect(component.categoryFilter!.options[0].searched).toBeFalse();
+        expect(component.categoryFilter!.options[1].searched).toBeFalse();
+        expect(component.typeFilter!.options[0].checked).toBeFalse();
+        expect(component.typeFilter!.options[1].checked).toBeFalse();
+        expect(component.difficultyFilter!.options[0].checked).toBeFalse();
+        expect(component.difficultyFilter!.options[1].checked).toBeFalse();
+        expect(component.achievablePoints!.filter.selectedMax).toBe(component.achievablePoints?.filter.generalMax);
+        expect(component.achievedScore!.filter.selectedMin).toBe(component.achievedScore?.filter.generalMin);
+    });
+
+    it('should apply filters, emit the correct sidebar data and close the modal', () => {
+        component.sidebarData = {
+            groupByCategory: true,
+            sidebarType: 'exercise',
+            groupedData: {
+                past: { entityData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3] },
+            },
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3],
+        };
+        component.categoryFilter!.options[0].searched = true; // must have 'category1'
+        component.typeFilter!.options[0].checked = true; // must be a programming exercise
+        component.difficultyFilter!.options[0].checked = true; // must be easy
+        component.achievablePoints!.filter.selectedMax = 10;
+        component.achievedScore!.filter.selectedMin = 10;
+
+        const filterAppliedEmitSpy = jest.spyOn(component.filterApplied, 'emit');
+        const applyFilterSpy = jest.spyOn(component, 'applyFilter');
+        const closeModalSpy = jest.spyOn(component, 'closeModal');
+        const applyButton = fixture.debugElement.query(By.css('button[jhiTranslate="artemisApp.courseOverview.exerciseFilter.applyFilter"]'));
+        expect(applyButton).not.toBeNull();
+        applyButton.nativeElement.click();
+
+        expect(applyFilterSpy).toHaveBeenCalledOnce();
+        expect(filterAppliedEmitSpy).toHaveBeenCalledOnce();
+        expect(filterAppliedEmitSpy).toHaveBeenCalledWith({
+            filteredSidebarData: component.sidebarData,
+            appliedExerciseFilters: component.exerciseFilters,
+            isFilterActive: true,
+        });
+        /** only {@link EXERCISE_3} fullfills the filter options and should be emitted in the event */
+        expect(component.sidebarData.ungroupedData?.length).toBe(1);
+
+        expect(closeModalSpy).toHaveBeenCalledOnce();
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts
new file mode 100644
index 000000000000..23ec9d99c4be
--- /dev/null
+++ b/src/test/javascript/spec/component/shared/exercise-filter/exercise-filter-modal.helper.spec.ts
@@ -0,0 +1,333 @@
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { DifficultyLevel, Exercise, ExerciseType } from 'app/entities/exercise.model';
+import { Result } from 'app/entities/result.model';
+import { StudentParticipation } from 'app/entities/participation/student-participation.model';
+import { SidebarCardElement } from 'app/types/sidebar';
+import {
+    satisfiesCategoryFilter,
+    satisfiesDifficultyFilter,
+    satisfiesFilters,
+    satisfiesPointsFilter,
+    satisfiesScoreFilter,
+} from 'app/shared/exercise-filter/exercise-filter-modal.helper';
+import { FilterDetails, RangeFilter } from 'app/types/exercise-filter';
+
+const EXERCISE_1 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category2', '#1b97ca')], maxPoints: 10, type: ExerciseType.TEXT } as Exercise;
+const EXERCISE_2 = { categories: [new ExerciseCategory('category3', '#0d3cc2'), new ExerciseCategory('category4', '#6ae8ac')], maxPoints: 5 } as Exercise;
+const EXERCISE_4 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category8', '#1b97ca')], maxPoints: 10 } as Exercise;
+const EXERCISE_5 = { maxPoints: 20 } as Exercise;
+
+const SIDEBAR_CARD_ELEMENT_1 = {
+    exercise: EXERCISE_1,
+    type: ExerciseType.TEXT,
+    difficulty: DifficultyLevel.HARD,
+    studentParticipation: { results: [{ score: 7.7 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_2 = {
+    exercise: EXERCISE_2,
+    type: ExerciseType.PROGRAMMING,
+    difficulty: DifficultyLevel.EASY,
+    studentParticipation: { results: [{ score: 82.3 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_4 = { exercise: EXERCISE_4 } as SidebarCardElement;
+
+/** contains duplicated type and difficulty with {@link SIDEBAR_CARD_ELEMENT_2}*/
+const SIDEBAR_CARD_ELEMENT_5 = { exercise: EXERCISE_5, type: ExerciseType.PROGRAMMING, difficulty: DifficultyLevel.EASY } as SidebarCardElement;
+
+describe('satisfiesDifficultyFilter', () => {
+    it('should return true if difficulty filter is undefined', () => {
+        const difficultyFilter = undefined;
+
+        const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter);
+        expect(resultItemWithDifficulty).toBeTrue();
+
+        const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter);
+        expect(resultItemWithoutDifficulty).toBeTrue();
+    });
+
+    it('should return true if difficulty filter is []', () => {
+        const difficultyFilter: DifficultyLevel[] = [];
+
+        const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter);
+        expect(resultItemWithDifficulty).toBeTrue();
+
+        const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter);
+        expect(resultItemWithoutDifficulty).toBeTrue();
+    });
+
+    it('should return true if difficulty is in difficulty filter', () => {
+        const difficultyFilter = [DifficultyLevel.HARD];
+
+        const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_1, difficultyFilter);
+        expect(resultItemWithDifficulty).toBeTrue();
+    });
+
+    it('should return false if difficulty is NOT in difficulty filter', () => {
+        const difficultyFilter = [DifficultyLevel.HARD];
+
+        const resultItemWithDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_2, difficultyFilter);
+        expect(resultItemWithDifficulty).toBeFalse();
+
+        const resultItemWithoutDifficulty = satisfiesDifficultyFilter(SIDEBAR_CARD_ELEMENT_4, difficultyFilter);
+        expect(resultItemWithoutDifficulty).toBeFalse();
+    });
+});
+
+describe('satisfiesCategoryFilter', () => {
+    it('should return true if difficulty filter is []', () => {
+        const categoryFilter: ExerciseCategory[] = [];
+
+        const resultItemWithCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter);
+        expect(resultItemWithCategory).toBeTrue();
+
+        const resultItemWithoutCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_5, categoryFilter);
+        expect(resultItemWithoutCategory).toBeTrue();
+    });
+
+    it('should return true category is included in difficulty filter', () => {
+        const categoryFilter = [new ExerciseCategory('category1', '#691b0b')];
+
+        const resultItemWithMatchingCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter);
+        expect(resultItemWithMatchingCategory).toBeTrue();
+    });
+
+    it('should return false if difficulty is NOT in difficulty filter', () => {
+        const categoryFilter = [new ExerciseCategory('notExistingCategory', '#691b0b')];
+
+        const resultItemWithCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_1, categoryFilter);
+        expect(resultItemWithCategory).toBeFalse();
+
+        const resultItemWithoutCategory = satisfiesCategoryFilter(SIDEBAR_CARD_ELEMENT_5, categoryFilter);
+        expect(resultItemWithoutCategory).toBeFalse();
+    });
+});
+
+describe('satisfiesScoreFilter', () => {
+    it('should return true if score filter is undefined', () => {
+        const scoreFilter = undefined;
+
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter);
+        expect(resultItemWithScore).toBeTrue();
+
+        const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter);
+        expect(resultItemWithoutScore).toBeTrue();
+    });
+
+    it('should return true if score filter is not applied', () => {
+        const scoreFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 0,
+                selectedMax: 1,
+                generalMin: 0,
+                generalMax: 1,
+                step: 1,
+            },
+        };
+
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, false, scoreFilter);
+        expect(resultItemWithScore).toBeTrue();
+
+        const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, false, scoreFilter);
+        expect(resultItemWithoutScore).toBeTrue();
+    });
+
+    it('should return true if score is in score filter', () => {
+        const scoreFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 5,
+                selectedMax: 10,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter);
+        expect(resultItemWithScore).toBeTrue();
+    });
+
+    it('should return false if score is NOT in score filter', () => {
+        const scoreFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 20,
+                selectedMax: 30,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_1, true, scoreFilter);
+        expect(resultItemWithScore).toBeFalse();
+
+        const resultItemWithoutScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter);
+        expect(resultItemWithoutScore).toBeFalse();
+    });
+
+    it('should return true if score of participation is not defined (not participated) and lower bound is 0', () => {
+        const scoreFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 0,
+                selectedMax: 10,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter);
+        expect(resultItemWithScore).toBeTrue();
+    });
+
+    it('should return false if score of participation is not defined (not participated) and lower bound is NOT 0', () => {
+        const scoreFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 1,
+                selectedMax: 10,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+        const resultItemWithScore = satisfiesScoreFilter(SIDEBAR_CARD_ELEMENT_4, true, scoreFilter);
+        expect(resultItemWithScore).toBeFalse();
+    });
+});
+
+describe('satisfiesPointsFilter', () => {
+    it('should return true if points filter is undefined', () => {
+        const pointsFilter = undefined;
+
+        const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter);
+        expect(resultItemWithPoints).toBeTrue();
+
+        const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, true, pointsFilter);
+        expect(resultItemWithoutPoints).toBeTrue();
+    });
+
+    it('should return true if points filter is not applied', () => {
+        const pointsFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 0,
+                selectedMax: 1,
+                generalMin: 0,
+                generalMax: 1,
+                step: 1,
+            },
+        };
+
+        const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, false, pointsFilter);
+        expect(resultItemWithPoints).toBeTrue();
+
+        const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, false, pointsFilter);
+        expect(resultItemWithoutPoints).toBeTrue();
+    });
+
+    it('should return true if points is in points filter', () => {
+        const pointsFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 9,
+                selectedMax: 10,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+
+        const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter);
+        expect(resultItemWithPoints).toBeTrue();
+    });
+
+    it('should return false if points is NOT in points filter', () => {
+        const pointsFilter: RangeFilter = {
+            isDisplayed: true,
+            filter: {
+                selectedMin: 11,
+                selectedMax: 12,
+                generalMin: 0,
+                generalMax: 80,
+                step: 1,
+            },
+        };
+
+        const resultItemWithPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_1, true, pointsFilter);
+        expect(resultItemWithPoints).toBeFalse();
+
+        const resultItemWithoutPoints = satisfiesPointsFilter(SIDEBAR_CARD_ELEMENT_4, true, pointsFilter);
+        expect(resultItemWithoutPoints).toBeFalse();
+    });
+});
+
+describe('satisfiesFilters', () => {
+    it('should return true if item satisfies filters', () => {
+        const filter: FilterDetails = {
+            selectedCategories: [new ExerciseCategory('category1', '#691b0b')],
+            searchedTypes: [ExerciseType.TEXT],
+            searchedDifficulties: [DifficultyLevel.HARD],
+            isScoreFilterApplied: false,
+            isPointsFilterApplied: false,
+            achievedScore: {
+                isDisplayed: true,
+                filter: {
+                    selectedMin: 5,
+                    selectedMax: 10,
+                    generalMin: 0,
+                    generalMax: 80,
+                    step: 1,
+                },
+            },
+            achievablePoints: {
+                isDisplayed: true,
+                filter: {
+                    selectedMin: 9,
+                    selectedMax: 10,
+                    generalMin: 0,
+                    generalMax: 80,
+                    step: 1,
+                },
+            },
+        };
+        const resultItem = satisfiesFilters(SIDEBAR_CARD_ELEMENT_1, filter);
+
+        expect(resultItem).toBeTrue();
+    });
+
+    it('should return false if item does not satisfy the score filter', () => {
+        const filter: FilterDetails = {
+            selectedCategories: [new ExerciseCategory('category1', '#691b0b')],
+            searchedTypes: [ExerciseType.TEXT],
+            searchedDifficulties: [DifficultyLevel.HARD],
+            isScoreFilterApplied: false,
+            isPointsFilterApplied: false,
+            achievedScore: {
+                isDisplayed: true,
+                filter: {
+                    selectedMin: 69,
+                    selectedMax: 70,
+                    generalMin: 0,
+                    generalMax: 80,
+                    step: 1,
+                },
+            },
+            achievablePoints: {
+                isDisplayed: true,
+                filter: {
+                    selectedMin: 9,
+                    selectedMax: 10,
+                    generalMin: 0,
+                    generalMax: 80,
+                    step: 1,
+                },
+            },
+        };
+        const resultItem = satisfiesFilters(SIDEBAR_CARD_ELEMENT_1, filter);
+
+        expect(resultItem).toBeTrue();
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts
index 98f536f9dcea..f2123eb7f2b4 100644
--- a/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/feedback/feedback-modal.component.spec.ts
@@ -8,8 +8,8 @@ import { ExerciseType } from 'app/entities/exercise.model';
 import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Result } from 'app/entities/result.model';
 import { SubmissionType } from 'app/entities/submission.model';
 import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
diff --git a/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts b/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts
index aa2aa73b8ccb..443d3b40e1a2 100644
--- a/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/feedback/standalone-feedback.component.spec.ts
@@ -7,7 +7,7 @@ import { StandaloneFeedbackComponent } from 'app/exercises/shared/feedback/stand
 import { MockComponent, MockProvider } from 'ng-mocks';
 import { FeedbackComponent } from 'app/exercises/shared/feedback/feedback.component';
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 
 describe('StandaloneFeedbackComponent', () => {
diff --git a/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts b/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts
index c5f89566b009..ae00000ae4b6 100644
--- a/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/grading-instructions-details.component.spec.ts
@@ -4,20 +4,20 @@ import { Exercise } from 'app/entities/exercise.model';
 import { GradingCriterion } from 'app/exercises/shared/structured-grading-criterion/grading-criterion.model';
 import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model';
 import { GradingInstructionsDetailsComponent } from 'app/exercises/shared/structured-grading-criterion/grading-instructions-details/grading-instructions-details.component';
-import { CreditsCommand } from 'app/shared/markdown-editor/domainCommands/credits.command';
-import { DomainCommand } from 'app/shared/markdown-editor/domainCommands/domainCommand';
-import { FeedbackCommand } from 'app/shared/markdown-editor/domainCommands/feedback.command';
-import { GradingCriterionCommand } from 'app/shared/markdown-editor/domainCommands/gradingCriterionCommand';
-import { GradingInstructionCommand } from 'app/shared/markdown-editor/domainCommands/gradingInstruction.command';
-import { GradingScaleCommand } from 'app/shared/markdown-editor/domainCommands/gradingScaleCommand';
-import { InstructionDescriptionCommand } from 'app/shared/markdown-editor/domainCommands/instructionDescription.command';
-import { UsageCountCommand } from 'app/shared/markdown-editor/domainCommands/usageCount.command';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { ArtemisTestModule } from '../../test.module';
-
-describe('Grading Instructions Management Component', () => {
+import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action';
+import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action';
+import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action';
+import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action';
+import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action';
+import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action';
+import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action';
+import { TextWithDomainAction } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
+
+describe('GradingInstructionsDetailsComponent', () => {
     let component: GradingInstructionsDetailsComponent;
     let fixture: ComponentFixture<GradingInstructionsDetailsComponent>;
     let gradingInstruction: GradingInstruction;
@@ -28,22 +28,13 @@ describe('Grading Instructions Management Component', () => {
     const backupExercise = { id: 1 } as Exercise;
 
     const criterionMarkdownText =
-        '[criterion]' +
-        'testCriteria' +
-        '\n' +
-        '\t' +
-        '[instruction]\n' +
-        '\t' +
-        '[credits]' +
-        ' 1\n' +
-        '\t' +
-        '[gradingScale] scale\n' +
-        '\t' +
-        '[description] description\n' +
-        '\t' +
-        '[feedback] feedback\n' +
-        '\t' +
-        '[maxCountInScore] 0\n\n';
+        '[criterion] testCriteria\n' +
+        '\t[instruction]\n' +
+        '\t[credits] 1\n' +
+        '\t[gradingScale] scale\n' +
+        '\t[description] description\n' +
+        '\t[feedback] feedback\n' +
+        '\t[maxCountInScore] 0\n\n';
 
     beforeEach(() => {
         TestBed.configureTestingModule({
@@ -146,10 +137,10 @@ describe('Grading Instructions Management Component', () => {
 
     it('should change grading instruction', () => {
         const newDescription = 'new text';
-        const domainCommands = [[newDescription, new InstructionDescriptionCommand()]] as [string, DomainCommand | null][];
+        const domainActions = [{ text: newDescription, action: new MonacoGradingDescriptionAction() }] as TextWithDomainAction[];
 
         component.exercise.gradingCriteria = [gradingCriterion];
-        component.onInstructionChange(domainCommands, gradingInstruction);
+        component.onInstructionChange(domainActions, gradingInstruction);
         fixture.detectChanges();
 
         expect(component.exercise.gradingCriteria[0].structuredGradingInstructions[0].instructionDescription).toEqual(newDescription);
@@ -165,25 +156,38 @@ describe('Grading Instructions Management Component', () => {
 
     it('should set grading instruction text for exercise', () => {
         const markdownText = 'new text';
-        const domainCommands = [[markdownText, null]] as [string, DomainCommand | null][];
+        const domainActions = [{ text: markdownText, action: undefined }] as TextWithDomainAction[];
 
-        component.setExerciseGradingInstructionText(domainCommands);
+        component.setExerciseGradingInstructionText(domainActions);
         fixture.detectChanges();
 
         expect(component.exercise.gradingInstructions).toEqual(markdownText);
     });
 
-    it('should set grading instruction without criterion command when markdown-change triggered', () => {
-        const domainCommands = [
-            ['', new GradingInstructionCommand()],
-            ['1', new CreditsCommand()],
-            ['scale', new GradingScaleCommand()],
-            ['description', new InstructionDescriptionCommand()],
-            ['feedback', new FeedbackCommand()],
-            ['0', new UsageCountCommand()],
-        ] as [string, DomainCommand | null][];
+    const getDomainActionArray = () => {
+        const creditsAction = new MonacoGradingCreditsAction();
+        const scaleAction = new MonacoGradingScaleAction();
+        const descriptionAction = new MonacoGradingDescriptionAction();
+        const feedbackAction = new MonacoGradingFeedbackAction();
+        const usageCountAction = new MonacoGradingUsageCountAction();
+        const instructionAction = new MonacoGradingInstructionAction(creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction);
+        const criterionAction = new MonacoGradingCriterionAction(instructionAction);
+
+        return [
+            { text: 'testCriteria', action: criterionAction },
+            { text: '', action: instructionAction },
+            { text: '1', action: creditsAction },
+            { text: 'scale', action: scaleAction },
+            { text: 'description', action: descriptionAction },
+            { text: 'feedback', action: feedbackAction },
+            { text: '0', action: usageCountAction },
+        ] as TextWithDomainAction[];
+    };
 
-        component.domainCommandsFound(domainCommands);
+    it('should set grading instruction without criterion action when markdown-change triggered', () => {
+        const domainActionsWithoutCriterion = getDomainActionArray().slice(1);
+
+        component.onDomainActionsFound(domainActionsWithoutCriterion);
         fixture.detectChanges();
 
         expect(component.exercise.gradingCriteria).toBeDefined();
@@ -191,18 +195,10 @@ describe('Grading Instructions Management Component', () => {
         expect(gradingCriteria.structuredGradingInstructions[0]).toEqual(gradingInstructionWithoutId);
     });
 
-    it('should set grading instruction with criterion command when markdown-change triggered', () => {
-        const domainCommands = [
-            ['testCriteria', new GradingCriterionCommand()],
-            ['', new GradingInstructionCommand()],
-            ['1', new CreditsCommand()],
-            ['scale', new GradingScaleCommand()],
-            ['description', new InstructionDescriptionCommand()],
-            ['feedback', new FeedbackCommand()],
-            ['0', new UsageCountCommand()],
-        ] as [string, DomainCommand | null][];
-
-        component.domainCommandsFound(domainCommands);
+    it('should set grading instruction with criterion action when markdown-change triggered', () => {
+        const domainActions = getDomainActionArray();
+
+        component.onDomainActionsFound(domainActions);
         fixture.detectChanges();
 
         expect(component.exercise.gradingCriteria).toBeDefined();
diff --git a/src/test/javascript/spec/component/shared/metis/postings-markdown-editor/select-with-search.component.spec.ts b/src/test/javascript/spec/component/shared/metis/postings-markdown-editor/select-with-search.component.spec.ts
deleted file mode 100644
index a8060e7fa81b..000000000000
--- a/src/test/javascript/spec/component/shared/metis/postings-markdown-editor/select-with-search.component.spec.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { HttpClientTestingModule } from '@angular/common/http/testing';
-import { of, throwError } from 'rxjs';
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-import { faAt } from '@fortawesome/free-solid-svg-icons';
-
-import { SelectWithSearchComponent } from 'app/shared/markdown-editor/select-with-search/select-with-search.component';
-import { InteractiveSearchCommand } from 'app/shared/markdown-editor/commands/interactiveSearchCommand';
-import { AlertService } from 'app/core/util/alert.service';
-import { MockProvider } from 'ng-mocks';
-import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import { SimpleChange } from '@angular/core';
-
-describe('SelectWithSearchComponent', () => {
-    let component: SelectWithSearchComponent;
-    let fixture: ComponentFixture<SelectWithSearchComponent>;
-    let alertService: AlertService;
-
-    beforeEach(async () => {
-        await TestBed.configureTestingModule({
-            declarations: [SelectWithSearchComponent],
-            imports: [HttpClientTestingModule, NgbDropdownModule, FontAwesomeModule],
-            providers: [MockProvider(AlertService)],
-        }).compileComponents();
-    });
-
-    beforeEach(() => {
-        fixture = TestBed.createComponent(SelectWithSearchComponent);
-        component = fixture.componentInstance;
-        alertService = TestBed.inject(AlertService);
-        const testItems = [{ name: 'test 1' }, { name: 'test 2' }];
-        const command: InteractiveSearchCommand = {
-            setSelectWithSearchComponent: () => {},
-            performSearch: (searchTerm: string) => {
-                const filteredItems = testItems.filter((item) => item.name.includes(searchTerm));
-                return of(new HttpResponse<any[]>({ body: filteredItems }));
-            },
-            buttonIcon: faAt,
-            execute: () => {
-                component.open();
-            },
-            insertSelection: () => {},
-            getCursorScreenPosition: () => {
-                return { pageX: 0, pageY: 0 };
-            },
-            updateSearchTerm: () => {},
-        } as any;
-        component.command = command;
-        fixture.detectChanges();
-    });
-
-    afterEach(() => {
-        fixture.destroy();
-    });
-
-    it('should initialize and subscribe to search$', fakeAsync(() => {
-        expect(component.values).toEqual([]);
-        expect(component.selectedValue).toBeUndefined();
-
-        // Simulate search input
-        component.updateSearchTerm('test 1', true);
-        tick(1);
-        expect(component.values).toEqual([{ name: 'test 1' }]);
-    }));
-
-    it('should handle errors when performing search', fakeAsync(() => {
-        const command: InteractiveSearchCommand = {
-            setSelectWithSearchComponent: () => {},
-            performSearch: () => throwError(() => new HttpErrorResponse({ status: 400 })),
-            buttonIcon: faAt,
-            insertSelection: () => {},
-        } as any;
-
-        component.command = command;
-        fixture.detectChanges();
-
-        const alertSpy = jest.spyOn(alertService, 'error');
-
-        component.updateSearchTerm('test', true);
-        tick(1);
-
-        expect(alertSpy).toHaveBeenCalledOnce();
-    }));
-
-    it('should toggle menu when clicking button', () => {
-        // Find the menu button in the fixture
-        const menuButton = fixture.debugElement.nativeElement.querySelector('button.btn.btn-sm.py-0');
-
-        const commandExecuteSpy = jest.spyOn(component.command, 'execute');
-        const menuCloseSpy = jest.spyOn(component, 'close');
-
-        // Click button to open menu
-        menuButton.click();
-        fixture.detectChanges();
-
-        expect(commandExecuteSpy).toHaveBeenCalled();
-
-        // Click button to close menu
-        menuButton.click();
-        fixture.detectChanges();
-
-        expect(menuCloseSpy).toHaveBeenCalled();
-    });
-
-    it('should open and close the menu', () => {
-        const handleMenuOpenSpy = jest.spyOn(component, 'handleMenuOpen');
-        const handleMenuClosedSpy = jest.spyOn(component, 'handleMenuClosed');
-
-        // Click button to open menu
-        component.open();
-        fixture.detectChanges();
-
-        // Assert that the handleMenuOpen method was called
-        expect(handleMenuOpenSpy).toHaveBeenCalledOnce();
-        expect(component.dropdown.isOpen()).toBeTrue();
-
-        // Click button to close menu
-        component.close();
-        fixture.detectChanges();
-
-        // Assert that the handleMenuClosed method was called
-        expect(handleMenuClosedSpy).toHaveBeenCalledOnce();
-        expect(component.dropdown.isOpen()).toBeFalse();
-    });
-
-    it('should set the selectedValue and close the menu when calling setSelection', () => {
-        // Simulate some values in the component
-        component.values = [{ name: 'Item 1' }, { name: 'Item 2' }];
-        fixture.detectChanges();
-
-        component.setSelection({ name: 'Item 1' });
-
-        expect(component.selectedValue).toEqual({ name: 'Item 1' });
-        expect(component.dropdown.isOpen()).toBeFalse();
-    });
-
-    it('searchTerm updates on changes', () => {
-        component.editorContentString = 'test';
-        fixture.detectChanges();
-
-        const updateSearchTermSpy = jest.spyOn(component.command, 'updateSearchTerm');
-
-        component.ngOnChanges({ editorContentString: {} as SimpleChange });
-
-        expect(updateSearchTermSpy).toHaveBeenCalledOnce();
-    });
-});
diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts
index 4ef09a0bed8c..482467968cdb 100644
--- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts
+++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action-quiz.integration.spec.ts
@@ -5,6 +5,10 @@ import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.modul
 import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer';
 import { MonacoInsertShortAnswerOptionAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-insert-short-answer-option.action';
 import { MonacoInsertShortAnswerSpotAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-insert-short-answer-spot.action';
+import { MonacoWrongMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-wrong-multiple-choice-answer.action';
+import { MonacoCorrectMultipleChoiceAnswerAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-correct-multiple-choice-answer.action';
+import { MonacoQuizExplanationAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-explanation.action';
+import { MonacoQuizHintAction } from 'app/shared/monaco-editor/model/actions/quiz/monaco-quiz-hint.action';
 
 describe('MonacoEditorActionQuizIntegration', () => {
     let fixture: ComponentFixture<MonacoEditorComponent>;
@@ -135,4 +139,40 @@ describe('MonacoEditorActionQuizIntegration', () => {
             expect(comp.getText()).toBe(questionText + '[-spot 1]' + `\n\n\n[-option 1] ${MonacoInsertShortAnswerOptionAction.DEFAULT_TEXT}`);
         });
     });
+
+    describe('Multiple Choice answer options', () => {
+        it('should insert a wrong MC option', () => {
+            comp.triggerKeySequence('This is a question that needs some options.');
+            const action = new MonacoWrongMultipleChoiceAnswerAction();
+            comp.registerAction(action);
+            action.executeInCurrentEditor();
+            expect(comp.getText()).toBe('This is a question that needs some options.\n[wrong] Enter a wrong answer option here');
+        });
+
+        it('should insert a correct MC option', () => {
+            comp.triggerKeySequence('This is a question that needs some options.');
+            const action = new MonacoCorrectMultipleChoiceAnswerAction();
+            comp.registerAction(action);
+            action.executeInCurrentEditor();
+            expect(comp.getText()).toBe('This is a question that needs some options.\n[correct] Enter a correct answer option here');
+        });
+
+        it('should add an explanation to an answer option', () => {
+            comp.triggerKeySequence('This is a question that has an option.\n[correct] Option 1');
+            const action = new MonacoQuizExplanationAction();
+            comp.registerAction(action);
+            action.executeInCurrentEditor();
+            expect(comp.getText()).toBe(
+                'This is a question that has an option.\n[correct] Option 1\n\t[exp] Add an explanation here (only visible in feedback after quiz has ended)',
+            );
+        });
+
+        it('should add a hint to an answer option', () => {
+            comp.triggerKeySequence('This is a question that has an option.\n[correct] Option 1');
+            const action = new MonacoQuizHintAction();
+            comp.registerAction(action);
+            action.executeInCurrentEditor();
+            expect(comp.getText()).toBe('This is a question that has an option.\n[correct] Option 1\n\t[hint] Add a hint here (visible during the quiz via ?-Button)');
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts
index c1204d455f57..3ccaa08b5f79 100644
--- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts
+++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-action.integration.spec.ts
@@ -180,7 +180,7 @@ describe('MonacoEditorActionIntegration', () => {
         const action = new MonacoTaskAction();
         comp.registerAction(action);
         action.executeInCurrentEditor();
-        expect(comp.getText()).toBe(MonacoTaskAction.INSERT_TASK_TEXT);
+        expect(comp.getText()).toBe(`[task]${MonacoTaskAction.TEXT}`);
     });
 
     it('should enter fullscreen', () => {
diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts
new file mode 100644
index 000000000000..a5df872438f0
--- /dev/null
+++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor-grading-instructions.integration.spec.ts
@@ -0,0 +1,74 @@
+import { MonacoEditorComponent } from 'app/shared/monaco-editor/monaco-editor.component';
+import { ArtemisTestModule } from '../../../test.module';
+import { MonacoEditorModule } from 'app/shared/monaco-editor/monaco-editor.module';
+import { MockResizeObserver } from '../../../helpers/mocks/service/mock-resize-observer';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { MonacoGradingInstructionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-instruction.action';
+import { MonacoGradingCreditsAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-credits.action';
+import { MonacoGradingScaleAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-scale.action';
+import { MonacoGradingDescriptionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-description.action';
+import { MonacoGradingFeedbackAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-feedback.action';
+import { MonacoGradingUsageCountAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-usage-count.action';
+import { MonacoGradingCriterionAction } from 'app/shared/monaco-editor/model/actions/grading-criteria/monaco-grading-criterion.action';
+
+describe('MonacoEditorActionGradingInstructionsIntegration', () => {
+    let fixture: ComponentFixture<MonacoEditorComponent>;
+    let comp: MonacoEditorComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, MonacoEditorModule],
+            declarations: [MonacoEditorComponent],
+            providers: [],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(MonacoEditorComponent);
+                comp = fixture.componentInstance;
+                global.ResizeObserver = jest.fn().mockImplementation((callback: ResizeObserverCallback) => {
+                    return new MockResizeObserver(callback);
+                });
+                fixture.detectChanges();
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    const setupActions = () => {
+        const creditsAction = new MonacoGradingCreditsAction();
+        const scaleAction = new MonacoGradingScaleAction();
+        const descriptionAction = new MonacoGradingDescriptionAction();
+        const feedbackAction = new MonacoGradingFeedbackAction();
+        const usageCountAction = new MonacoGradingUsageCountAction();
+        const instructionAction = new MonacoGradingInstructionAction(creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction);
+        const criterionAction = new MonacoGradingCriterionAction(instructionAction);
+        [creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction, instructionAction, criterionAction].forEach((action) => comp.registerAction(action));
+        return { creditsAction, scaleAction, descriptionAction, feedbackAction, usageCountAction, instructionAction, criterionAction };
+    };
+
+    const expectedInstructionTextWithoutCriterion =
+        '\n[instruction]' +
+        '\n\t[credits] 0' +
+        '\n\t[gradingScale] Add instruction grading scale here (only visible for tutors)' +
+        '\n\t[description] Add grading instruction here (only visible for tutors)' +
+        '\n\t[feedback] Add feedback for students here (visible for students)' +
+        '\n\t[maxCountInScore] 0';
+
+    const generalInstructionText = 'These are some general instructions for the tutors.';
+
+    it('should insert grading instructions', () => {
+        comp.triggerKeySequence(generalInstructionText);
+        const actions = setupActions();
+        actions.instructionAction.executeInCurrentEditor();
+        expect(comp.getText()).toBe(generalInstructionText + expectedInstructionTextWithoutCriterion);
+    });
+
+    it('should insert grading criterion', () => {
+        comp.triggerKeySequence(generalInstructionText);
+        const actions = setupActions();
+        actions.criterionAction.executeInCurrentEditor();
+        expect(comp.getText()).toBe(`${generalInstructionText}\n[criterion] Add criterion title (only visible to tutors)${expectedInstructionTextWithoutCriterion}`);
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts
index dc9f7fb8b33c..ae34f743a3a7 100644
--- a/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/monaco-editor/monaco-editor.component.spec.ts
@@ -170,6 +170,12 @@ describe('MonacoEditorComponent', () => {
         expect(documentHighlightedMargins).toHaveLength(3);
     });
 
+    it('should get the number of lines in the editor', () => {
+        fixture.detectChanges();
+        comp.setText(multiLineText);
+        expect(comp.getNumberOfLines()).toBe(5);
+    });
+
     it('should pass the current line number to the line decorations hover button when clicked', () => {
         const clickCallbackStub = jest.fn();
         const className = 'testClass';
diff --git a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts
index 8cf036109027..4d43f521b883 100644
--- a/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/notification/notification-sidebar.component.spec.ts
@@ -27,6 +27,7 @@ import { NotificationSettingsService } from 'app/shared/user-settings/notificati
 import { MockNotificationSettingsService } from '../../../helpers/mocks/service/mock-notification-settings.service';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
 import { DocumentationButtonComponent } from 'app/shared/components/documentation-button/documentation-button.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('Notification Sidebar Component', () => {
     let notificationSidebarComponent: NotificationSidebarComponent;
@@ -60,7 +61,13 @@ describe('Notification Sidebar Component', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, MockDirective(NgbTooltip)],
-            declarations: [NotificationSidebarComponent, MockPipe(ArtemisTranslatePipe), MockRouterLinkDirective, MockComponent(DocumentationButtonComponent)],
+            declarations: [
+                NotificationSidebarComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockRouterLinkDirective,
+                MockComponent(DocumentationButtonComponent),
+                MockDirective(TranslateDirective),
+            ],
             providers: [
                 { provide: LocalStorageService, useClass: MockSyncStorage },
                 { provide: SessionStorageService, useClass: MockSyncStorage },
diff --git a/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts b/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts
index b1bc40312d47..b910e7893f56 100644
--- a/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/reset-repo-button.component.spec.ts
@@ -10,7 +10,7 @@ import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle.directive';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Subject } from 'rxjs';
 import { ResetRepoButtonComponent } from 'app/shared/components/reset-repo-button/reset-repo-button.component';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
diff --git a/src/test/javascript/spec/component/shared/result.component.spec.ts b/src/test/javascript/spec/component/shared/result.component.spec.ts
index 14e8bea7a123..d72fdc5f3bd2 100644
--- a/src/test/javascript/spec/component/shared/result.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/result.component.spec.ts
@@ -7,7 +7,7 @@ import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.se
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Result } from 'app/entities/result.model';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
-import { MockPipe } from 'ng-mocks';
+import { MockDirective, MockPipe } from 'ng-mocks';
 import { ArtemisTimeAgoPipe } from 'app/shared/pipes/artemis-time-ago.pipe';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
@@ -25,6 +25,7 @@ import { faTimesCircle } from '@fortawesome/free-solid-svg-icons';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
 
 import { of } from 'rxjs';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 const mockExercise: Exercise = {
     id: 1,
@@ -84,7 +85,7 @@ describe('ResultComponent', () => {
 
         await TestBed.configureTestingModule({
             imports: [ArtemisTestModule, NgbTooltipMocksModule],
-            declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe)],
+            declarations: [ResultComponent, TranslatePipeMock, MockPipe(ArtemisDatePipe), MockPipe(ArtemisTimeAgoPipe), MockDirective(TranslateDirective)],
             providers: [
                 { provide: NgbModal, useClass: MockNgbModalService },
                 { provide: ParticipationService, useValue: participationServiceMock },
@@ -258,13 +259,22 @@ describe('ResultComponent', () => {
 
     it('should display the correct message for FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE and FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE', () => {
         comp.templateStatus = ResultTemplateStatus.MISSING;
+
+        // Test for FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE
         comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE;
         fixture.detectChanges();
-        const compiled = fixture.nativeElement;
-        expect(compiled.textContent).toContain('artemisApp.result.missing.programmingFailedSubmission.message');
-        comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_OFFLINE_IDE;
+        let compiled = fixture.nativeElement;
+        let spanElement = compiled.querySelector('span[jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"]');
+        expect(spanElement).not.toBeNull();
+        expect(spanElement.getAttribute('jhiTranslate')).toBe('artemisApp.result.missing.programmingFailedSubmission.message');
+
+        // Test for FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE
+        comp.missingResultInfo = MissingResultInformation.FAILED_PROGRAMMING_SUBMISSION_ONLINE_IDE;
         fixture.detectChanges();
-        expect(compiled.textContent).toContain('artemisApp.result.missing.programmingFailedSubmission.message');
+        compiled = fixture.nativeElement;
+        spanElement = compiled.querySelector('span[jhiTranslate="artemisApp.result.missing.programmingFailedSubmission.message"]');
+        expect(spanElement).not.toBeNull();
+        expect(spanElement.getAttribute('jhiTranslate')).toBe('artemisApp.result.missing.programmingFailedSubmission.message');
     });
 
     it('should display the submitted text for SUBMITTED template status', () => {
diff --git a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts
index f9f5326d2e3c..a89b2264612a 100644
--- a/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/sidebar/conversation-options.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { ConversationOptionsComponent } from 'app/shared/sidebar/conversation-options/conversation-options.component';
@@ -26,6 +26,7 @@ import { defaultFirstLayerDialogOptions } from 'app/overview/course-conversation
 import { ConversationDetailDialogComponent } from 'app/overview/course-conversations/dialogs/conversation-detail-dialog/conversation-detail-dialog.component';
 import { MetisConversationService } from 'app/shared/metis/metis-conversation.service';
 import { isOneToOneChatDTO } from 'app/entities/metis/conversation/one-to-one-chat.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 const examples: (() => ConversationDTO)[] = [
     () => generateOneToOneChatDTO({}),
@@ -59,7 +60,7 @@ examples.forEach((conversation) => {
                         { path: 'courses/:courseId/exams/:examId', component: ExamDetailComponent },
                     ]),
                 ],
-                declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)],
+                declarations: [ConversationOptionsComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)],
                 providers: [
                     MockProvider(ConversationService),
                     MockProvider(MetisConversationService),
diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts
index e1e67128974d..bcffb82bc9c1 100644
--- a/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/sidebar/sidebar-accordion.component.spec.ts
@@ -63,10 +63,6 @@ describe('SidebarAccordionComponent', () => {
         jest.restoreAllMocks();
     });
 
-    it('should create', () => {
-        expect(component).toBeTruthy();
-    });
-
     it('should toggle collapse state for a group', () => {
         const groupKey = 'noDate';
         component.toggleGroupCategoryCollapse(groupKey);
@@ -89,10 +85,20 @@ describe('SidebarAccordionComponent', () => {
         component.searchValue = 'test';
         component.ngOnChanges();
 
+        expect(component.expandAll).toHaveBeenCalledOnce();
+    });
+
+    it('should call expandAll when filter is active', () => {
+        jest.spyOn(component, 'expandAll');
+
+        component.isFilterActive = true;
+        component.ngOnChanges();
+
         fixture.detectChanges();
 
-        expect(component.expandAll).toHaveBeenCalled();
+        expect(component.expandAll).toHaveBeenCalledOnce();
     });
+
     it('should correctly call setStoredCollapseState when searchValue is cleared', () => {
         const expectedStateAfterClear = component.collapseState;
         component.searchValue = 'initial value';
@@ -106,7 +112,7 @@ describe('SidebarAccordionComponent', () => {
 
         fixture.detectChanges();
 
-        expect(component.setStoredCollapseState).toHaveBeenCalled();
+        expect(component.setStoredCollapseState).toHaveBeenCalledOnce();
         expect(component.collapseState).toEqual(expectedStateAfterClear);
     });
 
diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar.component.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar.component.spec.ts
index b809b3e3708d..55ad12ae7776 100644
--- a/src/test/javascript/spec/component/shared/sidebar/sidebar.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/sidebar/sidebar.component.spec.ts
@@ -4,25 +4,39 @@ import { SidebarCardMediumComponent } from 'app/shared/sidebar/sidebar-card-medi
 import { SidebarCardItemComponent } from 'app/shared/sidebar/sidebar-card-item/sidebar-card-item.component';
 import { SidebarCardDirective } from 'app/shared/sidebar/sidebar-card.directive';
 import { ArtemisTestModule } from '../../../test.module';
-import { DebugElement } from '@angular/core';
 import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-
 import { By } from '@angular/platform-browser';
-import { MockModule, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { MockRouterLinkDirective } from '../../../helpers/mocks/directive/mock-router-link.directive';
 import { RouterModule } from '@angular/router';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { SidebarCardElement, SidebarData } from 'app/types/sidebar';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { ExerciseFilterModalComponent } from 'app/shared/exercise-filter/exercise-filter-modal.component';
+import { ExerciseFilterResults } from 'app/types/exercise-filter';
+import { EventEmitter } from '@angular/core';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { ExerciseType } from 'app/entities/exercise.model';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
 
 describe('SidebarComponent', () => {
     let component: SidebarComponent;
     let fixture: ComponentFixture<SidebarComponent>;
-    let debugElement: DebugElement;
+    let modalService: NgbModal;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockModule(RouterModule)],
+            imports: [
+                ArtemisTestModule,
+                MockModule(FormsModule),
+                MockModule(ReactiveFormsModule),
+                MockModule(RouterModule),
+                MockDirective(TranslateDirective),
+                MockComponent(ExerciseFilterModalComponent),
+            ],
             declarations: [
                 SidebarComponent,
                 SidebarCardMediumComponent,
@@ -33,18 +47,19 @@ describe('SidebarComponent', () => {
                 MockPipe(ArtemisTranslatePipe),
                 MockRouterLinkDirective,
             ],
+            providers: [MockProvider(NgbModal)],
         }).compileComponents();
     });
 
     beforeEach(() => {
         fixture = TestBed.createComponent(SidebarComponent);
         component = fixture.componentInstance;
-        debugElement = fixture.debugElement;
-        fixture.detectChanges();
-    });
+        modalService = TestBed.inject(NgbModal);
 
-    it('should create', () => {
-        expect(component).toBeTruthy();
+        component.sidebarData = {
+            sidebarType: 'default',
+        } as SidebarData;
+        fixture.detectChanges();
     });
 
     it('should filter sidebar items based on search criteria', () => {
@@ -71,11 +86,16 @@ describe('SidebarComponent', () => {
             groupByCategory: true,
             ungroupedData: [],
         };
-        fixture.detectChanges();
+        component.sidebarDataBeforeFiltering = {
+            groupByCategory: true,
+            ungroupedData: [] as SidebarCardElement[],
+        };
+
+        const noDataMessageElement = fixture.debugElement.query(By.css('.scrollable-item-content')).nativeElement;
 
-        const noDataMessageElement = debugElement.query(By.css('[jhiTranslate$=noDataFound]'));
         expect(noDataMessageElement).toBeTruthy();
-        expect(noDataMessageElement.nativeElement.getAttribute('jhiTranslate')).toBe('artemisApp.courseOverview.general.noDataFound');
+        // unfortunately the translation key is cut off in debug mode that seems to be used for testing
+        expect(noDataMessageElement.getAttribute('ng-reflect-jhi-translate')).toBe('artemisApp.courseOverview.gene');
     });
 
     it('should give the correct size for exercises', () => {
@@ -109,4 +129,118 @@ describe('SidebarComponent', () => {
         const size = component.getSize();
         expect(size).toBe('M');
     });
+
+    describe('openFilterExercisesLink', () => {
+        const FILTER_LINK_SELECTOR = '.text-primary a';
+
+        it('should display the filter link', () => {
+            component.showFilter = true;
+            fixture.detectChanges();
+
+            const filterLink = fixture.debugElement.query(By.css(FILTER_LINK_SELECTOR));
+
+            expect(filterLink).toBeTruthy();
+        });
+
+        it('should NOT display the filter link when sidebarType is NOT exercise', () => {
+            const filterLink = fixture.debugElement.query(By.css(FILTER_LINK_SELECTOR));
+
+            expect(filterLink).toBeFalsy();
+        });
+
+        it('should open modal on click with initialized filters', () => {
+            component.showFilter = true;
+            fixture.detectChanges();
+            const filterAppliedMock = new EventEmitter<ExerciseFilterResults>();
+            const mockReturnValue = {
+                result: Promise.resolve({}),
+                componentInstance: {
+                    sidebarData: {},
+                    exerciseFilters: {},
+                    filterApplied: filterAppliedMock,
+                },
+            } as NgbModalRef;
+            const openModalSpy = jest.spyOn(modalService, 'open').mockReturnValue(mockReturnValue);
+            const openFilterExercisesDialogSpy = jest.spyOn(component, 'openFilterExercisesDialog');
+            const initFilterOptionsSpy = jest.spyOn(component, 'initializeFilterOptions');
+
+            const filterLink = fixture.debugElement.query(By.css(FILTER_LINK_SELECTOR)).nativeElement;
+            filterLink.click();
+
+            expect(initFilterOptionsSpy).toHaveBeenCalledOnce();
+            expect(openFilterExercisesDialogSpy).toHaveBeenCalledOnce();
+            expect(openModalSpy).toHaveBeenCalledWith(ExerciseFilterModalComponent, { animation: true, backdrop: 'static', size: 'lg' });
+        });
+    });
+
+    describe('openFilterExercisesDialog', () => {
+        it('should subscribe to filterApplied from modal', () => {
+            const filterAppliedEmitter = new EventEmitter<ExerciseFilterResults>();
+            const mockModalRef: Partial<NgbModalRef> = {
+                componentInstance: {
+                    filterApplied: filterAppliedEmitter,
+                },
+            };
+            const openSpy = jest.spyOn(modalService, 'open').mockReturnValue(mockModalRef as NgbModalRef);
+            const subscribeSpy = jest.spyOn(filterAppliedEmitter, 'subscribe');
+
+            component.openFilterExercisesDialog();
+
+            expect(openSpy).toHaveBeenCalledOnce();
+            expect(subscribeSpy).toHaveBeenCalledOnce();
+        });
+
+        it('should update variables correctly when filterApplied is emitted', () => {
+            const filterAppliedEmitter = new EventEmitter<ExerciseFilterResults>();
+            const mockModalRef: Partial<NgbModalRef> = {
+                componentInstance: {
+                    filterApplied: filterAppliedEmitter,
+                },
+            };
+            jest.spyOn(modalService, 'open').mockReturnValue(mockModalRef as NgbModalRef);
+
+            const mockFilterResults: ExerciseFilterResults = {
+                filteredSidebarData: {
+                    sidebarType: 'exercise',
+                    groupByCategory: true,
+                    ungroupedData: [{ title: 'test sidebar card element' } as SidebarCardElement],
+                    groupedData: {
+                        testGroup: {
+                            entityData: [{ title: 'test group element' } as SidebarCardElement],
+                        },
+                    },
+                },
+                appliedExerciseFilters: {
+                    categoryFilter: {
+                        isDisplayed: true,
+                        options: [
+                            {
+                                category: new ExerciseCategory('test', undefined),
+                                searched: true,
+                            },
+                        ],
+                    },
+                    exerciseTypesFilter: {
+                        isDisplayed: true,
+                        options: [
+                            {
+                                name: 'testType',
+                                value: ExerciseType.PROGRAMMING,
+                                checked: true,
+                                icon: 'testIcon' as unknown as IconProp,
+                            },
+                        ],
+                    },
+                },
+                isFilterActive: true,
+            };
+
+            component.openFilterExercisesDialog();
+            filterAppliedEmitter.emit(mockFilterResults);
+
+            expect(component.sidebarData).toEqual(mockFilterResults.filteredSidebarData);
+            expect(component.exerciseFilters).toEqual(mockFilterResults.appliedExerciseFilters);
+            expect(component.isFilterActive).toBeTrue();
+        });
+    });
 });
diff --git a/src/test/javascript/spec/component/shared/sidebar/sidebar.helper.spec.ts b/src/test/javascript/spec/component/shared/sidebar/sidebar.helper.spec.ts
new file mode 100644
index 000000000000..a29596e12685
--- /dev/null
+++ b/src/test/javascript/spec/component/shared/sidebar/sidebar.helper.spec.ts
@@ -0,0 +1,329 @@
+import {
+    getAchievablePointsAndAchievedScoreFilterOptions,
+    getExerciseCategoryFilterOptions,
+    getExerciseDifficultyFilterOptions,
+    getExerciseTypeFilterOptions,
+} from 'app/shared/sidebar/sidebar.helper';
+import { SidebarCardElement, SidebarData } from 'app/types/sidebar';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+import { DifficultyLevel, Exercise, ExerciseType, getIcon } from 'app/entities/exercise.model';
+import { StudentParticipation } from 'app/entities/participation/student-participation.model';
+import { Result } from 'app/entities/result.model';
+
+const EXERCISE_1 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category2', '#1b97ca')], maxPoints: 10 } as Exercise;
+const EXERCISE_2 = { categories: [new ExerciseCategory('category3', '#0d3cc2'), new ExerciseCategory('category4', '#6ae8ac')], maxPoints: 5 } as Exercise;
+const EXERCISE_3 = { categories: [new ExerciseCategory('category5', '#691b0b')], maxPoints: 2 } as Exercise;
+
+/** contains 1 duplicate categories and maxPoints with {@link EXERCISE_1} */
+const EXERCISE_4 = { categories: [new ExerciseCategory('category1', '#691b0b'), new ExerciseCategory('category8', '#1b97ca')], maxPoints: 10 } as Exercise;
+const EXERCISE_5 = { categories: [] as ExerciseCategory[], maxPoints: 20 } as Exercise;
+
+const SIDEBAR_CARD_ELEMENT_1 = {
+    exercise: EXERCISE_1,
+    type: ExerciseType.TEXT,
+    difficulty: DifficultyLevel.HARD,
+    studentParticipation: { results: [{ score: 7.7 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_2 = {
+    exercise: EXERCISE_2,
+    type: ExerciseType.PROGRAMMING,
+    difficulty: DifficultyLevel.EASY,
+    studentParticipation: { results: [{ score: 82.3 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_3 = {
+    exercise: EXERCISE_3,
+    type: ExerciseType.QUIZ,
+    difficulty: DifficultyLevel.MEDIUM,
+    studentParticipation: { results: [{ score: 44.5 } as Result] } as StudentParticipation,
+} as SidebarCardElement;
+const SIDEBAR_CARD_ELEMENT_4 = { exercise: EXERCISE_4 } as SidebarCardElement;
+
+/** contains duplicated type and difficulty with {@link SIDEBAR_CARD_ELEMENT_2}*/
+const SIDEBAR_CARD_ELEMENT_5 = { exercise: EXERCISE_5, type: ExerciseType.PROGRAMMING, difficulty: DifficultyLevel.EASY } as SidebarCardElement;
+
+describe('getExerciseCategoryFilterOptions', () => {
+    it('should return all exercise categories', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            groupedData: {
+                dueSoon: {
+                    entityData: [],
+                },
+                noDate: {
+                    entityData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2],
+                },
+                past: {
+                    entityData: [SIDEBAR_CARD_ELEMENT_3],
+                },
+            },
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3],
+        };
+
+        const exerciseCategories = getExerciseCategoryFilterOptions(sidebarData, undefined);
+        expect(exerciseCategories).toEqual({
+            isDisplayed: true,
+            options: [
+                { category: new ExerciseCategory('category1', '#691b0b'), searched: false },
+                { category: new ExerciseCategory('category2', '#1b97ca'), searched: false },
+                { category: new ExerciseCategory('category3', '#0d3cc2'), searched: false },
+                { category: new ExerciseCategory('category4', '#6ae8ac'), searched: false },
+                { category: new ExerciseCategory('category5', '#691b0b'), searched: false },
+            ],
+        });
+    });
+
+    it('should filter duplicates', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_4],
+        };
+
+        const exerciseCategories = getExerciseCategoryFilterOptions(sidebarData, undefined);
+        expect(exerciseCategories).toEqual({
+            isDisplayed: true,
+            options: [
+                { category: new ExerciseCategory('category1', '#691b0b'), searched: false },
+                { category: new ExerciseCategory('category2', '#1b97ca'), searched: false },
+                { category: new ExerciseCategory('category8', '#1b97ca'), searched: false },
+            ],
+        });
+    });
+
+    it('should sort categories alphanumerical', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_1],
+        };
+
+        const exerciseCategories = getExerciseCategoryFilterOptions(sidebarData, undefined);
+        expect(exerciseCategories).toEqual({
+            isDisplayed: true,
+            options: [
+                { category: new ExerciseCategory('category1', '#691b0b'), searched: false },
+                { category: new ExerciseCategory('category2', '#1b97ca'), searched: false },
+                { category: new ExerciseCategory('category3', '#0d3cc2'), searched: false },
+                { category: new ExerciseCategory('category4', '#6ae8ac'), searched: false },
+            ],
+        });
+    });
+
+    it('should not be displayed if no categories are available', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const exerciseCategories = getExerciseCategoryFilterOptions(sidebarData, undefined);
+        expect(exerciseCategories).toEqual({
+            isDisplayed: false,
+            options: [],
+        });
+    });
+
+    it('should directly return if already initialized', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2],
+        };
+
+        const exerciseCategories = getExerciseCategoryFilterOptions(sidebarData, {
+            categoryFilter: {
+                isDisplayed: false,
+                options: [],
+            },
+        });
+        expect(exerciseCategories).toEqual({
+            isDisplayed: false,
+            options: [],
+        });
+    });
+});
+
+describe('getExerciseTypeFilterOptions', () => {
+    it('should return present exercise types and sort them properly (same order as instructor creation)', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3, SIDEBAR_CARD_ELEMENT_4, SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const exerciseTypesFilter = getExerciseTypeFilterOptions(sidebarData, undefined);
+        expect(exerciseTypesFilter).toEqual({
+            isDisplayed: true,
+            options: [
+                { name: 'artemisApp.courseStatistics.programming', value: ExerciseType.PROGRAMMING, checked: false, icon: getIcon(ExerciseType.PROGRAMMING) },
+                { name: 'artemisApp.courseStatistics.quiz', value: ExerciseType.QUIZ, checked: false, icon: getIcon(ExerciseType.QUIZ) },
+                { name: 'artemisApp.courseStatistics.text', value: ExerciseType.TEXT, checked: false, icon: getIcon(ExerciseType.TEXT) },
+            ],
+        });
+    });
+
+    it('should not contain duplicates', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const exerciseTypesFilter = getExerciseTypeFilterOptions(sidebarData, undefined);
+        expect(exerciseTypesFilter).toEqual({
+            isDisplayed: true,
+            options: [
+                { name: 'artemisApp.courseStatistics.programming', value: ExerciseType.PROGRAMMING, checked: false, icon: getIcon(ExerciseType.PROGRAMMING) },
+                { name: 'artemisApp.courseStatistics.text', value: ExerciseType.TEXT, checked: false, icon: getIcon(ExerciseType.TEXT) },
+            ],
+        });
+    });
+
+    it('should directly return if already initialized', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2],
+        };
+
+        const exerciseTypesFilter = getExerciseTypeFilterOptions(sidebarData, {
+            exerciseTypesFilter: {
+                isDisplayed: false,
+                options: [],
+            },
+        });
+        expect(exerciseTypesFilter).toEqual({
+            isDisplayed: false,
+            options: [],
+        });
+    });
+});
+
+describe('getExerciseDifficultyFilterOptions', () => {
+    it('should return present exercise difficulties and sort them ascending', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3, SIDEBAR_CARD_ELEMENT_4, SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const difficultyFilter = getExerciseDifficultyFilterOptions(sidebarData, undefined);
+        expect(difficultyFilter).toEqual({
+            isDisplayed: true,
+            options: [
+                { name: 'artemisApp.exercise.easy', value: DifficultyLevel.EASY, checked: false },
+                { name: 'artemisApp.exercise.medium', value: DifficultyLevel.MEDIUM, checked: false },
+                { name: 'artemisApp.exercise.hard', value: DifficultyLevel.HARD, checked: false },
+            ],
+        });
+    });
+
+    it('should not contain duplicates', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const difficultyFilter = getExerciseDifficultyFilterOptions(sidebarData, undefined);
+        expect(difficultyFilter).toEqual({
+            isDisplayed: true,
+            options: [
+                { name: 'artemisApp.exercise.easy', value: DifficultyLevel.EASY, checked: false },
+                { name: 'artemisApp.exercise.hard', value: DifficultyLevel.HARD, checked: false },
+            ],
+        });
+    });
+
+    it('should directly return if already initialized', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2],
+        };
+
+        const difficultyFilter = getExerciseDifficultyFilterOptions(sidebarData, {
+            difficultyFilter: {
+                isDisplayed: false,
+                options: [],
+            },
+        });
+        expect(difficultyFilter).toEqual({
+            isDisplayed: false,
+            options: [],
+        });
+    });
+});
+
+describe('getAchievablePointsAndAchievedScoreFilterOptions', () => {
+    const expectedFilterForFirstThreePresentExercises = {
+        achievablePoints: {
+            isDisplayed: true,
+            filter: {
+                generalMin: 2,
+                generalMax: 10,
+                selectedMin: 2,
+                selectedMax: 10,
+                step: 1,
+            },
+        },
+        achievedScore: {
+            isDisplayed: true,
+            filter: {
+                generalMax: 85,
+                generalMin: 5,
+                selectedMax: 85,
+                selectedMin: 5,
+                step: 5,
+            },
+        },
+    };
+
+    it('should return present exercise point and score range', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1, SIDEBAR_CARD_ELEMENT_2, SIDEBAR_CARD_ELEMENT_3],
+        };
+
+        const scoreAndPointsFilterOptions = getAchievablePointsAndAchievedScoreFilterOptions(sidebarData, undefined);
+        expect(scoreAndPointsFilterOptions).toEqual(expectedFilterForFirstThreePresentExercises);
+    });
+
+    it('should set scores filter to not displayed if no scores are present', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_4, SIDEBAR_CARD_ELEMENT_5],
+        };
+
+        const scoreAndPointsFilterOptions = getAchievablePointsAndAchievedScoreFilterOptions(sidebarData, undefined);
+
+        expect(scoreAndPointsFilterOptions).toEqual({
+            achievablePoints: {
+                isDisplayed: true,
+                filter: {
+                    generalMax: 20,
+                    generalMin: 10,
+                    selectedMax: 20,
+                    selectedMin: 10,
+                    step: 1,
+                },
+            },
+            achievedScore: {
+                isDisplayed: false,
+                filter: {
+                    generalMax: -Infinity,
+                    generalMin: Infinity,
+                    selectedMax: -Infinity,
+                    selectedMin: Infinity,
+                    step: 1,
+                },
+            },
+        });
+    });
+
+    it('should directly return if already initialized and filters are not applied', () => {
+        const sidebarData: SidebarData = {
+            groupByCategory: true,
+            ungroupedData: [SIDEBAR_CARD_ELEMENT_1],
+        };
+
+        const scoreAndPointsFilterOptions = getAchievablePointsAndAchievedScoreFilterOptions(sidebarData, {
+            achievablePoints: expectedFilterForFirstThreePresentExercises.achievablePoints,
+            achievedScore: expectedFilterForFirstThreePresentExercises.achievedScore,
+        });
+        expect(scoreAndPointsFilterOptions).toEqual({
+            achievablePoints: expectedFilterForFirstThreePresentExercises.achievablePoints,
+            achievedScore: expectedFilterForFirstThreePresentExercises.achievedScore,
+        });
+    });
+});
diff --git a/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts b/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts
index d7ac41fb943a..3df720eeefff 100644
--- a/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/start-practice-mode-button.component.spec.ts
@@ -12,7 +12,7 @@ import { FeatureToggleDirective } from 'app/shared/feature-toggle/feature-toggle
 import { StartPracticeModeButtonComponent } from 'app/shared/components/start-practice-mode-button/start-practice-mode-button.component';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { Subject } from 'rxjs';
 import dayjs from 'dayjs/esm';
diff --git a/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts b/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts
index f416514a047b..05f3eb734dee 100644
--- a/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/submission-policy-update.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { LockRepositoryPolicy, SubmissionPenaltyPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { SubmissionPolicyUpdateComponent } from 'app/exercises/shared/submission-policy/submission-policy-update.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/shared/updating-result.component.spec.ts b/src/test/javascript/spec/component/shared/updating-result.component.spec.ts
index afa519d2640b..9b8c8b9435e9 100644
--- a/src/test/javascript/spec/component/shared/updating-result.component.spec.ts
+++ b/src/test/javascript/spec/component/shared/updating-result.component.spec.ts
@@ -8,7 +8,7 @@ import { ProgrammingSubmissionService, ProgrammingSubmissionState } from 'app/ex
 import { MockProgrammingSubmissionService } from '../../helpers/mocks/service/mock-programming-submission.service';
 import { triggerChanges } from '../../helpers/utils/general.utils';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { UpdatingResultComponent } from 'app/exercises/shared/result/updating-result.component';
 import { ResultComponent } from 'app/exercises/shared/result/result.component';
 import { Result } from 'app/entities/result.model';
diff --git a/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts b/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts
index 1dcb3a517efd..da3219405bd2 100644
--- a/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts
+++ b/src/test/javascript/spec/component/standardized-competencies/detail/knowledge-area-edit.component.spec.ts
@@ -5,7 +5,6 @@ import { KnowledgeAreaEditComponent } from 'app/admin/standardized-competencies/
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component';
 import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
@@ -13,6 +12,7 @@ import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbToolt
 import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
 import { KnowledgeAreaDTO } from 'app/entities/competency/standardized-competency.model';
 import { By } from '@angular/platform-browser';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('KnowledgeAreaEditComponent', () => {
     let componentFixture: ComponentFixture<KnowledgeAreaEditComponent>;
@@ -44,7 +44,7 @@ describe('KnowledgeAreaEditComponent', () => {
                 MockComponent(ButtonComponent),
                 TranslatePipeMock,
                 MockPipe(HtmlForMarkdownPipe),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(TaxonomySelectComponent),
                 MockDirective(TranslateDirective),
                 MockDirective(DeleteButtonDirective),
diff --git a/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts b/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts
index b33c93d1eabd..35d65359675f 100644
--- a/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts
+++ b/src/test/javascript/spec/component/standardized-competencies/detail/standardized-competency-edit.spec.ts
@@ -6,13 +6,13 @@ import { ButtonComponent } from 'app/shared/components/button.component';
 import { CompetencyTaxonomy } from 'app/entities/competency.model';
 import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { HtmlForMarkdownPipe } from 'app/shared/pipes/html-for-markdown.pipe';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { TaxonomySelectComponent } from 'app/course/competencies/taxonomy-select/taxonomy-select.component';
 import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
 import { DeleteButtonDirective } from 'app/shared/delete-dialog/delete-button.directive';
 import { KnowledgeAreaDTO, StandardizedCompetencyDTO } from 'app/entities/competency/standardized-competency.model';
+import { MarkdownEditorMonacoComponent } from 'app/shared/markdown-editor/monaco/markdown-editor-monaco.component';
 
 describe('StandardizedCompetencyEditComponent', () => {
     let componentFixture: ComponentFixture<StandardizedCompetencyEditComponent>;
@@ -47,7 +47,7 @@ describe('StandardizedCompetencyEditComponent', () => {
                 MockComponent(ButtonComponent),
                 TranslatePipeMock,
                 MockPipe(HtmlForMarkdownPipe),
-                MockComponent(MarkdownEditorComponent),
+                MockComponent(MarkdownEditorMonacoComponent),
                 MockComponent(TaxonomySelectComponent),
                 MockDirective(TranslateDirective),
                 MockDirective(DeleteButtonDirective),
diff --git a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts
index feb25f210d85..2626dffc45e1 100644
--- a/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts
+++ b/src/test/javascript/spec/component/statistics/statistics-average-score-graph.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
+import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { PerformanceInterval, StatisticsAverageScoreGraphComponent } from 'app/shared/statistics-graph/statistics-average-score-graph.component';
 import { BarChartModule } from '@swimlane/ngx-charts';
@@ -11,6 +11,8 @@ import { CourseManagementStatisticsModel } from 'app/entities/quiz/course-manage
 import { ArtemisNavigationUtilService } from 'app/utils/navigation.utils';
 import { ChartExerciseTypeFilter } from 'app/shared/chart/chart-exercise-type-filter';
 import { ChartCategoryFilter } from 'app/shared/chart/chart-category-filter';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
 
 describe('StatisticsAverageScoreGraphComponent', () => {
     let fixture: ComponentFixture<StatisticsAverageScoreGraphComponent>;
@@ -27,35 +29,35 @@ describe('StatisticsAverageScoreGraphComponent', () => {
         exerciseName: 'FacadePattern',
         averageScore: 0,
         exerciseType: ExerciseType.TEXT,
-        categories: [{ color: '#347aeb', category: 'structural pattern' }],
+        categories: [new ExerciseCategory('structural pattern', '#347aeb')],
     };
     const exercise2 = {
         exerciseId: 2,
         exerciseName: 'BridgePattern',
         averageScore: 20,
         exerciseType: ExerciseType.PROGRAMMING,
-        categories: [{ color: '#347aeb', category: 'structural pattern' }],
+        categories: [new ExerciseCategory('structural pattern', '#347aeb')],
     };
     const exercise3 = {
         exerciseId: 3,
         exerciseName: 'VisitorPattern',
         averageScore: 25,
         exerciseType: ExerciseType.FILE_UPLOAD,
-        categories: [{ color: '#c034eb', category: 'behavioral pattern' }],
+        categories: [new ExerciseCategory('behavioral pattern', '#c034eb')],
     };
     const exercise4 = {
         exerciseId: 4,
         exerciseName: 'AdapterPattern',
         averageScore: 35,
         exerciseType: ExerciseType.QUIZ,
-        categories: [{ color: '#347aeb', category: 'structural pattern' }],
+        categories: [new ExerciseCategory('structural pattern', '#347aeb')],
     };
     const exercise5 = {
         exerciseId: 5,
         exerciseName: 'ProxyPattern',
         averageScore: 40,
         exerciseType: ExerciseType.MODELING,
-        categories: [{ color: '#347aeb', category: 'structural pattern' }],
+        categories: [new ExerciseCategory('structural pattern', '#347aeb')],
     };
     const exercise6 = { exerciseId: 6, exerciseName: 'BuilderPattern', averageScore: 50, exerciseType: ExerciseType.QUIZ };
     const exercise7 = { exerciseId: 7, exerciseName: 'BehaviouralPattern', averageScore: 55, exerciseType: ExerciseType.PROGRAMMING };
@@ -77,7 +79,7 @@ describe('StatisticsAverageScoreGraphComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule, RouterTestingModule.withRoutes([]), MockModule(BarChartModule)],
-            declarations: [StatisticsAverageScoreGraphComponent, MockPipe(ArtemisTranslatePipe)],
+            declarations: [StatisticsAverageScoreGraphComponent, MockPipe(ArtemisTranslatePipe), MockDirective(TranslateDirective)],
             providers: [MockProvider(ArtemisNavigationUtilService), MockProvider(ChartExerciseTypeFilter), MockProvider(ChartCategoryFilter)],
         })
             .compileComponents()
diff --git a/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts b/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts
index 156a40652c68..1083ee4d31fc 100644
--- a/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts
+++ b/src/test/javascript/spec/component/team/team-exercise-search.component.spec.ts
@@ -4,7 +4,7 @@ import dayjs from 'dayjs/esm';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 
 import { CourseManagementService } from 'app/course/manage/course-management.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TeamExerciseSearchComponent } from 'app/exercises/shared/team/team-exercise-search/team-exercise-search.component';
 import { MockCourseManagementService } from '../../helpers/mocks/service/mock-course-management.service';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
diff --git a/src/test/javascript/spec/component/team/team-update-dialog.component.spec.ts b/src/test/javascript/spec/component/team/team-update-dialog.component.spec.ts
index 7cc7027493d4..b3e76d5a92bb 100644
--- a/src/test/javascript/spec/component/team/team-update-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/team/team-update-dialog.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, flush, tick } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { ArtemisTestModule } from '../../test.module';
@@ -20,8 +19,6 @@ import { TeamStudentSearchComponent } from 'app/exercises/shared/team/team-stude
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TeamUpdateDialogComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
     let comp: TeamUpdateDialogComponent;
     let fixture: ComponentFixture<TeamUpdateDialogComponent>;
     let debugElement: DebugElement;
diff --git a/src/test/javascript/spec/component/team/teams.component.spec.ts b/src/test/javascript/spec/component/team/teams.component.spec.ts
index 7a38a8298731..b5a874b28243 100644
--- a/src/test/javascript/spec/component/team/teams.component.spec.ts
+++ b/src/test/javascript/spec/component/team/teams.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
 import { ArtemisTestModule } from '../../test.module';
@@ -27,9 +26,6 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { teamRoute } from 'app/exercises/shared/team/team.route';
 
 describe('TeamsComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
-
     let comp: TeamsComponent;
     let fixture: ComponentFixture<TeamsComponent>;
     let debugElement: DebugElement;
diff --git a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts
index 653989626b68..6bfb8cf13d4f 100644
--- a/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/text-editor/text-editor.component.spec.ts
@@ -1,4 +1,3 @@
-import * as ace from 'brace';
 import { DebugElement } from '@angular/core';
 import dayjs from 'dayjs/esm';
 import { ActivatedRoute, convertToParamMap } from '@angular/router';
@@ -17,12 +16,12 @@ import { TextResultComponent } from 'app/exercises/text/participate/text-result/
 import { SubmissionResultStatusComponent } from 'app/overview/submission-result-status.component';
 import { TextEditorComponent } from 'app/exercises/text/participate/text-editor.component';
 import { textEditorRoute } from 'app/exercises/text/participate/text-editor.route';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { ButtonComponent } from 'app/shared/components/button.component';
 import { Result } from 'app/entities/result.model';
 import { ComplaintsFormComponent } from 'app/complaints/form/complaints-form.component';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { MockTextSubmissionService } from '../../helpers/mocks/service/mock-text-submission.service';
 import { Language } from 'app/entities/course.model';
@@ -44,9 +43,6 @@ import { ComplaintsStudentViewComponent } from 'app/complaints/complaints-for-st
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TextEditorComponent', () => {
-    // needed to make sure ace is defined
-    ace.acequire('ace/ext/modelist.js');
-
     let comp: TextEditorComponent;
     let fixture: ComponentFixture<TextEditorComponent>;
     let debugElement: DebugElement;
diff --git a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts
index 355bed4320fa..28bd19ff7ed4 100644
--- a/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts
+++ b/src/test/javascript/spec/component/text-exercise/example-text-submission.component.spec.ts
@@ -8,9 +8,9 @@ import { AssessmentInstructionsComponent } from 'app/assessment/assessment-instr
 import { ExampleSubmission } from 'app/entities/example-submission.model';
 import { Feedback, FeedbackCorrectionErrorType } from 'app/entities/feedback.model';
 import { Result } from 'app/entities/result.model';
-import { TextBlock } from 'app/entities/text-block.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { TutorParticipationService } from 'app/exercises/shared/dashboards/tutor/tutor-participation.service';
 import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
@@ -27,7 +27,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { of, throwError } from 'rxjs';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { ArtemisTestModule } from '../../test.module';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { UnreferencedFeedbackComponent } from 'app/exercises/shared/unreferenced-feedback/unreferenced-feedback.component';
 import { AlertService } from 'app/core/util/alert.service';
 import { DebugElement } from '@angular/core';
diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts
index 8289a221fc91..b95a4cd7242a 100644
--- a/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts
+++ b/src/test/javascript/spec/component/text-exercise/text-exercise-detail.component.spec.ts
@@ -6,7 +6,7 @@ import { ArtemisTestModule } from '../../test.module';
 import { TextExerciseDetailComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-detail.component';
 import { Course } from 'app/entities/course.model';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-activated-route';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts
index 53a691f7182d..acbd27f05fb4 100644
--- a/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts
+++ b/src/test/javascript/spec/component/text-exercise/text-exercise-row-buttons.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
 import { ArtemisTestModule } from '../../test.module';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { TextExerciseRowButtonsComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-row-buttons.component';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
 import { EventManager } from 'app/core/util/event-manager.service';
diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts
index aa0f2c889832..78fea1728c50 100644
--- a/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts
+++ b/src/test/javascript/spec/component/text-exercise/text-exercise-update.component.spec.ts
@@ -5,7 +5,7 @@ import { ActivatedRoute, UrlSegment } from '@angular/router';
 import { ArtemisTestModule } from '../../test.module';
 import { TextExerciseUpdateComponent } from 'app/exercises/text/manage/text-exercise/text-exercise-update.component';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
@@ -13,7 +13,7 @@ import { MockActivatedRoute } from '../../helpers/mocks/activated-route/mock-act
 import { Course } from 'app/entities/course.model';
 import dayjs from 'dayjs/esm';
 import { Subject, of, throwError } from 'rxjs';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { TranslateService } from '@ngx-translate/core';
 import { MockProvider } from 'ng-mocks';
 import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.service';
@@ -23,6 +23,7 @@ import { NgModel } from '@angular/forms';
 import { ExerciseTitleChannelNameComponent } from 'app/exercises/shared/exercise-title-channel-name/exercise-title-channel-name.component';
 import { ExerciseUpdatePlagiarismComponent } from 'app/exercises/shared/plagiarism/exercise-update-plagiarism/exercise-update-plagiarism.component';
 import { TeamConfigFormGroupComponent } from 'app/exercises/shared/team-config-form-group/team-config-form-group.component';
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
 
 describe('TextExercise Management Update Component', () => {
     let comp: TextExerciseUpdateComponent;
@@ -363,7 +364,7 @@ describe('TextExercise Management Update Component', () => {
     it('should updateCategories properly by making category available for selection again when removing it', () => {
         comp.textExercise = new TextExercise(undefined, undefined);
         comp.exerciseCategories = [];
-        const newCategories = [{ category: 'Easy' }, { category: 'Hard' }];
+        const newCategories = [new ExerciseCategory('Easy', undefined), new ExerciseCategory('Hard', undefined)];
 
         comp.updateCategories(newCategories);
 
diff --git a/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts b/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts
index 2f47ef5e53c6..771035e33ff7 100644
--- a/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts
+++ b/src/test/javascript/spec/component/text-exercise/text-exercise.component.spec.ts
@@ -8,7 +8,7 @@ import { ActivatedRoute, convertToParamMap } from '@angular/router';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { ArtemisTestModule } from '../../test.module';
 import { TextExerciseComponent } from 'app/exercises/text/manage/text-exercise/text-exercise.component';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { Course } from 'app/entities/course.model';
diff --git a/src/test/javascript/spec/component/text-result/text-result.component.spec.ts b/src/test/javascript/spec/component/text-result/text-result.component.spec.ts
index 579efafdff29..8fd19cfd4d3b 100644
--- a/src/test/javascript/spec/component/text-result/text-result.component.spec.ts
+++ b/src/test/javascript/spec/component/text-result/text-result.component.spec.ts
@@ -9,9 +9,9 @@ import { TextResultComponent } from 'app/exercises/text/participate/text-result/
 import { MockTranslateService } from '../../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
 import { Result } from 'app/entities/result.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Feedback } from 'app/entities/feedback.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { TextResultBlock } from 'app/exercises/text/participate/text-result/text-result-block';
 import { GradingInstruction } from 'app/exercises/shared/structured-grading-criterion/grading-instruction.model';
 import { faCheck, faCircle, faTimes } from '@fortawesome/free-solid-svg-icons';
diff --git a/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts
index bf1801eb0362..5887bcf83e4e 100644
--- a/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts
+++ b/src/test/javascript/spec/component/text-submission-assessment/manual-textblock-selection.component.spec.ts
@@ -4,11 +4,11 @@ import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/man
 import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component';
 import { MockComponent, MockProvider } from 'ng-mocks';
 import { By } from '@angular/platform-browser';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { ManualTextSelectionComponent, wordSelection } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component';
 import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlock } from 'app/entities/text-block.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlock } from 'app/entities/text/text-block.model';
 import { TextSelectDirective } from 'app/exercises/text/shared/text-select.directive';
 
 describe('ManualTextblockSelectionComponent', () => {
diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts
index 6c98166d5210..27816633072e 100644
--- a/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts
+++ b/src/test/javascript/spec/component/text-submission-assessment/text-assessment-area.component.spec.ts
@@ -2,11 +2,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TextAssessmentAreaComponent } from 'app/exercises/text/assess/text-assessment-area/text-assessment-area.component';
 import { ArtemisTestModule } from '../../test.module';
 import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { By } from '@angular/platform-browser';
-import { MockComponent } from 'ng-mocks';
+import { MockComponent, MockDirective } from 'ng-mocks';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TextAssessmentAreaComponent', () => {
     let component: TextAssessmentAreaComponent;
@@ -15,7 +16,13 @@ describe('TextAssessmentAreaComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ArtemisTestModule],
-            declarations: [TextAssessmentAreaComponent, MockComponent(TextblockAssessmentCardComponent), MockComponent(ManualTextblockSelectionComponent), TranslatePipeMock],
+            declarations: [
+                TextAssessmentAreaComponent,
+                MockComponent(TextblockAssessmentCardComponent),
+                MockComponent(ManualTextblockSelectionComponent),
+                TranslatePipeMock,
+                MockDirective(TranslateDirective),
+            ],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts
index 4cdcd197c837..1a550e93428c 100644
--- a/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts
+++ b/src/test/javascript/spec/component/text-submission-assessment/text-submission-assessment.component.spec.ts
@@ -5,15 +5,15 @@ import { By } from '@angular/platform-browser';
 import { of, throwError } from 'rxjs';
 import { AssessmentLayoutComponent } from 'app/assessment/assessment-layout/assessment-layout.component';
 import { TextAssessmentAreaComponent } from 'app/exercises/text/assess/text-assessment-area/text-assessment-area.component';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component';
 import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ParticipationType } from 'app/entities/participation/participation.model';
 import { SubmissionExerciseType, SubmissionType, getLatestSubmissionResult } from 'app/entities/submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import dayjs from 'dayjs/esm';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
@@ -22,7 +22,7 @@ import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.compo
 import { Course } from 'app/entities/course.model';
 import { ManualTextblockSelectionComponent } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
-import { TextBlock, TextBlockType } from 'app/entities/text-block.model';
+import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
 import { AlertService } from 'app/core/util/alert.service';
@@ -45,7 +45,8 @@ import { AssessmentAfterComplaint } from 'app/complaints/complaints-for-tutor/co
 import { TextAssessmentBaseComponent } from 'app/exercises/text/assess/text-assessment-base.component';
 import { AthenaService } from 'app/assessment/athena.service';
 import { MockAthenaService } from '../../helpers/mocks/service/mock-athena-service';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TextSubmissionAssessmentComponent', () => {
     let component: TextSubmissionAssessmentComponent;
@@ -160,6 +161,7 @@ describe('TextSubmissionAssessmentComponent', () => {
                 MockComponent(ResizeableContainerComponent),
                 MockComponent(UnreferencedFeedbackComponent),
                 MockPipe(ArtemisTranslatePipe),
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 { provide: ActivatedRoute, useValue: mockActivatedRoute },
diff --git a/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts
index a11f7b7f6692..4cce34baf424 100644
--- a/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts
+++ b/src/test/javascript/spec/component/text-submission-assessment/textblock-assessment-card.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
 import { TextblockAssessmentCardComponent } from 'app/exercises/text/assess/textblock-assessment-card/textblock-assessment-card.component';
 import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { By } from '@angular/platform-browser';
 import { MockComponent, MockDirective, MockProvider } from 'ng-mocks';
 import { FaLayersComponent } from '@fortawesome/angular-fontawesome';
@@ -10,8 +10,8 @@ import { GradingInstruction } from 'app/exercises/shared/structured-grading-crit
 import { AssessmentCorrectionRoundBadgeComponent } from 'app/assessment/unreferenced-feedback-detail/assessment-correction-round-badge/assessment-correction-round-badge.component';
 import { TranslatePipeMock } from '../../helpers/mocks/service/mock-translate.service';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { StructuredGradingCriterionService } from 'app/exercises/shared/structured-grading-criterion/structured-grading-criterion.service';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
diff --git a/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts b/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts
index 6c08b06ec59a..2405cc4cfd97 100644
--- a/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts
+++ b/src/test/javascript/spec/component/text-submission-assessment/textblock-feedback-editor.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
 import { TextblockFeedbackEditorComponent } from 'app/exercises/text/assess/textblock-feedback-editor/textblock-feedback-editor.component';
 import { Feedback, FeedbackCorrectionErrorType, FeedbackType } from 'app/entities/feedback.model';
-import { TextBlock, TextBlockType } from 'app/entities/text-block.model';
+import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model';
 import { ConfirmIconComponent } from 'app/shared/confirm-icon/confirm-icon.component';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NgbModal, NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
@@ -16,7 +16,7 @@ import { MockNgbModalService } from '../../helpers/mocks/service/mock-ngb-modal.
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockTranslateService, TranslateTestingModule } from '../../helpers/mocks/service/mock-translate.service';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { NgModel } from '@angular/forms';
 import { TranslateDirective } from 'app/shared/language/translate.directive';
 import { TextblockFeedbackDropdownComponent } from 'app/exercises/text/assess/textblock-feedback-editor/dropdown/textblock-feedback-dropdown.component';
diff --git a/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts b/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts
index db879a19b482..478418b4d8a2 100644
--- a/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts
+++ b/src/test/javascript/spec/component/text/manual-text-selection.component.spec.ts
@@ -1,15 +1,15 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ArtemisTestModule } from '../../test.module';
 import { ManualTextSelectionComponent } from 'app/exercises/text/shared/manual-text-selection/manual-text-selection.component';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlock, TextBlockType } from 'app/entities/text-block.model';
+import { TextBlock, TextBlockType } from 'app/entities/text/text-block.model';
 import { MockProvider } from 'ng-mocks';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { ActivatedRoute } from '@angular/router';
 import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { TextBlockRefGroup } from 'app/exercises/text/assess/manual-textblock-selection/manual-textblock-selection.component';
 
 describe('ManualTextSelectionComponent', () => {
diff --git a/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts b/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts
index 95b4a23b2f3a..d8ca84cd934d 100644
--- a/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts
+++ b/src/test/javascript/spec/component/tutor-leaderboard/tutor-leaderboard.component.spec.ts
@@ -11,7 +11,7 @@ import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { MockRouter } from '../../helpers/mocks/mock-router';
 import { Course } from 'app/entities/course.model';
 import { Exercise } from 'app/entities/exercise.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 
 describe('TutorLeaderboardComponent', () => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts
index 1f8fa36ce3c9..de181aa7add3 100644
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-group-card.component.spec.ts
@@ -1,13 +1,15 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { CourseTutorialGroupCardComponent } from 'app/overview/course-tutorial-groups/course-tutorial-group-card/course-tutorial-group-card.component';
-import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockComponent, MockPipe } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
+import { TranslateService } from '@ngx-translate/core';
 import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
 import { User } from 'app/core/user/user.model';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 import { Course } from 'app/entities/course.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
+import { MockComponent, MockDirective } from 'ng-mocks';
+import { TranslatePipeMock } from '../../../helpers/mocks/service/mock-translate.service';
 
 describe('CourseTutorialGroupCardComponent', () => {
     let component: CourseTutorialGroupCardComponent;
@@ -18,7 +20,16 @@ describe('CourseTutorialGroupCardComponent', () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             imports: [RouterTestingModule.withRoutes([])],
-            declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), MockPipe(ArtemisTranslatePipe)],
+            declarations: [CourseTutorialGroupCardComponent, MockComponent(FaIconComponent), TranslatePipeMock, MockDirective(TranslateDirective)],
+            providers: [
+                {
+                    provide: TranslateService,
+                    useValue: {
+                        instant: (key: string) => key,
+                        get: (key: string) => key,
+                    },
+                },
+            ],
         }).compileComponents();
 
         fixture = TestBed.createComponent(CourseTutorialGroupCardComponent);
diff --git a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
index 7a722cf69505..cf60468091e9 100644
--- a/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/course-tutorial-groups/course-tutorial-groups.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model';
 import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service';
 import { MockRouter } from '../../../helpers/mocks/mock-router';
-import { MockModule, MockPipe, MockProvider } from 'ng-mocks';
+import { MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { AlertService } from 'app/core/util/alert.service';
 import { ActivatedRoute, Router, RouterModule, convertToParamMap } from '@angular/router';
@@ -18,6 +18,7 @@ import { SidebarComponent } from 'app/shared/sidebar/sidebar.component';
 import { SearchFilterPipe } from 'app/shared/pipes/search-filter.pipe';
 import { SearchFilterComponent } from 'app/shared/search-filter/search-filter.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('CourseTutorialGroupsComponent', () => {
     let fixture: ComponentFixture<CourseTutorialGroupsComponent>;
@@ -32,7 +33,7 @@ describe('CourseTutorialGroupsComponent', () => {
         router.navigate.mockImplementation(() => Promise.resolve(true));
 
         TestBed.configureTestingModule({
-            imports: [ArtemisTestModule, RouterModule, MockModule(FormsModule), MockModule(ReactiveFormsModule)],
+            imports: [ArtemisTestModule, RouterModule, MockModule(FormsModule), MockModule(ReactiveFormsModule), MockDirective(TranslateDirective)],
             declarations: [CourseTutorialGroupsComponent, MockPipe(ArtemisTranslatePipe), SidebarComponent, SearchFilterComponent, MockPipe(SearchFilterPipe)],
             providers: [
                 MockProvider(TutorialGroupsService),
diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts
index 4580f627bbe5..8f630c5f5fe9 100644
--- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-group-sessions-table.component.spec.ts
@@ -3,7 +3,7 @@ import { TutorialGroupSessionsTableComponent } from 'app/course/tutorial-groups/
 import { TutorialGroupSession } from 'app/entities/tutorial-group/tutorial-group-session.model';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TutorialGroupSessionRowStubComponent } from '../stubs/tutorial-group-sessions-table-stub.component';
-import { MockPipe } from 'ng-mocks';
+import { MockDirective, MockPipe } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
 import { generateExampleTutorialGroupSession } from '../helpers/tutorialGroupSessionExampleModels';
 import dayjs from 'dayjs/esm';
@@ -11,6 +11,7 @@ import { TutorialGroup } from 'app/entities/tutorial-group/tutorial-group.model'
 import { generateExampleTutorialGroup } from '../helpers/tutorialGroupExampleModels';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { NgbCollapseMocksModule } from '../../../helpers/mocks/directive/ngbCollapseMocks.module';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 @Component({ selector: 'jhi-mock-extra-column', template: '' })
 class MockExtraColumnComponent {
@@ -63,6 +64,7 @@ describe('TutorialGroupSessionsTableWrapperTest', () => {
                 MockExtraColumnComponent,
                 MockPipe(ArtemisTranslatePipe),
                 MockPipe(ArtemisDatePipe),
+                MockDirective(TranslateDirective),
             ],
         })
             .compileComponents()
@@ -112,7 +114,13 @@ describe('TutorialGroupSessionTableComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [NgbCollapseMocksModule],
-            declarations: [TutorialGroupSessionsTableComponent, TutorialGroupSessionRowStubComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDatePipe)],
+            declarations: [
+                TutorialGroupSessionsTableComponent,
+                TutorialGroupSessionRowStubComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockPipe(ArtemisDatePipe),
+                MockDirective(TranslateDirective),
+            ],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts
index 120203545f35..d01aa3af255b 100644
--- a/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/shared/tutorial-groups-table.component.spec.ts
@@ -16,6 +16,7 @@ import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { runOnPushChangeDetection } from '../../../helpers/on-push-change-detection.helper';
 import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
 import { TutorialGroupUtilizationIndicatorComponent } from 'app/course/tutorial-groups/shared/tutorial-group-utilization-indicator/tutorial-group-utilization-indicator.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 @Component({ selector: 'jhi-mock-extra-column', template: '' })
 class MockExtraColumnComponent {
@@ -74,6 +75,7 @@ describe('TutorialGroupTableWrapperTest', () => {
                 MockDirective(SortByDirective),
                 MockComponent(FaIconComponent),
                 MockComponent(TutorialGroupUtilizationIndicatorComponent),
+                MockDirective(TranslateDirective),
             ],
             providers: [MockProvider(SortService)],
         })
@@ -131,6 +133,7 @@ describe('TutorialGroupsTableComponent', () => {
                 MockDirective(SortByDirective),
                 MockComponent(TutorialGroupUtilizationIndicatorComponent),
                 MockComponent(FaIconComponent),
+                MockDirective(TranslateDirective),
             ],
             providers: [MockProvider(SortService)],
         })
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts
index d14fa5f1cc77..3c718f75bc2c 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/tutorial-group-free-period-form.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
 import {
@@ -13,6 +13,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper';
 import dayjs from 'dayjs/esm';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TutorialFreePeriodFormComponent', () => {
     let fixture: ComponentFixture<TutorialGroupFreePeriodFormComponent>;
@@ -35,7 +36,13 @@ describe('TutorialFreePeriodFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ReactiveFormsModule, FormsModule, OwlDateTimeModule, OwlNativeDateTimeModule],
-            declarations: [TutorialGroupFreePeriodFormComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockPipe(ArtemisDatePipe)],
+            declarations: [
+                TutorialGroupFreePeriodFormComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockComponent(FaIconComponent),
+                MockPipe(ArtemisDatePipe),
+                MockDirective(TranslateDirective),
+            ],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts
index 1de186d73aae..f47763db3b2e 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-management.component.spec.ts
@@ -1,5 +1,5 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { AlertService } from 'app/core/util/alert.service';
 import { MockRouter } from '../../../../../helpers/mocks/mock-router';
 import { of } from 'rxjs';
@@ -25,6 +25,7 @@ import { Course } from 'app/entities/course.model';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import { CreateTutorialGroupFreePeriodComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/crud/create-tutorial-group-free-period/create-tutorial-group-free-period.component';
 import { TutorialGroupFreePeriodsTableComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-free-periods/tutorial-free-periods-management/tutorial-group-free-periods-table/tutorial-group-free-periods-table.component';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 @Component({ selector: 'jhi-tutorial-group-free-period-row-buttons', template: '' })
 class TutorialGroupRowButtonsStubComponent {
@@ -61,6 +62,7 @@ describe('TutorialGroupFreePeriodsManagementComponent', () => {
                 MockComponent(FaIconComponent),
                 MockRouterLinkDirective,
                 TutorialGroupFreePeriodsTableComponent,
+                MockDirective(TranslateDirective),
             ],
             providers: [
                 MockProvider(TutorialGroupsConfigurationService),
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts
index c1139fec76c6..b4f3aa70133a 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-group-sessions/crud/tutorial-group-session-form.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import {
     TutorialGroupSessionFormComponent,
@@ -13,6 +13,7 @@ import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angul
 import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredProperty } from '../../../helpers/tutorialGroupFormsUtils';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
 import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TutorialGroupSessionForm', () => {
     let fixture: ComponentFixture<TutorialGroupSessionFormComponent>;
@@ -28,7 +29,13 @@ describe('TutorialGroupSessionForm', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ReactiveFormsModule, FormsModule, NgbTimepickerModule, OwlDateTimeModule, OwlNativeDateTimeModule],
-            declarations: [TutorialGroupSessionFormComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockPipe(ArtemisDatePipe)],
+            declarations: [
+                TutorialGroupSessionFormComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockComponent(FaIconComponent),
+                MockPipe(ArtemisDatePipe),
+                MockDirective(TranslateDirective),
+            ],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts
index 8deb6bc1350b..9393704774ea 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups-configuration/crud/tutorial-groups-configuration-form.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockComponent, MockPipe } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe } from 'ng-mocks';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { NgbTypeaheadModule } from '@ng-bootstrap/ng-bootstrap';
 import { OwlDateTimeModule, OwlNativeDateTimeModule } from '@danielmoncada/angular-datetime-picker';
@@ -13,6 +13,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr
 import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe';
 import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper';
 import { Course } from 'app/entities/course.model';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 
 describe('TutorialGroupsConfigurationFormComponent', () => {
     let fixture: ComponentFixture<TutorialGroupsConfigurationFormComponent>;
@@ -28,7 +29,13 @@ describe('TutorialGroupsConfigurationFormComponent', () => {
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [ReactiveFormsModule, FormsModule, NgbTypeaheadModule, OwlDateTimeModule, OwlNativeDateTimeModule],
-            declarations: [TutorialGroupsConfigurationFormComponent, MockPipe(ArtemisTranslatePipe), MockPipe(ArtemisDateRangePipe), MockComponent(FaIconComponent)],
+            declarations: [
+                TutorialGroupsConfigurationFormComponent,
+                MockPipe(ArtemisTranslatePipe),
+                MockPipe(ArtemisDateRangePipe),
+                MockComponent(FaIconComponent),
+                MockDirective(TranslateDirective),
+            ],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts
index 04d2c353f042..06e2de934c41 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/crud/tutorial-group-form.component.spec.ts
@@ -26,7 +26,7 @@ import { generateClickSubmitButton, generateTestFormIsInvalidOnMissingRequiredPr
 import { ArtemisDateRangePipe } from 'app/shared/pipes/artemis-date-range.pipe';
 import { runOnPushChangeDetection } from '../../../../../helpers/on-push-change-detection.helper';
 
-@Component({ selector: 'jhi-markdown-editor', template: '' })
+@Component({ selector: 'jhi-markdown-editor-monaco', template: '' })
 class MarkdownEditorStubComponent {
     @Input() markdown: string;
     @Input() enableResize = false;
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist.component.spec.ts
index e71f5029fb9b..b8e4462c8074 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist.component.spec.ts
@@ -1,7 +1,7 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { TutorialGroupsChecklistComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-groups-checklist/tutorial-groups-checklist.component';
 import { CourseManagementService } from 'app/course/manage/course-management.service';
-import { ChecklistCheckComponent } from 'app/shared/components/checklist-check.component';
+import { ChecklistCheckComponent } from 'app/shared/components/checklist-check/checklist-check.component';
 import { MockRouter } from '../../../../../helpers/mocks/mock-router';
 import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
diff --git a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts
index ccd0f11f74b5..f896954754a3 100644
--- a/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts
+++ b/src/test/javascript/spec/component/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-registration-import-dialog.component.spec.ts
@@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { TutorialGroupsRegistrationImportDialogComponent } from 'app/course/tutorial-groups/tutorial-groups-management/tutorial-groups/tutorial-groups-management/tutorial-groups-import-dialog/tutorial-groups-registration-import-dialog.component';
 import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
-import { MockComponent, MockPipe, MockProvider } from 'ng-mocks';
+import { MockComponent, MockDirective, MockPipe, MockProvider } from 'ng-mocks';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateService } from '@ngx-translate/core';
 import { TutorialGroupsService } from 'app/course/tutorial-groups/services/tutorial-groups.service';
@@ -14,6 +14,7 @@ import { StudentDTO } from 'app/entities/student-dto.model';
 import { ParseError, ParseResult, ParseWorkerConfig, parse } from 'papaparse';
 import { of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
+import { TranslateDirective } from 'app/shared/language/translate.directive';
 jest.mock('papaparse', () => {
     const original = jest.requireActual('papaparse');
     return {
@@ -30,7 +31,7 @@ describe('TutorialGroupsRegistrationImportDialog', () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             imports: [FormsModule, ReactiveFormsModule],
-            declarations: [TutorialGroupsRegistrationImportDialogComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent)],
+            declarations: [TutorialGroupsRegistrationImportDialogComponent, MockPipe(ArtemisTranslatePipe), MockComponent(FaIconComponent), MockDirective(TranslateDirective)],
             providers: [MockProvider(TranslateService), MockProvider(AlertService), MockProvider(TutorialGroupsService), MockProvider(NgbActiveModal)],
         }).compileComponents();
 
diff --git a/src/test/javascript/spec/component/utils/exercise.utils.spec.ts b/src/test/javascript/spec/component/utils/exercise.utils.spec.ts
index e993f54bce3f..bc08c615408c 100644
--- a/src/test/javascript/spec/component/utils/exercise.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/exercise.utils.spec.ts
@@ -1,5 +1,5 @@
 import dayjs from 'dayjs/esm';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import {
     areManualResultsAllowed,
diff --git a/src/test/javascript/spec/component/utils/item-count.component.spec.ts b/src/test/javascript/spec/component/utils/item-count.component.spec.ts
index ce6eb7b7dbab..7d04df08102d 100644
--- a/src/test/javascript/spec/component/utils/item-count.component.spec.ts
+++ b/src/test/javascript/spec/component/utils/item-count.component.spec.ts
@@ -9,8 +9,8 @@ describe('ItemCountComponent test', () => {
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [TranslateModule.forRoot()],
-            declarations: [ItemCountComponent, TranslateDirective],
+            imports: [TranslateModule.forRoot(), TranslateDirective],
+            declarations: [ItemCountComponent],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts b/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts
index b0ec0a41a247..6556bc8c2ac9 100644
--- a/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts
+++ b/src/test/javascript/spec/component/utils/programming-exercise.utils.spec.ts
@@ -1,6 +1,6 @@
 import { SubmissionExerciseType, SubmissionType } from 'app/entities/submission.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Participation, ParticipationType } from 'app/entities/participation/participation.model';
 import {
     createBuildPlanUrl,
diff --git a/src/test/javascript/spec/core/language/language.helper.spec.ts b/src/test/javascript/spec/core/language/language.helper.spec.ts
index 04998034ff39..82b7c7b0fdcf 100644
--- a/src/test/javascript/spec/core/language/language.helper.spec.ts
+++ b/src/test/javascript/spec/core/language/language.helper.spec.ts
@@ -35,7 +35,7 @@ describe('Language Helper', () => {
     it('determinePreferredLanguages should respect user preference', inject([JhiLanguageHelper], (service: JhiLanguageHelper) => {
         const navigator = {
             languages: ['de', 'en'],
-        };
+        } as unknown as Navigator;
 
         const languageChangeSpy = jest.spyOn(service, 'getNavigatorReference').mockReturnValue(navigator);
         expect(service.determinePreferredLanguage()).toBe('de');
@@ -45,7 +45,7 @@ describe('Language Helper', () => {
     it('determinePreferredLanguage should return english if no other language matches', inject([JhiLanguageHelper], (service: JhiLanguageHelper) => {
         const navigator = {
             languages: ['elvish', 'orcish'],
-        };
+        } as unknown as Navigator;
 
         const languageChangeSpy = jest.spyOn(service, 'getNavigatorReference').mockReturnValue(navigator);
         expect(service.determinePreferredLanguage()).toBe('en');
diff --git a/src/test/javascript/spec/entities/exercise-category.model.spec.ts b/src/test/javascript/spec/entities/exercise-category.model.spec.ts
new file mode 100644
index 000000000000..2beba4b62f40
--- /dev/null
+++ b/src/test/javascript/spec/entities/exercise-category.model.spec.ts
@@ -0,0 +1,49 @@
+import { ExerciseCategory } from 'app/entities/exercise-category.model';
+
+describe('ExerciseCategory', () => {
+    describe('equals', () => {
+        it('should return true if the two exercise categories are equal', () => {
+            const exerciseCategory1 = new ExerciseCategory('Category 1', 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 1', 'red');
+
+            expect(exerciseCategory1.equals(exerciseCategory2)).toBeTruthy();
+        });
+
+        it('should return false if the two exercise categories are not equal', () => {
+            const exerciseCategory1 = new ExerciseCategory('Category 1', 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 2', 'blue');
+
+            expect(exerciseCategory1.equals(exerciseCategory2)).toBeFalsy();
+        });
+    });
+
+    describe('compare', () => {
+        it("should return 0 if the two exercise categories' display text is the same", () => {
+            const exerciseCategory1 = new ExerciseCategory('Category 1', 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue');
+
+            expect(exerciseCategory1.compare(exerciseCategory2)).toBe(0);
+        });
+
+        it("should return -1 if the first exercise category's display text is smaller than the second exercise category's display text", () => {
+            const exerciseCategory1 = new ExerciseCategory('Category 1', 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 2', 'blue');
+
+            expect(exerciseCategory1.compare(exerciseCategory2)).toBe(-1);
+        });
+
+        it("should return 1 if the first exercise category's display text is larger than the second exercise category's display text", () => {
+            const exerciseCategory1 = new ExerciseCategory('Category 2', 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue');
+
+            expect(exerciseCategory1.compare(exerciseCategory2)).toBe(1);
+        });
+
+        it('should return -1 if the first exercise category is undefined', () => {
+            const exerciseCategory1 = new ExerciseCategory(undefined, 'red');
+            const exerciseCategory2 = new ExerciseCategory('Category 1', 'blue');
+
+            expect(exerciseCategory1.compare(exerciseCategory2)).toBe(-1);
+        });
+    });
+});
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts
index 6f921f925cc8..eb4e1c7f8a91 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-build-plan.service.ts
@@ -1,5 +1,5 @@
 import { of } from 'rxjs';
-import { BuildPlan } from 'app/entities/build-plan.model';
+import { BuildPlan } from 'app/entities/programming/build-plan.model';
 
 export class MockBuildPlanService {
     getBuildPlan = (exerciseId: number) => of({});
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts
index 6c4fdb3e1a95..75e162c1440c 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-code-editor-build-log.service.ts
@@ -1,5 +1,5 @@
 import { of } from 'rxjs';
-import { BuildLogEntry } from 'app/entities/build-log.model';
+import { BuildLogEntry } from 'app/entities/programming/build-log.model';
 import { IBuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
 
 export class MockCodeEditorBuildLogService implements IBuildLogService {
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts
index a84c3d6f75b5..f35a7271cc77 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-course-exercise.service.ts
@@ -1,6 +1,6 @@
 import { of } from 'rxjs';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class MockCourseExerciseService {
     startExercise = () => of({} as StudentParticipation);
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts
index ebcdaacd8f50..888c7b981944 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-course-management.service.ts
@@ -2,7 +2,7 @@ import { HttpResponse } from '@angular/common/http';
 import { User } from 'app/core/user/user.model';
 import { BehaviorSubject, Observable, of } from 'rxjs';
 import { Course, CourseGroup } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { EntityArrayResponseType } from 'app/course/manage/course-management.service';
 
 export class MockCourseManagementService {
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts
index ce82ec8995bf..aaca1b66625f 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-exam-checklist.service.ts
@@ -1,5 +1,5 @@
-import { Exam } from 'app/entities/exam.model';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
+import { Exam } from 'app/entities/exam/exam.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
 import { of } from 'rxjs';
 
 export class MockExamChecklistService {
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts
index b63e816d8969..face7704e776 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-exam-management.service.ts
@@ -1,6 +1,6 @@
 import { Observable, of } from 'rxjs';
 import { HttpResponse } from '@angular/common/http';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 export class MockExamManagementService {
     findAllCurrentAndUpcomingExams() {
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts
index a50b88c16229..e61332e5c35c 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-ide-build-and-test.service.ts
@@ -1,5 +1,5 @@
 import { of } from 'rxjs';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 export class MockIdeBuildAndTestService {
     listenOnBuildOutputAndForwardChanges = (exercise: ProgrammingExercise) => of();
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts
index cd93e0dd444c..b48ecc16b192 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-grading.service.ts
@@ -1,12 +1,12 @@
 import { BehaviorSubject, Observable, of } from 'rxjs';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import {
     IProgrammingExerciseGradingService,
     ProgrammingExerciseTestCaseUpdate,
     StaticCodeAnalysisCategoryUpdate,
 } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
-import { StaticCodeAnalysisCategory } from 'app/entities/static-code-analysis-category.model';
-import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { StaticCodeAnalysisCategory } from 'app/entities/programming/static-code-analysis-category.model';
+import { ProgrammingExerciseGradingStatistics } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 
 export class MockProgrammingExerciseGradingService implements IProgrammingExerciseGradingService {
     private testCaseSubject = new BehaviorSubject<ProgrammingExerciseTestCase[] | undefined>(undefined);
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts
index 6b0fb6ea0d78..8525ad43dc80 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise-participation.service.ts
@@ -2,7 +2,7 @@ import { of } from 'rxjs';
 import { IProgrammingExerciseParticipationService } from 'app/exercises/programming/manage/services/programming-exercise-participation.service';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { Result } from 'app/entities/result.model';
-import { CommitInfo } from 'app/entities/programming-submission.model';
+import { CommitInfo } from 'app/entities/programming/programming-submission.model';
 
 export class MockProgrammingExerciseParticipationService implements IProgrammingExerciseParticipationService {
     getLatestResultWithFeedback = (participationId: number, withSubmission: boolean) => of({} as Result);
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts
index d897194809fd..b164cc8e700c 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-programming-exercise.service.ts
@@ -1,7 +1,7 @@
 import { of } from 'rxjs';
 import { ProgrammingExerciseInstructorRepositoryType } from 'app/exercises/programming/manage/services/programming-exercise.service';
 import { Participation } from 'app/entities/participation/participation.model';
-import { ProgrammingLanguage } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage } from 'app/entities/programming/programming-exercise.model';
 
 export class MockProgrammingExerciseService {
     updateProblemStatement = (exerciseId: number, problemStatement: string) => of();
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts
index fa1e00fdfe28..5f830bdf013d 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-team.service.ts
@@ -8,7 +8,7 @@ import { StudentWithTeam } from 'app/entities/team.model';
 import { Course } from 'app/entities/course.model';
 import { TeamSearchUser } from 'app/entities/team-search-user.model';
 import { User } from 'app/core/user/user.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model';
 import { TeamService } from 'app/exercises/shared/team/team.service';
 import dayjs from 'dayjs/esm';
diff --git a/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts b/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts
index 99dcd86c9c2d..dcea849439c1 100644
--- a/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts
+++ b/src/test/javascript/spec/helpers/mocks/service/mock-text-submission.service.ts
@@ -1,5 +1,5 @@
 import { Observable, of } from 'rxjs';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { HttpResponse } from '@angular/common/http';
 
 type EntityResponseType = HttpResponse<TextSubmission>;
diff --git a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts
index f82327cfaae8..4e348a67d615 100644
--- a/src/test/javascript/spec/helpers/sample/iris-sample-data.ts
+++ b/src/test/javascript/spec/helpers/sample/iris-sample-data.ts
@@ -1,6 +1,6 @@
 import dayjs from 'dayjs/esm';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { IrisAssistantMessage, IrisSender, IrisUserMessage } from 'app/entities/iris/iris-message.model';
 import { IrisMessageContentType, IrisTextMessageContent } from 'app/entities/iris/iris-content-type.model';
 import { IrisSession } from 'app/entities/iris/iris-session.model';
diff --git a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
index a6d3e1db5eb0..ce2136c46028 100644
--- a/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
+++ b/src/test/javascript/spec/helpers/sample/metis-sample-data.ts
@@ -13,7 +13,7 @@ import { Conversation, ConversationType } from 'app/entities/metis/conversation/
 import { AttachmentUnit } from 'app/entities/lecture-unit/attachmentUnit.model';
 import { Slide } from 'app/entities/lecture-unit/slide.model';
 import { Channel, ChannelDTO, ChannelSubType } from 'app/entities/metis/conversation/channel.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { PlagiarismCase } from 'app/exercises/shared/plagiarism/types/PlagiarismCase';
 import { LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 
diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts
index 637ea5b8baad..d8f9e0bb8126 100644
--- a/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts
+++ b/src/test/javascript/spec/integration/code-editor/code-editor-container.integration.spec.ts
@@ -29,7 +29,7 @@ import { GuidedTourMapping } from 'app/guided-tour/guided-tour-setting.model';
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { MockWebsocketService } from '../../helpers/mocks/service/mock-websocket.service';
 import { Participation } from 'app/entities/participation/participation.model';
-import { BuildLogEntryArray } from 'app/entities/build-log.model';
+import { BuildLogEntryArray } from 'app/entities/programming/build-log.model';
 import { CodeEditorConflictStateService } from 'app/exercises/programming/shared/code-editor/service/code-editor-conflict-state.service';
 import { ResultService } from 'app/exercises/shared/result/result.service';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
@@ -41,7 +41,7 @@ import {
 } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { Feedback } from 'app/entities/feedback.model';
 import { DomainService } from 'app/exercises/programming/shared/code-editor/service/code-editor-domain.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects';
 import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
@@ -51,7 +51,7 @@ import { MockCodeEditorRepositoryFileService } from '../../helpers/mocks/service
 import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service';
 import { CodeEditorContainerComponent } from 'app/exercises/programming/shared/code-editor/container/code-editor-container.component';
 import { omit } from 'lodash-es';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { CodeEditorGridComponent } from 'app/exercises/programming/shared/code-editor/layout/code-editor-grid.component';
 import { MockComponent, MockDirective, MockModule, MockPipe, MockProvider } from 'ng-mocks';
 import { CodeEditorActionsComponent } from 'app/exercises/programming/shared/code-editor/actions/code-editor-actions.component';
diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts
index 5fffcf112b9e..294c3d3a9a4e 100644
--- a/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts
+++ b/src/test/javascript/spec/integration/code-editor/code-editor-instructor.integration.spec.ts
@@ -27,7 +27,7 @@ import { DomainService } from 'app/exercises/programming/shared/code-editor/serv
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
 import { Result } from 'app/entities/result.model';
 import { ParticipationService } from 'app/exercises/shared/participation/participation.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ProgrammingExerciseStudentParticipation } from 'app/entities/participation/programming-exercise-student-participation.model';
 import { SolutionProgrammingExerciseParticipation } from 'app/entities/participation/solution-programming-exercise-participation.model';
 import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects';
@@ -56,7 +56,6 @@ import { CodeEditorBuildOutputComponent } from 'app/exercises/programming/shared
 import { KeysPipe } from 'app/shared/pipes/keys.pipe';
 import { CodeEditorInstructionsComponent } from 'app/exercises/programming/shared/code-editor/instructions/code-editor-instructions.component';
 import { ArtemisDatePipe } from 'app/shared/pipes/artemis-date.pipe';
-import { MarkdownEditorComponent } from 'app/shared/markdown-editor/markdown-editor.component';
 import { ProgrammingExerciseInstructionComponent } from 'app/exercises/programming/shared/instructions-render/programming-exercise-instruction.component';
 import { ProgrammingExerciseInstructionAnalysisComponent } from 'app/exercises/programming/manage/instructions-editor/analysis/programming-exercise-instruction-analysis.component';
 import { ResultComponent } from 'app/exercises/shared/result/result.component';
@@ -107,7 +106,6 @@ describe('CodeEditorInstructorIntegration', () => {
                 UpdatingResultComponent,
                 MockComponent(ProgrammingExerciseStudentTriggerBuildButtonComponent),
                 ProgrammingExerciseEditableInstructionComponent,
-                MockComponent(MarkdownEditorComponent),
                 MockComponent(MarkdownEditorMonacoComponent),
                 ProgrammingExerciseInstructionComponent,
                 MockComponent(ProgrammingExerciseInstructionAnalysisComponent),
diff --git a/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts b/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts
index 11036e23a71d..dabf4a7e1d34 100644
--- a/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts
+++ b/src/test/javascript/spec/integration/code-editor/code-editor-student.integration.spec.ts
@@ -28,7 +28,7 @@ import {
 } from 'app/exercises/programming/shared/code-editor/service/code-editor-repository.service';
 import { Feedback } from 'app/entities/feedback.model';
 import { CodeEditorStudentContainerComponent } from 'app/exercises/programming/participate/code-editor-student-container.component';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { MockActivatedRouteWithSubjects } from '../../helpers/mocks/activated-route/mock-activated-route-with-subjects';
 import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
diff --git a/src/test/javascript/spec/service/account.service.spec.ts b/src/test/javascript/spec/service/account.service.spec.ts
index caf5c105276b..03bcd9a04a48 100644
--- a/src/test/javascript/spec/service/account.service.spec.ts
+++ b/src/test/javascript/spec/service/account.service.spec.ts
@@ -14,7 +14,6 @@ import { Course } from 'app/entities/course.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { Participation } from 'app/entities/participation/participation.model';
 import { Team } from 'app/entities/team.model';
-import { MockProfileService } from '../helpers/mocks/service/mock-profile.service';
 
 describe('AccountService', () => {
     let accountService: AccountService;
@@ -53,7 +52,6 @@ describe('AccountService', () => {
             httpService,
             new MockWebsocketService(),
             new MockFeatureToggleService(),
-            new MockProfileService(),
         );
         getStub = jest.spyOn(httpService, 'get');
         postStub = jest.spyOn(httpService, 'post');
@@ -538,17 +536,7 @@ describe('AccountService', () => {
             fetchStub = jest.spyOn(accountService, 'fetch');
         });
 
-        it('should retrieve user if vcs token is missing', () => {
-            accountService['versionControlAccessTokenRequired'] = true;
-            user.vcsAccessToken = undefined;
-            accountService.userIdentity = user;
-
-            accountService.identity();
-            expect(fetchStub).toHaveBeenCalledOnce();
-        });
-
         it('should not retrieve user if vcs token is missing but not required', () => {
-            accountService['versionControlAccessTokenRequired'] = false;
             user.vcsAccessToken = undefined;
             accountService.userIdentity = user;
 
@@ -557,7 +545,6 @@ describe('AccountService', () => {
         });
 
         it('should not retrieve user if vcs token is present', () => {
-            accountService['versionControlAccessTokenRequired'] = true;
             user.vcsAccessToken = 'iAmAToken';
             accountService.userIdentity = user;
 
diff --git a/src/test/javascript/spec/service/athena.service.spec.ts b/src/test/javascript/spec/service/athena.service.spec.ts
index 98de7b17fe9c..099b679ee249 100644
--- a/src/test/javascript/spec/service/athena.service.spec.ts
+++ b/src/test/javascript/spec/service/athena.service.spec.ts
@@ -8,8 +8,8 @@ import { of } from 'rxjs';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { Exercise } from 'app/entities/exercise.model';
 import { ModelingFeedbackSuggestion, ProgrammingFeedbackSuggestion, TextFeedbackSuggestion } from 'app/entities/feedback-suggestion.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 
diff --git a/src/test/javascript/spec/service/attachment.service.spec.ts b/src/test/javascript/spec/service/attachment.service.spec.ts
index b29db559c4e9..77356f0aa445 100644
--- a/src/test/javascript/spec/service/attachment.service.spec.ts
+++ b/src/test/javascript/spec/service/attachment.service.spec.ts
@@ -145,4 +145,23 @@ describe('Attachment Service', () => {
             expect(results).toEqual(elemDefault);
         });
     });
+
+    describe('getAttachmentFile', () => {
+        it('should retrieve a file as Blob for a given course and attachment ID', () => {
+            const courseId = 1;
+            const attachmentId = 100;
+            const expectedBlob = new Blob(['dummy content'], { type: 'application/pdf' });
+
+            service.getAttachmentFile(courseId, attachmentId).subscribe((resp) => {
+                expect(resp).toEqual(expectedBlob);
+            });
+
+            const req = httpMock.expectOne({
+                url: `api/files/courses/${courseId}/attachments/${attachmentId}`,
+                method: 'GET',
+            });
+            expect(req.request.responseType).toBe('blob');
+            req.flush(expectedBlob);
+        });
+    });
 });
diff --git a/src/test/javascript/spec/service/build-log.service.spec.ts b/src/test/javascript/spec/service/build-log.service.spec.ts
index 9a8639c3159d..0582e9ff369b 100644
--- a/src/test/javascript/spec/service/build-log.service.spec.ts
+++ b/src/test/javascript/spec/service/build-log.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
-import { BuildLogEntry, BuildLogType } from 'app/entities/build-log.model';
+import { BuildLogEntry, BuildLogType } from 'app/entities/programming/build-log.model';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 
 describe('Build Log Service', () => {
diff --git a/src/test/javascript/spec/service/chart-category-filter.spec.ts b/src/test/javascript/spec/service/chart-category-filter.spec.ts
index 533442313bc8..aa4a25ed8bbb 100644
--- a/src/test/javascript/spec/service/chart-category-filter.spec.ts
+++ b/src/test/javascript/spec/service/chart-category-filter.spec.ts
@@ -5,7 +5,7 @@ import { DueDateStat } from 'app/course/dashboards/due-date-stat.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import dayjs from 'dayjs/esm';
 import { ExerciseCategory } from 'app/entities/exercise-category.model';
 import { InitializationState } from 'app/entities/participation/participation.model';
diff --git a/src/test/javascript/spec/service/course-exercise.service.spec.ts b/src/test/javascript/spec/service/course-exercise.service.spec.ts
index e31154c07dd5..d123760c6d25 100644
--- a/src/test/javascript/spec/service/course-exercise.service.spec.ts
+++ b/src/test/javascript/spec/service/course-exercise.service.spec.ts
@@ -7,8 +7,8 @@ import { Exercise } from 'app/entities/exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import dayjs from 'dayjs/esm';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { take } from 'rxjs/operators';
diff --git a/src/test/javascript/spec/service/exam-checklist.service.spec.ts b/src/test/javascript/spec/service/exam-checklist.service.spec.ts
index 89286e0d0d9c..be298e2651d3 100644
--- a/src/test/javascript/spec/service/exam-checklist.service.spec.ts
+++ b/src/test/javascript/spec/service/exam-checklist.service.spec.ts
@@ -1,8 +1,8 @@
 import { HttpResponse } from '@angular/common/http';
 import { TestBed } from '@angular/core/testing';
 import { Course } from 'app/entities/course.model';
-import { ExamChecklist } from 'app/entities/exam-checklist.model';
-import { Exam } from 'app/entities/exam.model';
+import { ExamChecklist } from 'app/entities/exam/exam-checklist.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { MockProvider } from 'ng-mocks';
 import { of, take } from 'rxjs';
 import { ArtemisTestModule } from '../test.module';
diff --git a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts
index 34299aa2e1ba..091acf0bc0c0 100644
--- a/src/test/javascript/spec/service/exam-import-paging.service.spec.ts
+++ b/src/test/javascript/spec/service/exam-import-paging.service.spec.ts
@@ -6,7 +6,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { take } from 'rxjs/operators';
 import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service';
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamImportPagingService } from 'app/exam/manage/exams/exam-import/exam-import-paging.service';
 
 describe('Exam Import Paging Service', () => {
diff --git a/src/test/javascript/spec/service/exam-participation.service.spec.ts b/src/test/javascript/spec/service/exam-participation.service.spec.ts
index 8a06fa6654d6..56d0aa53bef8 100644
--- a/src/test/javascript/spec/service/exam-participation.service.spec.ts
+++ b/src/test/javascript/spec/service/exam-participation.service.spec.ts
@@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { take } from 'rxjs/operators';
 import dayjs from 'dayjs/esm';
 import { ExamParticipationService } from 'app/exam/participate/exam-participation.service';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model';
 import { StudentExam } from 'app/entities/student-exam.model';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
@@ -11,10 +11,10 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
 import { ArtemisTestModule } from '../test.module';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import { getLatestSubmissionResult } from 'app/entities/submission.model';
 import { StudentExamWithGradeDTO, StudentResult } from 'app/exam/exam-scores/exam-score-dtos.model';
diff --git a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts
index 27bb4130c2ab..d1eee71bc343 100644
--- a/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts
+++ b/src/test/javascript/spec/service/example-submission-import-paging.service.spec.ts
@@ -8,7 +8,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { ExampleSubmissionImportPagingService } from 'app/exercises/shared/example-submission/example-submission-import/example-submission-import-paging.service';
 import { Exercise } from 'app/entities/exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 
 describe('Example Submission Import Paging Service', () => {
     let service: ExampleSubmissionImportPagingService;
diff --git a/src/test/javascript/spec/service/example-submission.service.spec.ts b/src/test/javascript/spec/service/example-submission.service.spec.ts
index 506871654bf2..60addda81875 100644
--- a/src/test/javascript/spec/service/example-submission.service.spec.ts
+++ b/src/test/javascript/spec/service/example-submission.service.spec.ts
@@ -6,7 +6,7 @@ import { ArtemisTestModule } from '../test.module';
 import { ExampleSubmissionService } from 'app/exercises/shared/example-submission/example-submission.service';
 import { ExampleSubmission } from 'app/entities/example-submission.model';
 import { Exercise } from 'app/entities/exercise.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import { Feedback } from 'app/entities/feedback.model';
 import { Submission, getLatestSubmissionResult } from 'app/entities/submission.model';
diff --git a/src/test/javascript/spec/service/exercise-hint.service.spec.ts b/src/test/javascript/spec/service/exercise-hint.service.spec.ts
index cdff311a6fcc..74a6c5e84bb9 100644
--- a/src/test/javascript/spec/service/exercise-hint.service.spec.ts
+++ b/src/test/javascript/spec/service/exercise-hint.service.spec.ts
@@ -3,7 +3,7 @@ import { HttpClientTestingModule, HttpTestingController } from '@angular/common/
 import { HttpResponse } from '@angular/common/http';
 import { take } from 'rxjs/operators';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ExerciseHint } from 'app/entities/hestia/exercise-hint.model';
 import { MockExerciseService } from '../helpers/mocks/service/mock-exercise.service';
 import { ExerciseHintService } from 'app/exercises/shared/exercise-hint/shared/exercise-hint.service';
diff --git a/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts b/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts
index 55ad42c88d49..75be64c26763 100644
--- a/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts
+++ b/src/test/javascript/spec/service/exercise-update-warning.service.spec.ts
@@ -5,7 +5,7 @@ import { GradingCriterion } from 'app/exercises/shared/structured-grading-criter
 import { Exercise } from 'app/entities/exercise.model';
 import { ExerciseUpdateWarningComponent } from 'app/exercises/shared/exercise-update-warning/exercise-update-warning.component';
 import { Component } from '@angular/core';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import dayjs from 'dayjs/esm';
 
 describe('Exercise Update Warning Service', () => {
diff --git a/src/test/javascript/spec/service/exercise.service.spec.ts b/src/test/javascript/spec/service/exercise.service.spec.ts
index 8e58498bef7a..415078a437e1 100644
--- a/src/test/javascript/spec/service/exercise.service.spec.ts
+++ b/src/test/javascript/spec/service/exercise.service.spec.ts
@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { Exercise, ExerciseType, IncludedInOverallScore } from 'app/entities/exercise.model';
 import { InitializationState } from 'app/entities/participation/participation.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import type { EntityResponseType, ExerciseDetailsType } from 'app/exercises/shared/exercise/exercise.service';
 import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
 import dayjs from 'dayjs/esm';
@@ -15,7 +15,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { ArtemisMarkdownService } from 'app/shared/markdown.service';
 import { MockProvider } from 'ng-mocks';
 import { SafeHtml } from '@angular/platform-browser';
diff --git a/src/test/javascript/spec/service/external-submission.service.spec.ts b/src/test/javascript/spec/service/external-submission.service.spec.ts
index b3d34c736e50..b7b7c6701e8b 100644
--- a/src/test/javascript/spec/service/external-submission.service.spec.ts
+++ b/src/test/javascript/spec/service/external-submission.service.spec.ts
@@ -7,7 +7,7 @@ import { Result } from 'app/entities/result.model';
 import { User } from 'app/core/user/user.model';
 import { EntityResponseType, ResultService } from 'app/exercises/shared/result/result.service';
 import dayjs from 'dayjs/esm';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 describe('External Submission Service', () => {
     let httpMock: HttpTestingController;
diff --git a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts
index 9a1d199c32be..89c6a7755334 100644
--- a/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts
+++ b/src/test/javascript/spec/service/feedback/programming-feedback-item.service.spec.ts
@@ -1,4 +1,4 @@
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FeedbackGroup } from 'app/exercises/shared/feedback/group/feedback-group';
 import { ProgrammingFeedbackItemService } from 'app/exercises/shared/feedback/item/programming-feedback-item.service';
 import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER, SUBMISSION_POLICY_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model';
diff --git a/src/test/javascript/spec/service/guided-tour.service.spec.ts b/src/test/javascript/spec/service/guided-tour.service.spec.ts
index 04694f2919c5..fb7e9a1b9b0d 100644
--- a/src/test/javascript/spec/service/guided-tour.service.spec.ts
+++ b/src/test/javascript/spec/service/guided-tour.service.spec.ts
@@ -591,8 +591,8 @@ describe('GuidedTourService', () => {
                 guidedTourService.enableUserInteraction(htmlTarget, userInteractionEvent);
                 expect(querySelectorSpy).not.toHaveBeenCalled();
             }));
-            it('should enableUserInteraction with UserInteractionEvent.ACE_EDITOR', fakeAsync(() => {
-                const userInteractionEvent = UserInteractionEvent.ACE_EDITOR;
+            it('should enableUserInteraction with UserInteractionEvent.MONACO_EDITOR', fakeAsync(() => {
+                const userInteractionEvent = UserInteractionEvent.MONACO_EDITOR;
                 observeMutationsStub.mockReturnValue(of({ addedNodes: { length: 0 } as NodeList, removedNodes: { length: 0 } as NodeList } as MutationRecord));
                 guidedTourService.enableUserInteraction(htmlTarget, userInteractionEvent);
                 expect(querySelectorSpy).toHaveBeenCalledOnce();
diff --git a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts
index e3227f1b718f..5fdfe0efe181 100644
--- a/src/test/javascript/spec/service/modeling-exercise.service.spec.ts
+++ b/src/test/javascript/spec/service/modeling-exercise.service.spec.ts
@@ -22,8 +22,8 @@ describe('ModelingExercise Service', () => {
     let httpMock: HttpTestingController;
     let elemDefault: ModelingExercise;
     let plagiarismResult: ModelingPlagiarismResult;
-    const category = { color: 'red', category: 'testCategory' } as ExerciseCategory;
-    const categories = [JSON.stringify(category) as ExerciseCategory];
+    const category = new ExerciseCategory('testCategory', 'red');
+    const categories = [JSON.stringify(category) as unknown as ExerciseCategory] as ExerciseCategory[];
     beforeEach(() => {
         TestBed.configureTestingModule({
             imports: [HttpClientTestingModule],
diff --git a/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts b/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts
index eb6b7f555eff..53394a7bbd27 100644
--- a/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts
+++ b/src/test/javascript/spec/service/orion/orion-build-and-test.service.spec.ts
@@ -5,13 +5,13 @@ import { MockProgrammingSubmissionService } from '../../helpers/mocks/service/mo
 import { Result } from 'app/entities/result.model';
 import { BehaviorSubject, of } from 'rxjs';
 import { Feedback, FeedbackType, STATIC_CODE_ANALYSIS_FEEDBACK_IDENTIFIER } from 'app/entities/feedback.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { BuildLogService } from 'app/exercises/programming/shared/service/build-log.service';
 import { MockParticipationWebsocketService } from '../../helpers/mocks/service/mock-participation-websocket.service';
 import { MockCodeEditorBuildLogService } from '../../helpers/mocks/service/mock-code-editor-build-log.service';
 import { OrionBuildAndTestService } from 'app/shared/orion/orion-build-and-test.service';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { ArtemisTestModule } from '../../test.module';
 import { SubmissionService } from 'app/exercises/shared/submission/submission.service';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
diff --git a/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts b/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts
index 6fb2c239ff92..5a5f05943019 100644
--- a/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts
+++ b/src/test/javascript/spec/service/orion/orion-connector.service.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed } from '@angular/core/testing';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { OrionConnectorService } from 'app/shared/orion/orion-connector.service';
 import { ArtemisTestModule } from '../../test.module';
 import { MockSyncStorage } from '../../helpers/mocks/service/mock-sync-storage.service';
diff --git a/src/test/javascript/spec/service/participation.service.spec.ts b/src/test/javascript/spec/service/participation.service.spec.ts
index aef90fe10869..0d405cbfb018 100644
--- a/src/test/javascript/spec/service/participation.service.spec.ts
+++ b/src/test/javascript/spec/service/participation.service.spec.ts
@@ -14,7 +14,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockRouter } from '../helpers/mocks/mock-router';
 import { Router } from '@angular/router';
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 describe('Participation Service', () => {
     let service: ParticipationService;
diff --git a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts
index d72b46099546..134bdc518fee 100644
--- a/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts
+++ b/src/test/javascript/spec/service/plagiarism-cases.service.spec.ts
@@ -3,7 +3,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { PlagiarismCasesService } from 'app/course/plagiarism-cases/shared/plagiarism-cases.service';
 import { take } from 'rxjs/operators';
 import { ExerciseType } from 'app/entities/exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { PlagiarismStatus } from 'app/exercises/shared/plagiarism/types/PlagiarismStatus';
 import { PlagiarismComparison } from 'app/exercises/shared/plagiarism/types/PlagiarismComparison';
 import { TextSubmissionElement } from 'app/exercises/shared/plagiarism/types/text/TextSubmissionElement';
diff --git a/src/test/javascript/spec/service/profile.service.spec.ts b/src/test/javascript/spec/service/profile.service.spec.ts
index 00296fdba322..45d63d7f9482 100644
--- a/src/test/javascript/spec/service/profile.service.spec.ts
+++ b/src/test/javascript/spec/service/profile.service.spec.ts
@@ -7,7 +7,7 @@ import { MockRouter } from '../helpers/mocks/mock-router';
 import { Router } from '@angular/router';
 import { ProfileInfo } from 'app/shared/layouts/profiles/profile-info.model';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { ProgrammingLanguage, ProjectType } from 'app/entities/programming-exercise.model';
+import { ProgrammingLanguage, ProjectType } from 'app/entities/programming/programming-exercise.model';
 import { BrowserFingerprintService } from 'app/shared/fingerprint/browser-fingerprint.service';
 
 describe('ProfileService', () => {
@@ -145,6 +145,7 @@ describe('ProfileService', () => {
                 },
             },
         },
+        operatorName: 'TUM',
         theiaPortalURL: 'http://theia-test.k8s.ase.cit.tum.de',
     };
 
@@ -261,6 +262,7 @@ describe('ProfileService', () => {
             },
         },
         theiaPortalURL: 'http://theia-test.k8s.ase.cit.tum.de',
+        operatorName: 'TUM',
     };
 
     beforeEach(() => {
diff --git a/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts
index 5d27d8f339af..6396a81e6dff 100644
--- a/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts
+++ b/src/test/javascript/spec/service/programming-exercise-grading.service.spec.ts
@@ -5,7 +5,7 @@ import { MockWebsocketService } from '../helpers/mocks/service/mock-websocket.se
 import { JhiWebsocketService } from 'app/core/websocket/websocket.service';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
 import { MockHttpService } from '../helpers/mocks/service/mock-http.service';
-import { ProgrammingExerciseTestCase } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase } from 'app/entities/programming/programming-exercise-test-case.model';
 import { Result } from 'app/entities/result.model';
 import { HttpClient } from '@angular/common/http';
 
diff --git a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts
index 9571cadd5392..b45536f41584 100644
--- a/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts
+++ b/src/test/javascript/spec/service/programming-exercise-task.service.spec.ts
@@ -4,14 +4,14 @@ import { ArtemisTestModule } from '../test.module';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { AlertService } from 'app/core/util/alert.service';
 import { ProgrammingExerciseGradingService } from 'app/exercises/programming/manage/services/programming-exercise-grading.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming-exercise-test-case-statistics.model';
+import { ProgrammingExerciseGradingStatistics, TestCaseStats } from 'app/entities/programming/programming-exercise-test-case-statistics.model';
 import { MockProvider } from 'ng-mocks';
 import { MockProgrammingExerciseGradingService } from '../helpers/mocks/service/mock-programming-exercise-grading.service';
 import { ProgrammingExerciseTask } from 'app/exercises/programming/manage/grading/tasks/programming-exercise-task';
 import { ProgrammingExerciseServerSideTask } from 'app/entities/hestia/programming-exercise-task.model';
-import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase, ProgrammingExerciseTestCaseType, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 import { firstValueFrom, of } from 'rxjs';
 
 describe('ProgrammingExerciseTask Service', () => {
diff --git a/src/test/javascript/spec/service/programming-exercise.service.spec.ts b/src/test/javascript/spec/service/programming-exercise.service.spec.ts
index 66ca8a1e0d44..70d9a94a1eb7 100644
--- a/src/test/javascript/spec/service/programming-exercise.service.spec.ts
+++ b/src/test/javascript/spec/service/programming-exercise.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { take } from 'rxjs/operators';
 import { ProgrammingExerciseService } from 'app/exercises/programming/manage/services/programming-exercise.service';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
@@ -10,7 +10,7 @@ import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.serv
 import { ArtemisTestModule } from '../test.module';
 import dayjs from 'dayjs/esm';
 import { TemplateProgrammingExerciseParticipation } from 'app/entities/participation/template-programming-exercise-participation.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Result } from 'app/entities/result.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../helpers/mocks/service/mock-account.service';
@@ -179,6 +179,7 @@ describe('ProgrammingExercise Service', () => {
                 solutionRepositoryUri: 'BBBBBB',
                 templateBuildPlanId: 'BBBBBB',
                 allowOnlineEditor: true,
+                allowOnlineIde: true,
                 releaseDate: undefined,
                 dueDate: undefined,
                 assessmentDueDate: undefined,
@@ -222,6 +223,7 @@ describe('ProgrammingExercise Service', () => {
                 solutionRepositoryUri: 'BBBBBB',
                 templateBuildPlanId: 'BBBBBB',
                 allowOnlineEditor: true,
+                allowOnlineIde: true,
                 releaseDate: undefined,
                 dueDate: undefined,
                 assessmentDueDate: undefined,
diff --git a/src/test/javascript/spec/service/programming-submission.service.spec.ts b/src/test/javascript/spec/service/programming-submission.service.spec.ts
index 74e4bf5c7326..6259bcaf65d9 100644
--- a/src/test/javascript/spec/service/programming-submission.service.spec.ts
+++ b/src/test/javascript/spec/service/programming-submission.service.spec.ts
@@ -10,7 +10,7 @@ import {
 } from 'app/exercises/programming/participate/programming-submission.service';
 import { ParticipationWebsocketService } from 'app/overview/participation-websocket.service';
 import { Result } from 'app/entities/result.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import { Submission } from 'app/entities/submission.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { MockParticipationWebsocketService } from '../helpers/mocks/service/mock-participation-websocket.service';
diff --git a/src/test/javascript/spec/service/result.service.spec.ts b/src/test/javascript/spec/service/result.service.spec.ts
index 00e6ff3ea277..8afb25f538cd 100644
--- a/src/test/javascript/spec/service/result.service.spec.ts
+++ b/src/test/javascript/spec/service/result.service.spec.ts
@@ -5,7 +5,7 @@ import { TranslateService } from '@ngx-translate/core';
 import { MockProvider } from 'ng-mocks';
 import { of } from 'rxjs';
 import dayjs from 'dayjs/esm';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { EntityResponseType, ResultService } from 'app/exercises/shared/result/result.service';
 import { ResultWithPointsPerGradingCriterion } from 'app/entities/result-with-points-per-grading-criterion.model';
 import { Result } from 'app/entities/result.model';
@@ -19,7 +19,7 @@ import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../helpers/mocks/service/mock-account.service';
 import { SubmissionService } from 'app/exercises/shared/submission/submission.service';
 import { AssessmentType } from 'app/entities/assessment-type.model';
-import { ProgrammingSubmission } from 'app/entities/programming-submission.model';
+import { ProgrammingSubmission } from 'app/entities/programming/programming-submission.model';
 import {
     FeedbackType,
     NON_GRADED_FEEDBACK_SUGGESTION_IDENTIFIER,
diff --git a/src/test/javascript/spec/service/submission-policy.service.spec.ts b/src/test/javascript/spec/service/submission-policy.service.spec.ts
index 01ee9af19dba..60c5f139df52 100644
--- a/src/test/javascript/spec/service/submission-policy.service.spec.ts
+++ b/src/test/javascript/spec/service/submission-policy.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { SubmissionPolicyService } from 'app/exercises/programming/manage/services/submission-policy.service';
 import { LockRepositoryPolicy, SubmissionPolicyType } from 'app/entities/submission-policy.model';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { take } from 'rxjs/operators';
 
 describe('Submission Policy Service', () => {
diff --git a/src/test/javascript/spec/service/submission-version.service.spec.ts b/src/test/javascript/spec/service/submission-version.service.spec.ts
index a9f9570f2207..380659aabf58 100644
--- a/src/test/javascript/spec/service/submission-version.service.spec.ts
+++ b/src/test/javascript/spec/service/submission-version.service.spec.ts
@@ -1,7 +1,7 @@
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { ArtemisTestModule } from '../test.module';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import dayjs from 'dayjs/esm';
 import { SubmissionVersionService } from 'app/exercises/shared/submission-version/submission-version.service';
 
diff --git a/src/test/javascript/spec/service/submission.service.spec.ts b/src/test/javascript/spec/service/submission.service.spec.ts
index 3ceaff266c5e..276aa8be2498 100644
--- a/src/test/javascript/spec/service/submission.service.spec.ts
+++ b/src/test/javascript/spec/service/submission.service.spec.ts
@@ -7,7 +7,7 @@ import { LocalStorageService, SessionStorageService } from 'ngx-webstorage';
 import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service';
 import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { Result } from 'app/entities/result.model';
 import { Feedback, FeedbackType } from 'app/entities/feedback.model';
 import { HttpResponse } from '@angular/common/http';
diff --git a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts
index c7d1a8d53878..111bc06bc06c 100644
--- a/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts
+++ b/src/test/javascript/spec/service/text-assessment-analytics.service.spec.ts
@@ -1,9 +1,9 @@
 import { TestBed, fakeAsync } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { TextAssessmentEventType } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEventType } from 'app/entities/text/text-assesment-event.model';
 import { TextAssessmentAnalytics } from 'app/exercises/text/assess/analytics/text-assesment-analytics.service';
 import { FeedbackType } from 'app/entities/feedback.model';
-import { TextBlockType } from 'app/entities/text-block.model';
+import { TextBlockType } from 'app/entities/text/text-block.model';
 import { TranslateService } from '@ngx-translate/core';
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { MockSyncStorage } from '../helpers/mocks/service/mock-sync-storage.service';
diff --git a/src/test/javascript/spec/service/text-assessment.service.spec.ts b/src/test/javascript/spec/service/text-assessment.service.spec.ts
index 4cdfb552a3f9..63ae92c49ffb 100644
--- a/src/test/javascript/spec/service/text-assessment.service.spec.ts
+++ b/src/test/javascript/spec/service/text-assessment.service.spec.ts
@@ -1,18 +1,18 @@
 import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { take } from 'rxjs/operators';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { TextAssessmentService } from 'app/exercises/text/assess/text-assessment.service';
 import { Result } from 'app/entities/result.model';
-import { TextAssessmentEvent } from 'app/entities/text-assesment-event.model';
+import { TextAssessmentEvent } from 'app/entities/text/text-assesment-event.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../helpers/mocks/service/mock-account.service';
 import { ExerciseType } from 'app/entities/exercise.model';
 import { AssessmentType } from 'app/entities/assessment-type.model';
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { ComplaintResponse } from 'app/entities/complaint-response.model';
-import { TextBlockRef } from 'app/entities/text-block-ref.model';
+import { TextBlockRef } from 'app/entities/text/text-block-ref.model';
 import { NewStudentParticipationResolver, StudentParticipationResolver } from 'app/exercises/text/assess/text-submission-assessment.route';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
 import { of } from 'rxjs';
diff --git a/src/test/javascript/spec/service/text-exercise.service.spec.ts b/src/test/javascript/spec/service/text-exercise.service.spec.ts
index 675dbd3b8aa0..5557d381a1e9 100644
--- a/src/test/javascript/spec/service/text-exercise.service.spec.ts
+++ b/src/test/javascript/spec/service/text-exercise.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { take } from 'rxjs/operators';
 import { TextExerciseService } from 'app/exercises/text/manage/text-exercise/text-exercise.service';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { Course } from 'app/entities/course.model';
 import { MockTranslateService } from '../helpers/mocks/service/mock-translate.service';
 import { TranslateService } from '@ngx-translate/core';
diff --git a/src/test/javascript/spec/service/text-submission.service.spec.ts b/src/test/javascript/spec/service/text-submission.service.spec.ts
index 3fe80d04c135..d21d44eda72c 100644
--- a/src/test/javascript/spec/service/text-submission.service.spec.ts
+++ b/src/test/javascript/spec/service/text-submission.service.spec.ts
@@ -2,7 +2,7 @@ import { TestBed, fakeAsync, tick } from '@angular/core/testing';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { take } from 'rxjs/operators';
 import { TextSubmissionService } from 'app/exercises/text/participate/text-submission.service';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { AccountService } from 'app/core/auth/account.service';
 import { MockAccountService } from '../helpers/mocks/service/mock-account.service';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
diff --git a/src/test/javascript/spec/util/shared/translate.directive.spec.ts b/src/test/javascript/spec/util/shared/translate.directive.spec.ts
index 7181c3fa07cb..c40004dc7410 100644
--- a/src/test/javascript/spec/util/shared/translate.directive.spec.ts
+++ b/src/test/javascript/spec/util/shared/translate.directive.spec.ts
@@ -8,14 +8,14 @@ import { TranslateDirective } from 'app/shared/language/translate.directive';
 })
 class TestTranslateDirectiveComponent {}
 
-describe('TranslateDirective Tests', () => {
+describe('TranslateDirective', () => {
     let fixture: ComponentFixture<TestTranslateDirectiveComponent>;
     let translateService: TranslateService;
 
     beforeEach(() => {
         TestBed.configureTestingModule({
-            imports: [TranslateModule.forRoot()],
-            declarations: [TranslateDirective, TestTranslateDirectiveComponent],
+            imports: [TranslateModule.forRoot(), TranslateDirective],
+            declarations: [TestTranslateDirectiveComponent],
         })
             .compileComponents()
             .then(() => {
diff --git a/src/test/javascript/spec/util/shared/utils.spec.ts b/src/test/javascript/spec/util/shared/utils.spec.ts
index 296e7ba1fabc..b20604e27615 100644
--- a/src/test/javascript/spec/util/shared/utils.spec.ts
+++ b/src/test/javascript/spec/util/shared/utils.spec.ts
@@ -4,6 +4,7 @@ import {
     isExamExercise,
     round,
     roundScorePercentSpecifiedByCourseSettings,
+    roundToNextMultiple,
     roundValueSpecifiedByCourseSettings,
     stringifyIgnoringFields,
 } from 'app/shared/util/utils';
@@ -119,3 +120,25 @@ describe('isExamExercise', () => {
         expect(isExamExerciseResult).toBeFalse();
     });
 });
+
+describe('roundUpToNextMultiple', () => {
+    it('should round up to multiple of 5 if value is closer to lower multiple', () => {
+        expect(roundToNextMultiple(21, 5, true)).toBe(25);
+    });
+
+    it('should round up to multiple of 5 if value is right underneath next multiple', () => {
+        expect(roundToNextMultiple(24.8, 5, true)).toBe(25);
+    });
+
+    it('should round down to multiple of 5 if value is over next multiple', () => {
+        expect(roundToNextMultiple(24.8, 5, false)).toBe(20);
+    });
+
+    it('should return value is it is a multiple', () => {
+        expect(roundToNextMultiple(25, 5, true)).toBe(25);
+    });
+
+    it('should round up to multiple of 1', () => {
+        expect(roundToNextMultiple(8.2, 1, true)).toBe(9);
+    });
+});
diff --git a/src/test/cypress/certs/Dockerfile b/src/test/playwright/certs/Dockerfile
similarity index 100%
rename from src/test/cypress/certs/Dockerfile
rename to src/test/playwright/certs/Dockerfile
diff --git a/src/test/cypress/certs/README.md b/src/test/playwright/certs/README.md
similarity index 74%
rename from src/test/cypress/certs/README.md
rename to src/test/playwright/certs/README.md
index b95146cc4a42..55e8f826bae7 100644
--- a/src/test/cypress/certs/README.md
+++ b/src/test/playwright/certs/README.md
@@ -1,7 +1,7 @@
-# Cypress: Generate Client Certificates
+# Playwright: Generate Client Certificates
 
-[Cypress allows to use self-signed client certificates](https://docs.cypress.io/guides/references/client-certificates
-) if you also provide a certificate authority.
+Playwright currently lacks support for client certificates. To bypass certificate issues, we are ignoring HTTPS errors.
+Once Playwright supports client certificates, follow these steps to generate the necessary client certificates.
 
 In order to generate these certificates we use the tool [mkcert](https://github.com/FiloSottile/mkcert),
 instead of openssl for instance, as it's easy to use.
@@ -10,7 +10,7 @@ instead of openssl for instance, as it's easy to use.
 The following steps show how to generate new client certificates and the CA files:
 
 ```bash
-cd ./src/test/cypress/certs
+cd ./src/test/playwright/certs
 docker run --rm -v ${PWD}:/certs $(docker build -q . ) /certs/generate-certs.sh artemis-nginx artemis.example localhost 127.0.0.1 ::1
 ```
 
@@ -18,7 +18,7 @@ The CA private key `rootCA-key.pem` doesn't need to be in version control as it'
 but we can also just recreate the whole CA and client certificates.
 
 ## Using the client certificates locally
-If you want to access the artemis-nginx locally from your browser instead of the cypress container's browser,
+If you want to access the artemis-nginx locally from your browser instead of the playwright container's browser,
 you can also install the CA locally on your computer
 [by installing mkcert locally and the following steps](https://github.com/FiloSottile/mkcert#installing-the-ca-on-other-systems):
 
diff --git a/src/test/playwright/certs/artemis-nginx+4-key.pem b/src/test/playwright/certs/artemis-nginx+4-key.pem
index eb2d95da1e9c..e2c0bfc8ab63 100644
--- a/src/test/playwright/certs/artemis-nginx+4-key.pem
+++ b/src/test/playwright/certs/artemis-nginx+4-key.pem
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQCuCJSHStSQd02f
-j+IlQFes7pVUcYv2r0qm5qicGwPcKQf1/nmsy6k4WhE9HQV9VO9LQ4doSNp9NuYX
-P/JQqdYLZYYQvxHS+fR7ofIPjirsrbQYAkG5F6imM8H7MkkueG3HGqaKD54PBmC4
-BgBJDFWiF8jSNSYNKOE2L5SaYG/g3LLIkWBlhBQHgrprkio4pv5Y44+nf+hGWkSj
-bkRo2+PmIsNmQrpDB2o0O7uoyswa71HE967n9K17SWZ7Hi4kP6BGUWn65P5JB10a
-6kz0y8183Uzz99bx8hzxLPg6VNiJZQ+dH4M1Jn6kysKiyV4x24JsM9s6t+Vhln9E
-KX5ktosdAgMBAAECggEBAJs3ddkwqWLrtOSR/H2C5G+NHsyAtPdgIfG3mTwZcBjk
-03/X5gdyYUusMOHTx3ifzwjOgq9FAvFYjGDCHMlKoGfrtWWsNCZ53k6CApVTE/+h
-cRVUte9yJW2Ojf0PPWvf5vEEWPKbuTnnU03ttEVyZdG66tZoprZn9m1QhHYnesEO
-PMPvYMd3Oyko8MD/Rr1A/KS/rmc0yfUvgLsqF6PLxq3NKxyVD/8Tp4u9aXbPMnd2
-vugVxjjvt5ubscF1Owi8EjqjVkXlw94JzLcy70XfBzsS2EvUtX/hmHgBEsViXUOQ
-KGVyeFTvuReq0RvLQi1LA8vs2q6UC0ZYX75wGDfWWnUCgYEAyP6FY6xdP+N83qEM
-TzAf2a33bBCcD5zbrfsvYwHwdzcAz9HBdf3TN1ZcbgfIzIWvuo+hFdjZd32E2+b7
-tSGpcs21iZ3dn1aWxngNs/h94h6cNak/02iCbOsmMX9rHfKZd1ODnQyA8q0s9PQY
-uWWWMUfqPse7mSYbgU0aYOVFraMCgYEA3ak3N2mTgTVsUqhNyZCJlmtafp0tsT6b
-/7GKSqkl741wokM6un3wx1eo6Q95mngxOlY2xxq9OChnNSEa9ZQnzdUDtQ0YE4QD
-09awTIMHNCeSqpV2n3Yv2fT3C5Ya5/WEtYGpVAtqgxwWPij8+VMOa8MVzy+/v6Hg
-N1Tpww+Y8D8CgYEAhbEGeK4FuKFQRaVJ0sJn7RrSIIdLxvbHCIqzkl+P2zwyxgj3
-bcxP2dcP1ABJiADESouO0kFTJS/QV5TkiC7DzyEVR1xCNeIamBjyxGrdELLbpLXX
-Rn+VgW1IElR2o4zil4RtXuEaRFD8PlK+v1La/ByhqvCfz9aRJQhsK1dVaZECgYEA
-jRYR0TFf89P/OLVrnapkCNwX45ND7Bc/0AY/UbpMLSfH02AbV2yl/xvqpT12Vz29
-h7Ysc5qvabk9x/FkaX99vmOhUnIdKv7SONnjqS+VPDsb/XvY3zKozoA/Zp6KTa5W
-Y/k9wALsLruH5NTOABw/h5PKo+9uixkLz+w6Ri/9Vp0CgYEAqfkZJe7vCOIwtIwj
-Mq5knkJgR+Vq30i4jRoFU0yxIcWA1hODVBnK39+mtA++/3+r5DY5fGRTc9mMyXU/
-y2N2nfSnvPMAUaRmisB7NhmvinEgymlrX+WE+7S9/+nOQADxzWSc6Hxg/ub6mTYV
-k2/hv9uG1gbm2+OBP/EBOr48jz0=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDBExGUKX71DriG
+If8pZM7Wb3jA/W65o3tAz2SxM422yWqG/fGOFosDoKST7akQf3kVucFtZGsYAi5r
+tm31Ngmj9YIfKFctAPU3TI52idsSbk0vG7NatwyC2YT12FayWeNwp/2S1jMW8cfI
+rlGfkLAguzVOwO7XDoPtkn11gdnrMbxdww/QTjlFV3NPX5oz5Po+Amnc9HiYZSO5
+chTwq1nU4lEAj5270Yw32rynIrjEhSrwkhSAF+a4NFaHdD8exkT7EGe/pm0ExZZp
+8TdBknIwZEiKWjz5L/9KhwyFKRWTZYWr73Ns9yr1FltkHcXpqfBfDhGjdqihZe9I
+s5PqovLDAgMBAAECggEAP3Om2Uxx3tOBrQNLOi1ZFHv58WLYmsWxYfFGpD3PGv1C
+ty6Jzip2cTDAJaV7ZGKgRpWPjgXsdC1zWA7SQD4MGQg8RUUasT2ZWR0dzLMtffcm
+Ao9V+EAkKnSWD72TcHW+G236FeGzVJ0NDVTMmmYQnBEqScF6PM8WaGM2PAH6viI8
++IrgL3ZWAXL2YvQmyQavG0P+MTLkctrymrnx4kId0FW7dBDgeBu1JOsLpz3Ft4DB
+JoD3gv+aYkYYPzNF6ueLRMp5qVhVu1KZB4QDHZxCAjFUTgn1kCLHmulTVBGrc0v+
+HXhYW6HVrspFqv2em61BZInDu+aruZpADCFj9qxRgQKBgQD8amBMiU8FVBo9c6kD
+FP/+NY4Gh9NPy1zk8uQ4InZ9abNpZ+TX1h9vMvMnyXe49XRy3BYPrT4CVXOe3hXd
+aMolRfRD89W/KUNBlITUw2DEbr9FxQrYMUmjaWj5pKdxOiUxOndD2DmhGAwpi3AS
+iFDLg1j6eAmPfCISXwIGPyT1owKBgQDD0PdB6AuqbJqcvoPRCfUr7x/ciA9VqVuS
+gRYFW6ZGrIOPHp43EFEVzw8Va86lUVR2GRIvnRDWH8H+s1W3JSYaYOmqqA/sZ86i
+lyDmvaACQqOUHrCBu+QUcsflye9a7e13xlRvVm6NchEPMhfe9mx1NbfMGhFd5AkB
+/hi49TSgYQKBgATkMtWI26UoyhFiymWq5IMSmpv5ydiEAlrVciK8WDt57uYeA0tD
+dPx8qkWdG9rTttv689p96vO0oDb16sqNm005m9AtS3kW3ZzJugE9gASOeNprRRiH
+a/vksQoVbME+9TWNAn6oFAXRJ3suno9dYONwuiqwZM8JAsgEW0+vrZGtAoGBAItV
+YOsTm2FsH+QSqCcRZ9QYNdqtMgQpGxC3K50qZrl5Pa+UAM57nMbg7AG5EXSO14Ol
+OUyJ/ZXvSRHcN8y28VLpzLrzFUmJX/5PfUjSe03AbzcRU1UtBhEKz3SR6PARxtxo
+UmJa5RVeqgbfBR9Qx0HrtFnV3q+peENjs+HAEO9hAoGBALAgM8uPmt/ZUAzGPf0T
+kfLV4HolEk7lmSLvEVB0w8yru9q/YcHuD3VtOjiq5h+N38Yn3t2N6PhJ9tt28OWi
+jUmDTmf+n95C1jGYG1Y6SgAPJwdCNHh+j6TPJuv9nwX66DCy8ClY0TpezAeXdH3e
+YfFCsfkK9CPTQt85EqunOvSa
 -----END PRIVATE KEY-----
diff --git a/src/test/playwright/certs/artemis-nginx+4.pem b/src/test/playwright/certs/artemis-nginx+4.pem
index 6492786845eb..0c71f022d760 100644
--- a/src/test/playwright/certs/artemis-nginx+4.pem
+++ b/src/test/playwright/certs/artemis-nginx+4.pem
@@ -1,25 +1,25 @@
 -----BEGIN CERTIFICATE-----
-MIIERjCCAq6gAwIBAgIQSQ2vfdquHAQcrzbEKx46mzANBgkqhkiG9w0BAQsFADBf
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RA
-MWY0ZmQzNzYzNmMyMSEwHwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIw
-HhcNMjIxMjA1MDk0NTEzWhcNMjUwMzA1MDk0NTEzWjBFMScwJQYDVQQKEx5ta2Nl
-cnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxGjAYBgNVBAsMEXJvb3RAMWY0ZmQz
-NzYzNmMyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArgiUh0rUkHdN
-n4/iJUBXrO6VVHGL9q9KpuaonBsD3CkH9f55rMupOFoRPR0FfVTvS0OHaEjafTbm
-Fz/yUKnWC2WGEL8R0vn0e6HyD44q7K20GAJBuReopjPB+zJJLnhtxxqmig+eDwZg
-uAYASQxVohfI0jUmDSjhNi+UmmBv4NyyyJFgZYQUB4K6a5IqOKb+WOOPp3/oRlpE
-o25EaNvj5iLDZkK6QwdqNDu7qMrMGu9RxPeu5/Ste0lmex4uJD+gRlFp+uT+SQdd
-GupM9MvNfN1M8/fW8fIc8Sz4OlTYiWUPnR+DNSZ+pMrCosleMduCbDPbOrflYZZ/
-RCl+ZLaLHQIDAQABo4GXMIGUMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr
-BgEFBQcDATAfBgNVHSMEGDAWgBSpuKALkiwfLnQmm7+JNG2bxGAIgzBMBgNVHREE
-RTBDgg1hcnRlbWlzLW5naW54gg9hcnRlbWlzLmV4YW1wbGWCCWxvY2FsaG9zdIcE
-fwAAAYcQAAAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQsFAAOCAYEApG8ZADQe
-SsH/nqH9WpR3ZkYg0rm8pw+YquBNUdDFG2/4IQtaaxrgsvNPrEEMXfCO4vvnC0cH
-6Tgay8LzFZxU9D1F06VZ9S1C7KNnYSsjgwhW7wxem1JXgauoutA8D0uHLr/2bVnz
-rTShQT7gRp9SRunqDylaSkgpXlfZQRlEANrYT8Jh6LIHRjkxLh/etw7VdFA6Tywh
-iQGBE/EbQcGpmqHBoMytblku0D8H+pcFHZ03AZq0FTMbByM9GekQ8HJV88epqvqJ
-7pWyQPX9lr7yC6n121dPoA0ylP8D7jIBCmlFeF+QWCiRAgdeb1w+JONHMgI97IR+
-9HBm6gGE+Da/TRq82w02tUN/F7NHdzqwKGx/GKLrEsdNlfP6D9iiVtfBGBoAUm+C
-2t3jbQEgqYHA+mzadS75RGJsRnVdY24IHvNjEnESW6KCaSfQyMmp3trRH6JeOttU
-2JeqRPjmOzNvzIcB76w1/hB2ljhimyfoxB8Gbrts+GFPRZE+AXg1mvCn
+MIIERzCCAq+gAwIBAgIRAMlqfnXCQz3X2CUiF24MFaAwDQYJKoZIhvcNAQELBQAw
+XzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRowGAYDVQQLDBFyb290
+QGQzNjZiZGIwMGRkODEhMB8GA1UEAwwYbWtjZXJ0IHJvb3RAZDM2NmJkYjAwZGQ4
+MB4XDTI0MDYyMzE2MzE0MloXDTI2MDkyMzE2MzE0MlowRTEnMCUGA1UEChMebWtj
+ZXJ0IGRldmVsb3BtZW50IGNlcnRpZmljYXRlMRowGAYDVQQLDBFyb290QGQzNjZi
+ZGIwMGRkODCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMETEZQpfvUO
+uIYh/ylkztZveMD9brmje0DPZLEzjbbJaob98Y4WiwOgpJPtqRB/eRW5wW1kaxgC
+Lmu2bfU2CaP1gh8oVy0A9TdMjnaJ2xJuTS8bs1q3DILZhPXYVrJZ43Cn/ZLWMxbx
+x8iuUZ+QsCC7NU7A7tcOg+2SfXWB2esxvF3DD9BOOUVXc09fmjPk+j4Cadz0eJhl
+I7lyFPCrWdTiUQCPnbvRjDfavKciuMSFKvCSFIAX5rg0Vod0Px7GRPsQZ7+mbQTF
+lmnxN0GScjBkSIpaPPkv/0qHDIUpFZNlhavvc2z3KvUWW2Qdxemp8F8OEaN2qKFl
+70izk+qi8sMCAwEAAaOBlzCBlDAOBgNVHQ8BAf8EBAMCBaAwEwYDVR0lBAwwCgYI
+KwYBBQUHAwEwHwYDVR0jBBgwFoAUM5jJgNEPGr9YJJAukqOwnK4E+UwwTAYDVR0R
+BEUwQ4INYXJ0ZW1pcy1uZ2lueIIPYXJ0ZW1pcy5leGFtcGxlgglsb2NhbGhvc3SH
+BH8AAAGHEAAAAAAAAAAAAAAAAAAAAAEwDQYJKoZIhvcNAQELBQADggGBABnZXfx2
+v7JyVzbWHTpbkgYgxLBy+eoiE2GW7YIaZYDrgGYb43rZT1uAa3KOLVogCbNyiw6F
+lZuhOSLZdVBaQDJga11b5CT1lRMGSquU9Nacw4oVP7z1GvO7LEnvO/CK44e+zFST
+s/emVdY8iwe3ruTaUoTj+zQe8OLEWiecZB/IVo08OsF8/txHMCSlb1sAO/4elFMP
+Sulz/dNe8ELkGNOqUjl0BWhSkE4vlTskch2pAClGVGvoBxmLEwVIbu3tnX/fy8ms
+2j1JXreRyDqxPlbQfsrVNz85VxmUdsuTqfrCpVYgpp1DAXX4b6u8/xJugBeXj4qH
+mfDytfCfp0+9nTnZuMbX+zpao0S15s3+jLKeAxAJfMFQ/hxWfs67KqG3G4sqDhOf
+PfwrDk2wudzr1/PRIb+ZCshRgv16ckaEcjPOulgjzGAlGlN1/33Zr8o+O7L2jOMU
+gy8IcXbRERBj5tLBsooXHNitMZHyAYRKy0flCpU+qxPSpJDI4fowbfkp7Q==
 -----END CERTIFICATE-----
diff --git a/src/test/cypress/certs/generate-certs.sh b/src/test/playwright/certs/generate-certs.sh
similarity index 100%
rename from src/test/cypress/certs/generate-certs.sh
rename to src/test/playwright/certs/generate-certs.sh
diff --git a/src/test/playwright/certs/rootCA.pem b/src/test/playwright/certs/rootCA.pem
index df27e7384ca9..25b5da12b9d1 100644
--- a/src/test/playwright/certs/rootCA.pem
+++ b/src/test/playwright/certs/rootCA.pem
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEjTCCAvWgAwIBAgIQU1RC58hYfDrlnkOa5hWT9TANBgkqhkiG9w0BAQsFADBf
-MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RA
-MWY0ZmQzNzYzNmMyMSEwHwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIw
-HhcNMjIxMjA1MDk0NTEzWhcNMzIxMjA1MDk0NTEzWjBfMR4wHAYDVQQKExVta2Nl
-cnQgZGV2ZWxvcG1lbnQgQ0ExGjAYBgNVBAsMEXJvb3RAMWY0ZmQzNzYzNmMyMSEw
-HwYDVQQDDBhta2NlcnQgcm9vdEAxZjRmZDM3NjM2YzIwggGiMA0GCSqGSIb3DQEB
-AQUAA4IBjwAwggGKAoIBgQC6XajL1Rz5RQW0D+TxZ16msa5xAcKt5hEclOUB+oK+
-ychkUiDDSeh4EpkA2txu823n8BLqdNrIZ2A/TW3OVRXcD/hYFTbODI+FZ4DFEHoP
-b8QnMlbZfo1AVNOR5ZFAVuneytaauhznnd1+Y49ieeX2v81hmBUKTuwDGVwp69rS
-WUqANAKuGim7yOyBX6oRaUPg42xIBVHdDXkWr06zcFC6Z1O5zUYmFYHyn/sP2ZRN
-BzMM+lVHCbZlw9Yi5TGLDC4wUAmMS9rColE5E76UNuOvfUERZffdLCzkmbS+VqOI
-28fWvO/C8qEB10lcjxxplah4JZSyveH3Q5aFzLK2FbnXfLa/ypr3Mn9rBm06CtaL
-Moy6h5gxNFDDB4RTpP7kjz32RRbl5xxqgkTEEAGDr/bk/C3DT6pyvGX5k6cj0zWd
-o2bAO42Uk4ehMEHEUhnmvJ1yeOLSabgzfTJ3dM1NkdPI3Ss7dJGfraPx0sGet4SB
-KMKw3mqJIizd1vV19TA/oRECAwEAAaNFMEMwDgYDVR0PAQH/BAQDAgIEMBIGA1Ud
-EwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFKm4oAuSLB8udCabv4k0bZvEYAiDMA0G
-CSqGSIb3DQEBCwUAA4IBgQBSPmSTP6Twe1T5UNqxfLSG/aKtT9yR1gAOW1zmM8KN
-IZEwa1k6AH+y+dBT1MdFtSORVRagKNBwNsqqUMgPlXp9INpo+a5GFT4oAv73CrWu
-bmXq7oiKkfk9UcdBNp3n8J+h+urXm4jEcUzTdNt8R631+seKOjYZz1SKOzpV5iz5
-20Mjk36RkiaiH3sxYvVo9ayXATz4Yq+0jWOHuQpYmFe2mH6wlle8hT/bRQb6/2z0
-wG/kKZl/CYbgRhc39np06mQ7FmAyXTtQORfjfhAUEu568JzPl/r2jYX1YgtEP4IL
-GZXOdSYdtVC1vfpoWIo1YY+xqg3WRA/qgPFW33pZBk/qTaWE4ISMr0ewv613JDdK
-ZOttGRDm2EDmh/FoeRoO5niydjb9DP915xObGMrYXKkPBpoIsQCfcmmFNQBAN4e4
-OQwSP9r/hh1cS8Usk6Ch0/iRhq7lv2Z5irLl/nQ4tPUZDVbBOhJ936t0gySVHbCl
-GVOog28PQ8wI3fRZ2FZg6IM=
+MIIEjjCCAvagAwIBAgIRAI6uW57QOeNpioQa9AKB664wDQYJKoZIhvcNAQELBQAw
+XzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRowGAYDVQQLDBFyb290
+QGQzNjZiZGIwMGRkODEhMB8GA1UEAwwYbWtjZXJ0IHJvb3RAZDM2NmJkYjAwZGQ4
+MB4XDTI0MDYyMzE2MzE0MVoXDTM0MDYyMzE2MzE0MVowXzEeMBwGA1UEChMVbWtj
+ZXJ0IGRldmVsb3BtZW50IENBMRowGAYDVQQLDBFyb290QGQzNjZiZGIwMGRkODEh
+MB8GA1UEAwwYbWtjZXJ0IHJvb3RAZDM2NmJkYjAwZGQ4MIIBojANBgkqhkiG9w0B
+AQEFAAOCAY8AMIIBigKCAYEAnJfQZabKJd/qNqgxv7G+Wq6wpmNZH42PwziYqKdj
+KL+FSFx7959TYxKTfEKXi2SkuA1aLuZUBH8Wle2U2OBPxRpXU/aB6LjDWaRAO4aT
+IsYnGYd+n67bF1QYquFcZwRtcExwlFA7y13XP4Rui/9PmFB8BpSiUe9kX0NUqRrL
+K69GYwDqKdJSEgQPROFuD6RETSVAZMN71FDgdiUR8ozJ75tl5sJAOkLKTFuxSyD3
+MSCtdpdCnnnu2myozbjbyFYHYFNRh8ZujvbdaF8wPd8sGiMlEF2BpSXQ3nfohNfJ
+Arx++hbhHI4kj9vfIbOrCM8403BoPQyLubu9blCmuQAApQk8UKMKGNDSGXX82oVk
+clhgHogz48fKzaNK4USiZi5PmvlGzovpPdqrY4C5kyy38pRSCFMHRpDUkHc/oFe4
+L/f1juqLO2FtevDuPDEuEoPd/AiX09OufMpmpVDYGdCVVeBkgURk9D4lITX3+Q64
+x5mYd+ujZVzV6+XIudQj/D6pAgMBAAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNV
+HRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQzmMmA0Q8av1gkkC6So7CcrgT5TDAN
+BgkqhkiG9w0BAQsFAAOCAYEAY4B7i41qUmPEfXmI0Kp2lwtl/lXno69/a1jGC6ue
+dm7V3mhejTzBVAKAP+0C9gmIhlZ/pXX0tNV50yK2KSlt/ukdXVdiLqavm5hQBJgm
+nyWH+reIbH9IufDOz1N5vPchvZplHOTk9j2QGh/GVZ54BBMwdeEU2YP8WWibcZWh
+LTvficJz67Rf57B/yhisbgaNe8y+8nY37vUdKMtUKlErEN7EaXJlCGhS7JkfEfsp
+67EkO1ID+fMvBHBa3ZrPuWgWvkZB+V3hTKdKLca1Sc6eGx6nMRjflidB82rDOTEx
+tfTdHvKqiomJIbENtlwSuHbhGCo0EWKqXOi7OeEP9kwUuSSfUgMvBQBLmQLJ1OQq
+Y7p2icIuctbzvVIwv2DzKganz2Tz06pb/KMTUlAalfHpqRKB+wg8Sc53g1CtIKNu
+Kd7jUSrRD3RBUNiq08GB6iS0cxjOwPpxm4vJp8TbsiDu2DEwhYkvyq2Q3mfBjSXc
+zR2vjcpinbbB2wa+ENVB1mbX
 -----END CERTIFICATE-----
diff --git a/src/test/playwright/e2e/Login.spec.ts b/src/test/playwright/e2e/Login.spec.ts
index 375fc05a0311..b084440df47c 100644
--- a/src/test/playwright/e2e/Login.spec.ts
+++ b/src/test/playwright/e2e/Login.spec.ts
@@ -38,7 +38,7 @@ test.describe('Login page tests', () => {
         const alertElement = await page.waitForSelector('.alert');
         expect(await alertElement.isVisible()).toBeTruthy();
         const alertText = await alertElement.textContent();
-        expect(alertText).toContain('Failed to sign in! Please check your username and password and try again.');
+        expect(alertText).toContain('Failed to sign in! Please check your login and password and try again.');
 
         await page.click('#login-button');
         await page.click('#login-button');
diff --git a/src/test/playwright/e2e/course/CourseManagement.spec.ts b/src/test/playwright/e2e/course/CourseManagement.spec.ts
index 3e308d1b4431..8a7eacab4135 100644
--- a/src/test/playwright/e2e/course/CourseManagement.spec.ts
+++ b/src/test/playwright/e2e/course/CourseManagement.spec.ts
@@ -2,10 +2,9 @@ import { test } from '../../support/fixtures';
 import dayjs from 'dayjs';
 import { Course } from 'app/entities/course.model';
 import { admin, studentOne } from '../../support/users';
-import { convertBooleanToCheckIconClass, dayjsToString, generateUUID, trimDate } from '../../support/utils';
+import { base64StringToBlob, convertBooleanToCheckIconClass, dayjsToString, generateUUID, trimDate } from '../../support/utils';
 import { expect } from '@playwright/test';
 import { Fixtures } from '../../fixtures/fixtures';
-import { base64StringToBlob } from '../../support/utils';
 
 // Common primitives
 const courseData = {
diff --git a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
index 1e5ce60aa8d5..3bfee439d546 100644
--- a/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamAssessment.spec.ts
@@ -6,7 +6,7 @@ import { Page, expect } from '@playwright/test';
 import javaPartiallySuccessful from '../../fixtures/exercise/programming/java/partially_successful/submission.json';
 
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Commands } from '../../support/commands';
 import { ExamAPIRequests } from '../../support/requests/ExamAPIRequests';
 import { ExamExerciseGroupCreationPage } from '../../support/pageobjects/exam/ExamExerciseGroupCreationPage';
diff --git a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts
index 5895880ab49e..757665204a13 100644
--- a/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamCreationDeletion.spec.ts
@@ -4,7 +4,7 @@ import { Course } from 'app/entities/course.model';
 import { dayjsToString, generateUUID, trimDate } from '../../support/utils';
 import dayjs from 'dayjs';
 import { expect } from '@playwright/test';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 /*
  * Common primitives
diff --git a/src/test/playwright/e2e/exam/ExamManagement.spec.ts b/src/test/playwright/e2e/exam/ExamManagement.spec.ts
index 743541cd5edb..a91b64b7f764 100644
--- a/src/test/playwright/e2e/exam/ExamManagement.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamManagement.spec.ts
@@ -3,7 +3,7 @@ import { admin, instructor, studentOne } from '../../support/users';
 import { generateUUID, newBrowserPage } from '../../support/utils';
 import { test } from '../../support/fixtures';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Commands } from '../../support/commands';
 import { CourseManagementAPIRequests } from '../../support/requests/CourseManagementAPIRequests';
diff --git a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts
index 8264232513e2..a27ffe2c25ab 100644
--- a/src/test/playwright/e2e/exam/ExamParticipation.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamParticipation.spec.ts
@@ -5,7 +5,7 @@ import { admin, instructor, studentFour, studentOne, studentThree, studentTwo, t
 import { generateUUID } from '../../support/utils';
 import javaAllSuccessfulSubmission from '../../fixtures/exercise/programming/java/all_successful/submission.json';
 import dayjs from 'dayjs';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { expect } from '@playwright/test';
 import { ExamStartEndPage } from '../../support/pageobjects/exam/ExamStartEndPage';
 import { Commands } from '../../support/commands';
diff --git a/src/test/playwright/e2e/exam/ExamResults.spec.ts b/src/test/playwright/e2e/exam/ExamResults.spec.ts
index 676e02c2e686..874a49e23089 100644
--- a/src/test/playwright/e2e/exam/ExamResults.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamResults.spec.ts
@@ -1,5 +1,5 @@
 import { test } from '../../support/fixtures';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { Commands } from '../../support/commands';
 import { admin, instructor, studentOne, tutor } from '../../support/users';
 import { Course } from 'app/entities/course.model';
diff --git a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts
index 732bbc4f1290..42e873ca2427 100644
--- a/src/test/playwright/e2e/exam/ExamTestRun.spec.ts
+++ b/src/test/playwright/e2e/exam/ExamTestRun.spec.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 import javaBuildErrorSubmission from '../../fixtures/exercise/programming/java/build_error/submission.json';
 import { Exercise, ExerciseType } from '../../support/constants';
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts
index 71ee1df974ec..d3f340fcb917 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamCreationDeletion.spec.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 import { admin } from '../../../support/users';
 import { dayjsToString, generateUUID, trimDate } from '../../../support/utils';
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
index 931b80bace33..9fc0bdb9cf5e 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamManagement.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 
 import { admin, instructor, studentOne } from '../../../support/users';
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts
index 4231108de78b..c66d2966576f 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamParticipation.spec.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json';
 import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts
index 12ae9b246554..1699d5539c22 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamStudentExams.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { UserCredentials, admin, studentOne, studentThree, studentTwo, users } from '../../../support/users';
 import { generateUUID } from '../../../support/utils';
 import { Exercise, ExerciseType } from '../../../support/constants';
diff --git a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts
index 90cce7420bee..66b13ff3af12 100644
--- a/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts
+++ b/src/test/playwright/e2e/exam/test-exam/TestExamTestRun.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
 import { Exercise, ExerciseType } from '../../../support/constants';
diff --git a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts
index d08d08717ca7..8290457c32b9 100644
--- a/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts
+++ b/src/test/playwright/e2e/exercise/ExerciseImport.spec.ts
@@ -2,9 +2,9 @@ import dayjs from 'dayjs';
 
 import { Course } from 'app/entities/course.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 
 import javaPartiallySuccessfulSubmission from '../../fixtures/exercise/programming/java/partially_successful/submission.json';
 import multipleChoiceQuizTemplate from '../../fixtures/exercise/quiz/multiple_choice/template.json';
@@ -13,7 +13,7 @@ import { generateUUID } from '../../support/utils';
 import { test } from '../../support/fixtures';
 import { expect } from '@playwright/test';
 import { Fixtures } from '../../fixtures/fixtures';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 import { QuizSubmission } from 'app/entities/quiz/quiz-submission.model';
 import { ModelingSubmission } from 'app/entities/modeling-submission.model';
 
diff --git a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts
index d1582cdc53b6..cd30ff8cf24b 100644
--- a/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts
+++ b/src/test/playwright/e2e/exercise/modeling/ModelingExerciseManagement.spec.ts
@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-import { MODELING_EDITOR_CANVAS } from 'src/test/cypress/support/constants';
+import { MODELING_EDITOR_CANVAS } from '../../../support/constants';
 
 import { Course } from 'app/entities/course.model';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts
index 199c19c87306..ba4e95fbb241 100644
--- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts
+++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseAssessment.spec.ts
@@ -1,7 +1,7 @@
 import dayjs from 'dayjs';
 
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 import { ProgrammingExerciseAssessmentType } from '../../../support/constants';
 import { admin, instructor, studentOne, tutor } from '../../../support/users';
diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
index 51e6c7bb0bc2..9bea097033d6 100644
--- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
+++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseManagement.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 import { admin, instructor, studentFour, studentOne, studentThree, studentTwo, tutor } from '../../../support/users';
 import { test } from '../../../support/fixtures';
@@ -33,6 +33,36 @@ test.describe('Programming Exercise Management', () => {
             await expect(courseManagementExercises.getExerciseTitle(exerciseTitle)).toBeVisible();
             await page.waitForURL(`**/programming-exercises/${exercise.id}**`);
         });
+
+        test('FormStatusBar scrolls to the correct section with headline visible after scroll', async ({
+            login,
+            page,
+            navigationBar,
+            courseManagement,
+            courseManagementExercises,
+            programmingExerciseCreation,
+        }) => {
+            await login(admin, '/');
+            await navigationBar.openCourseManagement();
+            await courseManagement.openExercisesOfCourse(course.id!);
+            await courseManagementExercises.createProgrammingExercise();
+            await page.waitForURL('**/programming-exercises/new**');
+
+            const firstSectionHeadline = 'General';
+            const firstSectionStatusBarId = 0;
+            const fourthSectionHeadline = 'Problem';
+            const fourthSectionStatusBarId = 3;
+
+            // scroll down
+            await programmingExerciseCreation.clickFormStatusBarSection(fourthSectionStatusBarId);
+            await programmingExerciseCreation.checkIsHeadlineVisibleToUser(firstSectionHeadline, false);
+            await programmingExerciseCreation.checkIsHeadlineVisibleToUser(fourthSectionHeadline, true);
+
+            // scroll up
+            await programmingExerciseCreation.clickFormStatusBarSection(firstSectionStatusBarId);
+            await programmingExerciseCreation.checkIsHeadlineVisibleToUser(firstSectionHeadline, true);
+            await programmingExerciseCreation.checkIsHeadlineVisibleToUser(fourthSectionHeadline, false);
+        });
     });
 
     test.describe('Programming exercise deletion', () => {
diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts
index f0540dc21dc3..0a36076081ea 100644
--- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts
+++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseParticipation.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 import javaAllSuccessfulSubmission from '../../../fixtures/exercise/programming/java/all_successful/submission.json';
 import javaBuildErrorSubmission from '../../../fixtures/exercise/programming/java/build_error/submission.json';
diff --git a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
index ffeb96adc4d5..c11dac9b557e 100644
--- a/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
+++ b/src/test/playwright/e2e/exercise/programming/ProgrammingExerciseStaticCodeAnalysis.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 
 import javaScaSubmission from '../../../fixtures/exercise/programming/java/static_code_analysis/submission.json';
 import { admin, studentOne } from '../../../support/users';
diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts
index 61228fd2ef67..ed4b9a076c42 100644
--- a/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts
+++ b/src/test/playwright/e2e/exercise/text/TextExerciseAssessment.spec.ts
@@ -1,5 +1,5 @@
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 
 import { admin, instructor, studentOne, tutor } from '../../../support/users';
 import { test } from '../../../support/fixtures';
diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts
index 56ab3c12e168..5bf800e36484 100644
--- a/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts
+++ b/src/test/playwright/e2e/exercise/text/TextExerciseManagement.spec.ts
@@ -1,12 +1,12 @@
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 import { test } from '../../../support/fixtures';
 import { admin } from '../../../support/users';
 import { generateUUID } from '../../../support/utils';
 import dayjs from 'dayjs';
 import { expect } from '@playwright/test';
 import { ExampleSubmission } from 'app/entities/example-submission.model';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 
 test.describe('Text exercise management', () => {
     let course: Course;
diff --git a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts
index d476578e779c..b2ac84ef3284 100644
--- a/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts
+++ b/src/test/playwright/e2e/exercise/text/TextExerciseParticipation.spec.ts
@@ -1,11 +1,11 @@
 import { Course } from 'app/entities/course.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 
 import { admin, studentOne } from '../../../support/users';
 import { test } from '../../../support/fixtures';
 import { Fixtures } from '../../../fixtures/fixtures';
 import { expect } from '@playwright/test';
-import { TextSubmission } from 'app/entities/text-submission.model';
+import { TextSubmission } from 'app/entities/text/text-submission.model';
 
 test.describe('Text exercise participation', () => {
     let course: Course;
diff --git a/src/test/playwright/support/pageobjects/LoginPage.ts b/src/test/playwright/support/pageobjects/LoginPage.ts
index 24045742e765..5cdd42efc652 100644
--- a/src/test/playwright/support/pageobjects/LoginPage.ts
+++ b/src/test/playwright/support/pageobjects/LoginPage.ts
@@ -12,19 +12,33 @@ export class LoginPage {
     }
 
     /**
-     * Enters the specified username into the username input field.
+     * Enters the specified value into the input field with the specified selector, then blurs the input field.
+     * This is necessary because the username and password fields are only validated on blur, e.g. when the user clicks
+     * elsewhere on the page or presses the Tab key.
+     * @param selector The selector of the input field.
+     * @param value The value to be entered.
+     * @private
+     */
+    private async fillThenBlurInput(selector: string, value: string) {
+        const locator = this.page.locator(selector);
+        await locator.fill(value);
+        await locator.blur();
+    }
+
+    /**
+     * Enters the specified username into the username input field, then blurs the input field.
      * @param name - The username to be entered.
      */
     async enterUsername(name: string) {
-        await this.page.fill('#username', name);
+        await this.fillThenBlurInput('#username', name);
     }
 
     /**
-     * Enters the specified password into the password input field.
+     * Enters the specified password into the password input field, then blurs the input field.
      * @param password - The password to be entered.
      */
     async enterPassword(password: string) {
-        await this.page.fill('#password', password);
+        await this.fillThenBlurInput('#password', password);
     }
 
     /**
diff --git a/src/test/playwright/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts b/src/test/playwright/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts
index 1e8725207c5d..e2085f6b5bc4 100644
--- a/src/test/playwright/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts
+++ b/src/test/playwright/support/pageobjects/assessment/ProgrammingExerciseAssessmentPage.ts
@@ -6,7 +6,7 @@ import { AbstractExerciseAssessmentPage } from './AbstractExerciseAssessmentPage
  */
 export class ProgrammingExerciseAssessmentPage extends AbstractExerciseAssessmentPage {
     async provideFeedbackOnCodeLine(lineIndex: number, points: number, feedback: string) {
-        // We can't change elements from the ace editor, so we can't use custom ids here
+        // We can't change elements from the Monaco editor, so we can't use custom ids here
         await this.page.locator('.view-line').nth(lineIndex).hover();
         await this.page.locator('.monaco-add-feedback-button').click();
         await this.typeIntoFeedbackEditor(feedback, lineIndex);
diff --git a/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts b/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts
index 17d24b98c07a..6fd47e0a9a7f 100644
--- a/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts
+++ b/src/test/playwright/support/pageobjects/course/CourseCommunicationPage.ts
@@ -156,7 +156,7 @@ export class CourseCommunicationPage {
      */
     async reply(postID: number, content: string) {
         const postElement = this.getSinglePost(postID);
-        const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .ace_content');
+        const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .monaco-editor');
         await postReplyField.click();
         await postReplyField.pressSequentially(content);
         const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/answer-posts`);
@@ -172,7 +172,7 @@ export class CourseCommunicationPage {
      */
     async replyWithMessage(postID: number, content: string): Promise<Post> {
         const postElement = this.getSinglePost(postID);
-        const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .ace_content');
+        const postReplyField = postElement.locator('.new-reply-inline-input .markdown-editor .monaco-editor');
         await postReplyField.click();
         await postReplyField.pressSequentially(content);
         const responsePromise = this.page.waitForResponse(`${COURSE_BASE}/*/answer-messages`);
diff --git a/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts
index 53ac528bcdcc..e710822e6723 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamCreationPage.ts
@@ -131,15 +131,10 @@ export class ExamCreationPage {
 
     private async enterText(selector: string, text: string) {
         const textField = this.page.locator(selector);
-        const textInput = textField.locator('.ace_text-input');
-        // const currentText = textField.locator('.ace_text');
-
-        // if (await currentText.isVisible()) {
-        // const text = await currentText.textContent();
+        const textInput = textField.locator('.monaco-editor');
         if (text) {
             await clearTextField(textInput);
         }
-        // }
         await textInput.pressSequentially(text);
     }
 }
diff --git a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts
index 2c060438098e..58d3557d19f3 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamExerciseGroupCreationPage.ts
@@ -1,5 +1,5 @@
 import { Page } from '@playwright/test';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { ExamAPIRequests } from '../../requests/ExamAPIRequests';
 import { ExerciseAPIRequests } from '../../requests/ExerciseAPIRequests';
 import multipleChoiceTemplate from '../../../fixtures/exercise/quiz/multiple_choice/template.json';
@@ -8,7 +8,7 @@ import { generateUUID } from '../../utils';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { Exercise } from 'app/entities/exercise.model';
-import { Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 
 export class ExamExerciseGroupCreationPage {
     private readonly page: Page;
diff --git a/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts b/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts
index ad7dae5a7225..e2e5f76c24f0 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamManagementPage.ts
@@ -114,7 +114,7 @@ export class ExamManagementPage {
     }
 
     async typeAnnouncementMessage(message: string) {
-        await this.page.locator('.ace_text-input').fill(message);
+        await this.page.locator('.monaco-editor textarea').fill(message);
     }
 
     async verifyAnnouncementContent(announcementTime: Dayjs, message: string, authorUsername: string) {
diff --git a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts
index cdec2ee5d8dc..e07b9e42f486 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamParticipationPage.ts
@@ -1,6 +1,6 @@
 import { Page, expect } from '@playwright/test';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { AdditionalData, ExerciseType } from '../../constants';
 import { UserCredentials } from '../../users';
 import { OnlineEditorPage, ProgrammingExerciseSubmission } from '../exercises/programming/OnlineEditorPage';
diff --git a/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts b/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts
index a5e3891f5ef7..d741796fe898 100644
--- a/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts
+++ b/src/test/playwright/support/pageobjects/exam/ExamTestRunPage.ts
@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test';
 import { Course } from 'app/entities/course.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { UserCredentials } from '../../users';
 import { Commands } from '../../commands';
 import { ExamStartEndPage } from './ExamStartEndPage';
diff --git a/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts
index 1520841bccf9..760eb91275dc 100644
--- a/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exercises/file-upload/FileUploadExerciseCreationPage.ts
@@ -53,6 +53,6 @@ export class FileUploadExerciseCreationPage {
     }
 
     private async typeText(selector: string, text: string) {
-        await this.page.locator(selector).locator('.ace_content').pressSequentially(text);
+        await this.page.locator(selector).locator('.monaco-editor').pressSequentially(text);
     }
 }
diff --git a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
index a3e2cf7b0553..a59342550bbf 100644
--- a/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exercises/programming/ProgrammingExerciseCreationPage.ts
@@ -1,4 +1,4 @@
-import { Page, expect } from '@playwright/test';
+import { Locator, Page, expect } from '@playwright/test';
 import { PROGRAMMING_EXERCISE_BASE, ProgrammingLanguage } from '../../../constants';
 import { Dayjs } from 'dayjs';
 
@@ -73,4 +73,62 @@ export class ProgrammingExerciseCreationPage {
         }
         await expect(this.page.locator('.owl-dt-popup')).not.toBeVisible();
     }
+
+    /**
+     * Uses an element that is affected by the scrolling of the page as reference to determine if the page is still scrolling
+     *
+     * Here we are using the headline of the page as reference
+     */
+    async waitForPageToFinishScrolling(maxTimeout: number = 5000) {
+        const elementOnPageAffectedByScroll = this.page.locator('h2');
+        let isScrolling = true;
+        const startTime = Date.now();
+
+        while (isScrolling) {
+            const initialPosition = await elementOnPageAffectedByScroll.boundingBox();
+            await this.page.waitForTimeout(100); // give the page a short time to scroll
+            const newPosition = await elementOnPageAffectedByScroll.boundingBox();
+
+            isScrolling = initialPosition?.y !== newPosition?.y;
+
+            const isWaitingForScrollExceedingTimeout = Date.now() - startTime > maxTimeout;
+            if (isWaitingForScrollExceedingTimeout) {
+                throw new Error(`Aborting waiting for scroll end - page is still scrolling after ${maxTimeout}ms`);
+            }
+        }
+    }
+
+    async clickFormStatusBarSection(sectionId: number) {
+        const searchedSectionId = `#status-bar-section-item-${sectionId}`;
+        const sectionStatusBarLocator: Locator = this.page.locator(searchedSectionId);
+        expect(await sectionStatusBarLocator.isVisible()).toBeTruthy();
+        await sectionStatusBarLocator.click();
+        await this.waitForPageToFinishScrolling();
+    }
+
+    /**
+     * Verifies that the locator is visible in the viewport and not hidden by another element
+     * (e.g. could be hidden by StatusBar / Navbar)
+     *
+     * {@link toBeHidden} and {@link toBeVisible} do not solve this problem
+     * @param locator
+     */
+    private async verifyLocatorIsVisible(locator: Locator) {
+        const initialPosition = await locator.boundingBox();
+        await locator.click(); // scrolls to the locator if needed (e.g. if hidden by another element)
+        const newPosition = await locator.boundingBox();
+        expect(initialPosition).toEqual(newPosition);
+    }
+
+    async checkIsHeadlineVisibleToUser(searchedHeadlineDisplayText: string, expected: boolean) {
+        const headlineLocator = this.page.getByRole('heading', { name: searchedHeadlineDisplayText }).first();
+
+        if (expected) {
+            await expect(headlineLocator).toBeInViewport({ ratio: 1 });
+            /** additional check because {@link toBeInViewport} is too inaccurate */
+            await this.verifyLocatorIsVisible(headlineLocator);
+        } else {
+            await expect(headlineLocator).not.toBeInViewport();
+        }
+    }
 }
diff --git a/src/test/playwright/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts
index 7317e96d0711..9cccd6576272 100644
--- a/src/test/playwright/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exercises/quiz/QuizExerciseCreationPage.ts
@@ -25,8 +25,8 @@ export class QuizExerciseCreationPage {
         await this.page.locator('#score').fill(points.toString());
 
         const fileContent = await Fixtures.get('exercise/quiz/multiple_choice/question.txt');
-        const textInputField = this.page.locator('.ace_text-input');
-        await textInputField.focus();
+        const textInputField = this.page.locator('.monaco-editor');
+        await textInputField.click();
         await textInputField.pressSequentially(fileContent!);
     }
 
@@ -61,9 +61,9 @@ export class QuizExerciseCreationPage {
         await drag(this.page, dragLocator, dropLocator);
 
         const fileContent = await Fixtures.get('exercise/quiz/drag_and_drop/question.txt');
-        const textInputField = this.page.locator('.ace_text-input');
+        const textInputField = this.page.locator('.monaco-editor');
         await clearTextField(textInputField);
-        await textInputField.fill(fileContent!);
+        await textInputField.pressSequentially(fileContent!);
     }
 
     async createDragAndDropItem(text: string) {
diff --git a/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts b/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts
index a18217aac3d1..7d13e7ee1101 100644
--- a/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/exercises/text/TextExerciseCreationPage.ts
@@ -57,7 +57,7 @@ export class TextExerciseCreationPage {
     }
 
     private async typeText(selector: string, text: string) {
-        const textField = this.page.locator(selector).locator('.ace_content');
+        const textField = this.page.locator(selector).locator('.monaco-editor');
         await textField.click();
         await textField.pressSequentially(text);
     }
diff --git a/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts b/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts
index 2d2e122969a6..8e4fa68e7f31 100644
--- a/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts
+++ b/src/test/playwright/support/pageobjects/lecture/LectureCreationPage.ts
@@ -35,7 +35,7 @@ export class LectureCreationPage {
      * @param description - The description text for the lecture.
      */
     async typeDescription(description: string) {
-        const descriptionField = this.page.locator('.ace_content');
+        const descriptionField = this.page.locator('.monaco-editor');
         await descriptionField.click();
         await descriptionField.pressSequentially(description);
     }
diff --git a/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts b/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts
index af5624689a7d..40b336fdb1de 100644
--- a/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts
+++ b/src/test/playwright/support/pageobjects/lecture/LectureManagementPage.ts
@@ -95,7 +95,7 @@ export class LectureManagementPage {
         await this.openCreateUnit(UnitType.TEXT);
         await this.page.fill('#name', name);
         await this.page.fill('#pick-releaseDate #date-input-field', releaseDate.toString());
-        const contentField = this.page.locator('.ace_content');
+        const contentField = this.page.locator('.monaco-editor');
         await contentField.click();
         await contentField.pressSequentially(text);
         return this.submitUnit();
diff --git a/src/test/playwright/support/requests/CourseManagementAPIRequests.ts b/src/test/playwright/support/requests/CourseManagementAPIRequests.ts
index 3b04f8571785..3003ec91e760 100644
--- a/src/test/playwright/support/requests/CourseManagementAPIRequests.ts
+++ b/src/test/playwright/support/requests/CourseManagementAPIRequests.ts
@@ -8,7 +8,7 @@ import lectureTemplate from '../../fixtures/lecture/template.json';
 import { BASE_API, COURSE_ADMIN_BASE, COURSE_BASE, Exercise } from '../constants';
 import { UserCredentials } from '../users';
 import { Commands } from '../commands';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 
 /**
  * A class which encapsulates all API requests related to course management.
diff --git a/src/test/playwright/support/requests/ExamAPIRequests.ts b/src/test/playwright/support/requests/ExamAPIRequests.ts
index be8175b5a711..c250415fb2db 100644
--- a/src/test/playwright/support/requests/ExamAPIRequests.ts
+++ b/src/test/playwright/support/requests/ExamAPIRequests.ts
@@ -1,6 +1,6 @@
 import { Course } from 'app/entities/course.model';
 import dayjs from 'dayjs';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { dayjsToString, generateUUID, titleLowercase } from '../utils';
 import examTemplate from '../../fixtures/exam/template.json';
 import { Page } from '@playwright/test';
diff --git a/src/test/playwright/support/requests/ExerciseAPIRequests.ts b/src/test/playwright/support/requests/ExerciseAPIRequests.ts
index 9b7bc73ace71..2fac212a5d73 100644
--- a/src/test/playwright/support/requests/ExerciseAPIRequests.ts
+++ b/src/test/playwright/support/requests/ExerciseAPIRequests.ts
@@ -4,7 +4,7 @@ import { Page } from 'playwright-core';
 import { Course } from 'app/entities/course.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { QuizExercise } from 'app/entities/quiz/quiz-exercise.model';
-import { TextExercise } from 'app/entities/text-exercise.model';
+import { TextExercise } from 'app/entities/text/text-exercise.model';
 
 import fileUploadExerciseTemplate from '../../fixtures/exercise/file-upload/template.json';
 import modelingExerciseSubmissionTemplate from '../../fixtures/exercise/modeling/submission.json';
@@ -34,16 +34,16 @@ import {
 } from '../constants';
 import { dayjsToString, generateUUID, titleLowercase } from '../utils';
 import { ModelingExercise } from 'app/entities/modeling-exercise.model';
-import { ProgrammingExercise } from 'app/entities/programming-exercise.model';
+import { ProgrammingExercise } from 'app/entities/programming/programming-exercise.model';
 import { FileUploadExercise } from 'app/entities/file-upload-exercise.model';
 import { Participation } from 'app/entities/participation/participation.model';
-import { Exam } from 'app/entities/exam.model';
+import { Exam } from 'app/entities/exam/exam.model';
 import { StudentParticipation } from 'app/entities/participation/student-participation.model';
 import { Team } from 'app/entities/team.model';
 import { TeamAssignmentConfig } from 'app/entities/team-assignment-config.model';
 import { ProgrammingExerciseSubmission } from '../pageobjects/exercises/programming/OnlineEditorPage';
 import { Fixtures } from '../../fixtures/fixtures';
-import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming-exercise-test-case.model';
+import { ProgrammingExerciseTestCase, Visibility } from 'app/entities/programming/programming-exercise-test-case.model';
 
 type PatchProgrammingExerciseTestVisibilityDto = {
     id: number;
diff --git a/src/test/playwright/support/utils.ts b/src/test/playwright/support/utils.ts
index 9d135bbc7282..bc464f447717 100644
--- a/src/test/playwright/support/utils.ts
+++ b/src/test/playwright/support/utils.ts
@@ -87,10 +87,12 @@ export function titleLowercase(title: string) {
 /**
  * Converts a boolean value to its related icon class.
  * @param boolean - The boolean value to be converted.
- * @returns The corresponding ".checked" or ".unchecked" string.
+ * @returns The corresponding icon class
  */
 export function convertBooleanToCheckIconClass(boolean: boolean) {
-    return boolean ? '.checked' : '.unchecked';
+    const sectionInvalidIcon = '.fa-xmark';
+    const sectionValidIcon = '.fa-circle-check';
+    return boolean ? sectionValidIcon : sectionInvalidIcon;
 }
 
 /**
diff --git a/src/test/resources/config/application-artemis.yml b/src/test/resources/config/application-artemis.yml
index 1bc086c96a92..9cac2ec6dc93 100644
--- a/src/test/resources/config/application-artemis.yml
+++ b/src/test/resources/config/application-artemis.yml
@@ -62,5 +62,15 @@ artemis:
         restricted-modules: module_text_test_restricted,module_programming_test_restricted
     apollon:
         conversion-service-url: http://localhost:8080
+    telemetry:
+        enabled: true
+        sendAdminDetails: true
+        destination: http://localhost:8081
     plagiarism-checks:
         plagiarism-results-limit: 100
+
+info:
+    operatorName: Some Artemis Operator # Must be set before starting the application in production. Shown in the about us page, and sent to the telemetry service
+    operatorAdminName: Some Universities Admin # Can be set to be shown in the about us page, and to be sent to the telemetry service
+    contact: admin@uni.de # The admins contact email address, shown in the about us page, and sent to the telemetry service
+
diff --git a/src/test/resources/config/application-theia.yml b/src/test/resources/config/application-theia.yml
new file mode 100644
index 000000000000..883dea41098f
--- /dev/null
+++ b/src/test/resources/config/application-theia.yml
@@ -0,0 +1,9 @@
+theia:
+    portal-url: https://your-theia-instance.com
+
+    images:
+        java:
+            Java-17: "ghcr.io/ls1intum/theia/java-17:latest"
+            Java-Non-Existent: "this-is-not-a-valid-image"
+        c:
+            C: "ghcr.io/ls1intum/theia/c:latest"
diff --git a/src/test/resources/config/application.yml b/src/test/resources/config/application.yml
index bba3939e92f3..f699af193497 100644
--- a/src/test/resources/config/application.yml
+++ b/src/test/resources/config/application.yml
@@ -66,6 +66,8 @@ artemis:
                     default: "~~invalid~~"
                 ocaml:
                     default: "~~invalid~~"
+                rust:
+                    default: "~~invalid~~"
 
 spring:
     application:
@@ -249,6 +251,7 @@ info:
     # default value set to true for tests
     text-assessment-analytics-enabled: true
     student-exam-store-session-data: true
+    contact: contactEmail@contact.de
 
 jhipster:
     clientApp:
diff --git a/supporting_scripts/analysis-of-endpoint-connections/build.gradle b/supporting_scripts/analysis-of-endpoint-connections/build.gradle
index ef2fa37c2f5a..226588714dd0 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/build.gradle
+++ b/supporting_scripts/analysis-of-endpoint-connections/build.gradle
@@ -1,32 +1,38 @@
 plugins {
-    id 'java'
-    id 'application'
+    id "java"
+    id "application"
 }
 
-group 'de.tum.in.www1.artemis'
-version '1.0-SNAPSHOT'
+group "de.tum.in.www1.artemis"
+version "1.0.0"
 
 repositories {
     mavenCentral()
 }
 
-evaluationDependsOn(':')
+evaluationDependsOn(":")
 
 dependencies {
-    implementation rootProject.ext.qDoxVersionReusable
+    implementation "com.github.javaparser:javaparser-symbol-solver-core:${project.java_parser_version}"
+    implementation "com.github.javaparser:javaparser-core:${project.java_parser_version}"
+    implementation "com.github.javaparser:javaparser-core-serialization:${project.java_parser_version}"
+    implementation "com.fasterxml.jackson.core:jackson-databind:${project.fasterxml_version}"
     implementation rootProject.ext.springBootStarterWeb
+    implementation "org.slf4j:slf4j-api:${project.slf4j_version}"
+    implementation "ch.qos.logback:logback-classic:${project.logback_version}"
 }
 
-test {
-    useJUnitPlatform()
+task runEndpointParser(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "de.tum.cit.endpointanalysis.EndpointParser"
 }
 
-application {
-    mainClassName = 'de.tum.cit.endpointanalysis.AnalysisOfEndpointConnections'
+task runEndpointAnalysis(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "de.tum.cit.endpointanalysis.EndpointAnalyzer"
 }
 
-run {
-    if (project.hasProperty('appArgs')) {
-        args = project.appArgs.split(' ')
-    }
+task runRestCallAnalysis(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "de.tum.cit.endpointanalysis.RestCallAnalyzer"
 }
diff --git a/supporting_scripts/analysis-of-endpoint-connections/endpoints.json b/supporting_scripts/analysis-of-endpoint-connections/endpoints.json
new file mode 100644
index 000000000000..7846fb272dbc
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/endpoints.json
@@ -0,0 +1 @@
+[{"filePath":"CourseCompetencyResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getCompetencyTitle","httpMethodAnnotation":"GetMapping","URI":"\"course-competencies/{competencyId}/title\"","className":"CourseCompetencyResource","line":115,"otherAnnotations":["@GetMapping(\"course-competencies/{competencyId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseCompetencyTitles","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/titles\"","className":"CourseCompetencyResource","line":128,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/titles\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCourseCompetency","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/{competencyId}\"","className":"CourseCompetencyResource","line":143,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/{competencyId}\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCourseCompetenciesWithProgress","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies\"","className":"CourseCompetencyResource","line":163,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetencyStudentProgress","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/{competencyId}/student-progress\"","className":"CourseCompetencyResource","line":180,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/{competencyId}/student-progress\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetencyCourseProgress","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/{competencyId}/course-progress\"","className":"CourseCompetencyResource","line":208,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/{competencyId}/course-progress\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetenciesForImport","httpMethodAnnotation":"GetMapping","URI":"\"course-competencies/for-import\"","className":"CourseCompetencyResource","line":226,"otherAnnotations":["@GetMapping(\"course-competencies/for-import\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importAllCompetenciesFromCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/course-competencies/import-all/{sourceCourseId}\"","className":"CourseCompetencyResource","line":242,"otherAnnotations":["@PostMapping(\"courses/{courseId}/course-competencies/import-all/{sourceCourseId}\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetencyRelations","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/relations\"","className":"CourseCompetencyResource","line":276,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/relations\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"createCompetencyRelation","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/course-competencies/relations\"","className":"CourseCompetencyResource","line":294,"otherAnnotations":["@PostMapping(\"courses/{courseId}/course-competencies/relations\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"removeCompetencyRelation","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/course-competencies/relations/{competencyRelationId}\"","className":"CourseCompetencyResource","line":319,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/course-competencies/relations/{competencyRelationId}\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"generateCompetenciesFromCourseDescription","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/course-competencies/generate-from-description\"","className":"CourseCompetencyResource","line":342,"otherAnnotations":["@PostMapping(\"courses/{courseId}/course-competencies/generate-from-description\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"setJudgementOfLearning","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/course-competencies/{competencyId}/jol/{jolValue}\"","className":"CourseCompetencyResource","line":364,"otherAnnotations":["@PutMapping(\"courses/{courseId}/course-competencies/{competencyId}/jol/{jolValue}\")","@FeatureToggle(Feature.StudentCourseAnalyticsDashboard)","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getLatestJudgementOfLearningForCompetency","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/{competencyId}/jol\"","className":"CourseCompetencyResource","line":384,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/{competencyId}/jol\")","@FeatureToggle(Feature.StudentCourseAnalyticsDashboard)","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getLatestJudgementOfLearningForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-competencies/jol\"","className":"CourseCompetencyResource","line":403,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-competencies/jol\")","@FeatureToggle(Feature.StudentCourseAnalyticsDashboard)","@EnforceAtLeastStudentInCourse"]}]},{"filePath":"PrerequisiteResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getPrerequisitesWithProgress","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/prerequisites\"","className":"PrerequisiteResource","line":99,"otherAnnotations":["@GetMapping(\"courses/{courseId}/prerequisites\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getPrerequisite","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/prerequisites/{prerequisiteId}\"","className":"PrerequisiteResource","line":116,"otherAnnotations":["@GetMapping(\"courses/{courseId}/prerequisites/{prerequisiteId}\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"createPrerequisite","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites\"","className":"PrerequisiteResource","line":138,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"createPrerequisite","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites/bulk\"","className":"PrerequisiteResource","line":160,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites/bulk\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importPrerequisite","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites/import\"","className":"PrerequisiteResource","line":184,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites/import\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importPrerequisites","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites/import/bulk\"","className":"PrerequisiteResource","line":211,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites/import/bulk\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importAllPrerequisitesFromCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites/import-all/{sourceCourseId}\"","className":"PrerequisiteResource","line":249,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites/import-all/{sourceCourseId}\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importStandardizedPrerequisites","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/prerequisites/import-standardized\"","className":"PrerequisiteResource","line":283,"otherAnnotations":["@PostMapping(\"courses/{courseId}/prerequisites/import-standardized\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"updatePrerequisite","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/prerequisites\"","className":"PrerequisiteResource","line":302,"otherAnnotations":["@PutMapping(\"courses/{courseId}/prerequisites\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"deletePrerequisite","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/prerequisites/{prerequisiteId}\"","className":"PrerequisiteResource","line":326,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/prerequisites/{prerequisiteId}\")","@EnforceAtLeastInstructorInCourse"]}]},{"filePath":"StandardizedCompetencyResource","classRequestMapping":"\"api/standardized-competencies/\"","endpoints":[{"requestMapping":"\"api/standardized-competencies/\"","endpoint":"getStandardizedCompetency","httpMethodAnnotation":"GetMapping","URI":"\"{competencyId}\"","className":"StandardizedCompetencyResource","line":60,"otherAnnotations":["@GetMapping(\"{competencyId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/standardized-competencies/\"","endpoint":"getAllForTreeView","httpMethodAnnotation":"GetMapping","URI":"\"for-tree-view\"","className":"StandardizedCompetencyResource","line":76,"otherAnnotations":["@GetMapping(\"for-tree-view\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/standardized-competencies/\"","endpoint":"getKnowledgeArea","httpMethodAnnotation":"GetMapping","URI":"\"knowledge-areas/{knowledgeAreaId}\"","className":"StandardizedCompetencyResource","line":93,"otherAnnotations":["@GetMapping(\"knowledge-areas/{knowledgeAreaId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/standardized-competencies/\"","endpoint":"getSources","httpMethodAnnotation":"GetMapping","URI":"\"sources\"","className":"StandardizedCompetencyResource","line":109,"otherAnnotations":["@GetMapping(\"sources\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAtLeastInstructor"]}]},{"filePath":"CompetencyResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getCompetenciesWithProgress","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/competencies\"","className":"CompetencyResource","line":96,"otherAnnotations":["@GetMapping(\"courses/{courseId}/competencies\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetency","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/competencies/{competencyId}\"","className":"CompetencyResource","line":113,"otherAnnotations":["@GetMapping(\"courses/{courseId}/competencies/{competencyId}\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"createCompetency","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies\"","className":"CompetencyResource","line":135,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"createCompetencies","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies/bulk\"","className":"CompetencyResource","line":157,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies/bulk\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importCompetency","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies/import\"","className":"CompetencyResource","line":181,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies/import\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importCompetencies","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies/import/bulk\"","className":"CompetencyResource","line":208,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies/import/bulk\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importAllCompetenciesFromCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies/import-all/{sourceCourseId}\"","className":"CompetencyResource","line":246,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies/import-all/{sourceCourseId}\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"importStandardizedCompetencies","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/competencies/import-standardized\"","className":"CompetencyResource","line":280,"otherAnnotations":["@PostMapping(\"courses/{courseId}/competencies/import-standardized\")","@EnforceAtLeastEditorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"updateCompetency","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/competencies\"","className":"CompetencyResource","line":299,"otherAnnotations":["@PutMapping(\"courses/{courseId}/competencies\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"deleteCompetency","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/competencies/{competencyId}\"","className":"CompetencyResource","line":323,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/competencies/{competencyId}\")","@EnforceAtLeastInstructorInCourse"]}]},{"filePath":"TextUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getTextUnit","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/text-units/{textUnitId}\"","className":"TextUnitResource","line":64,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/text-units/{textUnitId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateTextUnit","httpMethodAnnotation":"PutMapping","URI":"\"lectures/{lectureId}/text-units\"","className":"TextUnitResource","line":87,"otherAnnotations":["@PutMapping(\"lectures/{lectureId}/text-units\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createTextUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/text-units\"","className":"TextUnitResource","line":119,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/text-units\")","@EnforceAtLeastEditor"]}]},{"filePath":"VideoUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getVideoUnit","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/video-units/{videoUnitId}\"","className":"VideoUnitResource","line":69,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/video-units/{videoUnitId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateVideoUnit","httpMethodAnnotation":"PutMapping","URI":"\"lectures/{lectureId}/video-units\"","className":"VideoUnitResource","line":86,"otherAnnotations":["@PutMapping(\"lectures/{lectureId}/video-units\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createVideoUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/video-units\"","className":"VideoUnitResource","line":115,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/video-units\")","@EnforceAtLeastEditor"]}]},{"filePath":"ExerciseUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createExerciseUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/exercise-units\"","className":"ExerciseUnitResource","line":60,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/exercise-units\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExerciseUnitsOfLecture","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/exercise-units\"","className":"ExerciseUnitResource","line":90,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/exercise-units\")","@EnforceAtLeastEditor"]}]},{"filePath":"AttachmentUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAttachmentUnit","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/attachment-units/{attachmentUnitId}\"","className":"AttachmentUnitResource","line":99,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/attachment-units/{attachmentUnitId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateAttachmentUnit","httpMethodAnnotation":"PutMapping","URI":"\"lectures/{lectureId}/attachment-units/{attachmentUnitId}\"","className":"AttachmentUnitResource","line":122,"otherAnnotations":["@PutMapping(value = \"lectures/{lectureId}/attachment-units/{attachmentUnitId}\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createAttachmentUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/attachment-units\"","className":"AttachmentUnitResource","line":152,"otherAnnotations":["@PostMapping(value = \"lectures/{lectureId}/attachment-units\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"uploadSlidesForProcessing","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/attachment-units/upload\"","className":"AttachmentUnitResource","line":188,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/attachment-units/upload\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createAttachmentUnits","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/attachment-units/split/{filename}\"","className":"AttachmentUnitResource","line":217,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/attachment-units/split/{filename}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAttachmentUnitsData","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/attachment-units/data/{filename}\"","className":"AttachmentUnitResource","line":247,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/attachment-units/data/{filename}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getSlidesToRemove","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/attachment-units/slides-to-remove/{filename}\"","className":"AttachmentUnitResource","line":275,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/attachment-units/slides-to-remove/{filename}\")","@EnforceAtLeastEditor"]}]},{"filePath":"OnlineUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getOnlineUnit","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/online-units/{onlineUnitId}\"","className":"OnlineUnitResource","line":79,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/online-units/{onlineUnitId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateOnlineUnit","httpMethodAnnotation":"PutMapping","URI":"\"lectures/{lectureId}/online-units\"","className":"OnlineUnitResource","line":96,"otherAnnotations":["@PutMapping(\"lectures/{lectureId}/online-units\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createOnlineUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/online-units\"","className":"OnlineUnitResource","line":126,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/online-units\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getOnlineResource","httpMethodAnnotation":"GetMapping","URI":"\"lectures/online-units/fetch-online-resource\"","className":"OnlineUnitResource","line":161,"otherAnnotations":["@GetMapping(\"lectures/online-units/fetch-online-resource\")","@EnforceAtLeastEditor"]}]},{"filePath":"LectureUnitResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateLectureUnitsOrder","httpMethodAnnotation":"PutMapping","URI":"\"lectures/{lectureId}/lecture-units-order\"","className":"LectureUnitResource","line":85,"otherAnnotations":["@PutMapping(\"lectures/{lectureId}/lecture-units-order\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"completeLectureUnit","httpMethodAnnotation":"PostMapping","URI":"\"lectures/{lectureId}/lecture-units/{lectureUnitId}/completion\"","className":"LectureUnitResource","line":123,"otherAnnotations":["@PostMapping(\"lectures/{lectureId}/lecture-units/{lectureUnitId}/completion\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteLectureUnit","httpMethodAnnotation":"DeleteMapping","URI":"\"lectures/{lectureId}/lecture-units/{lectureUnitId}\"","className":"LectureUnitResource","line":157,"otherAnnotations":["@DeleteMapping(\"lectures/{lectureId}/lecture-units/{lectureUnitId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getLectureUnitForLearningPathNodeDetails","httpMethodAnnotation":"GetMapping","URI":"\"lecture-units/{lectureUnitId}/for-learning-path-node-details\"","className":"LectureUnitResource","line":186,"otherAnnotations":["@GetMapping(\"lecture-units/{lectureUnitId}/for-learning-path-node-details\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLectureUnitById","httpMethodAnnotation":"GetMapping","URI":"\"lecture-units/{lectureUnitId}\"","className":"LectureUnitResource","line":201,"otherAnnotations":["@GetMapping(\"lecture-units/{lectureUnitId}\")","@EnforceAtLeastStudent"]}]},{"filePath":"AttachmentResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createAttachment","httpMethodAnnotation":"PostMapping","URI":"\"attachments\"","className":"AttachmentResource","line":88,"otherAnnotations":["@PostMapping(value = \"attachments\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateAttachment","httpMethodAnnotation":"PutMapping","URI":"\"attachments/{attachmentId}\"","className":"AttachmentResource","line":113,"otherAnnotations":["@PutMapping(value = \"attachments/{attachmentId}\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAttachment","httpMethodAnnotation":"GetMapping","URI":"\"attachments/{id}\"","className":"AttachmentResource","line":147,"otherAnnotations":["@GetMapping(\"attachments/{id}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAttachmentsForLecture","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/attachments\"","className":"AttachmentResource","line":161,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/attachments\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAttachment","httpMethodAnnotation":"DeleteMapping","URI":"\"attachments/{attachmentId}\"","className":"AttachmentResource","line":174,"otherAnnotations":["@DeleteMapping(\"attachments/{attachmentId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"QuizPoolResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateQuizPool","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/quiz-pools\"","className":"QuizPoolResource","line":65,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/quiz-pools\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getQuizPool","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/quiz-pools\"","className":"QuizPoolResource","line":83,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/quiz-pools\")","@EnforceAtLeastInstructor"]}]},{"filePath":"AeolusTemplateResource","classRequestMapping":"\"api/aeolus/\"","endpoints":[{"requestMapping":"\"api/aeolus/\"","endpoint":"getAeolusTemplate","httpMethodAnnotation":"GetMapping","URI":"\"templates/{language}/{projectType}\"","className":"AeolusTemplateResource","line":67,"otherAnnotations":["@GetMapping({ \"templates/{language}/{projectType}\", \"templates/{language}\" })","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/aeolus/\"","endpoint":"getAeolusTemplate","httpMethodAnnotation":"GetMapping","URI":"\"templates/{language}\"","className":"AeolusTemplateResource","line":67,"otherAnnotations":["@GetMapping({ \"templates/{language}/{projectType}\", \"templates/{language}\" })","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/aeolus/\"","endpoint":"getAeolusTemplateScript","httpMethodAnnotation":"GetMapping","URI":"\"templateScripts/{language}/{projectType}\"","className":"AeolusTemplateResource","line":94,"otherAnnotations":["@GetMapping({ \"templateScripts/{language}/{projectType}\", \"templateScripts/{language}\" })","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/aeolus/\"","endpoint":"getAeolusTemplateScript","httpMethodAnnotation":"GetMapping","URI":"\"templateScripts/{language}\"","className":"AeolusTemplateResource","line":94,"otherAnnotations":["@GetMapping({ \"templateScripts/{language}/{projectType}\", \"templateScripts/{language}\" })","@EnforceAtLeastEditor"]}]},{"filePath":"ConsistencyCheckResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"checkConsistencyOfProgrammingExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{programmingExerciseId}/consistency-check\"","className":"ConsistencyCheckResource","line":52,"otherAnnotations":["@GetMapping(\"programming-exercises/{programmingExerciseId}/consistency-check\")","@EnforceAtLeastEditor"]}]},{"filePath":"PlagiarismPostResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createPost","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/posts\"","className":"PlagiarismPostResource","line":67,"otherAnnotations":["@PostMapping(\"courses/{courseId}/posts\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updatePost","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/posts/{postId}\"","className":"PlagiarismPostResource","line":86,"otherAnnotations":["@PutMapping(\"courses/{courseId}/posts/{postId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getPostsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/posts\"","className":"PlagiarismPostResource","line":103,"otherAnnotations":["@GetMapping(\"courses/{courseId}/posts\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deletePost","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/posts/{postId}\"","className":"PlagiarismPostResource","line":127,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/posts/{postId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"PlagiarismCaseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCasesForCourseForInstructor","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/plagiarism-cases/for-instructor\"","className":"PlagiarismCaseResource","line":77,"otherAnnotations":["@GetMapping(\"courses/{courseId}/plagiarism-cases/for-instructor\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCasesForExamForInstructor","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/plagiarism-cases/for-instructor\"","className":"PlagiarismCaseResource","line":96,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/plagiarism-cases/for-instructor\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCaseForInstructor","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/for-instructor\"","className":"PlagiarismCaseResource","line":121,"otherAnnotations":["@GetMapping(\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/for-instructor\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getNumberOfPlagiarismCasesForExercise","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exercises/{exerciseId}/plagiarism-cases-count\"","className":"PlagiarismCaseResource","line":149,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exercises/{exerciseId}/plagiarism-cases-count\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"savePlagiarismCaseVerdict","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/verdict\"","className":"PlagiarismCaseResource","line":168,"otherAnnotations":["@PutMapping(\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/verdict\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCaseForExerciseForStudent","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exercises/{exerciseId}/plagiarism-case\"","className":"PlagiarismCaseResource","line":188,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exercises/{exerciseId}/plagiarism-case\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCasesForExercisesForStudent","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/plagiarism-cases\"","className":"PlagiarismCaseResource","line":206,"otherAnnotations":["@GetMapping(\"courses/{courseId}/plagiarism-cases\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismCaseForStudent","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/for-student\"","className":"PlagiarismCaseResource","line":254,"otherAnnotations":["@GetMapping(\"courses/{courseId}/plagiarism-cases/{plagiarismCaseId}/for-student\")","@EnforceAtLeastStudent"]}]},{"filePath":"PlagiarismResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updatePlagiarismComparisonStatus","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/plagiarism-comparisons/{comparisonId}/status\"","className":"PlagiarismResource","line":89,"otherAnnotations":["@PutMapping(\"courses/{courseId}/plagiarism-comparisons/{comparisonId}/status\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismComparisonForSplitView","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/plagiarism-comparisons/{comparisonId}/for-split-view\"","className":"PlagiarismResource","line":122,"otherAnnotations":["@GetMapping(\"courses/{courseId}/plagiarism-comparisons/{comparisonId}/for-split-view\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deletePlagiarismComparisons","httpMethodAnnotation":"DeleteMapping","URI":"\"exercises/{exerciseId}/plagiarism-results/{plagiarismResultId}/plagiarism-comparisons\"","className":"PlagiarismResource","line":185,"otherAnnotations":["@DeleteMapping(\"exercises/{exerciseId}/plagiarism-results/{plagiarismResultId}/plagiarism-comparisons\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getNumberOfPotentialPlagiarismCasesForExercise","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/potential-plagiarism-count\"","className":"PlagiarismResource","line":213,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/potential-plagiarism-count\")","@EnforceAtLeastInstructor"]}]},{"filePath":"PlagiarismAnswerPostResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createAnswerPost","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/answer-posts\"","className":"PlagiarismAnswerPostResource","line":50,"otherAnnotations":["@PostMapping(\"courses/{courseId}/answer-posts\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateAnswerPost","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/answer-posts/{answerPostId}\"","className":"PlagiarismAnswerPostResource","line":69,"otherAnnotations":["@PutMapping(\"courses/{courseId}/answer-posts/{answerPostId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteAnswerPost","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/answer-posts/{answerPostId}\"","className":"PlagiarismAnswerPostResource","line":87,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/answer-posts/{answerPostId}\")","@EnforceAtLeastStudent"]}]},{"filePath":"SubmissionPolicyResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getSubmissionPolicyOfExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/submission-policy\"","className":"SubmissionPolicyResource","line":78,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/submission-policy\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"addSubmissionPolicyToProgrammingExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/submission-policy\"","className":"SubmissionPolicyResource","line":104,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/submission-policy\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeSubmissionPolicyFromProgrammingExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/submission-policy\"","className":"SubmissionPolicyResource","line":144,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/submission-policy\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"toggleSubmissionPolicy","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/submission-policy\"","className":"SubmissionPolicyResource","line":179,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/submission-policy\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateSubmissionPolicy","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/submission-policy\"","className":"SubmissionPolicyResource","line":227,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/submission-policy\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationSubmissionCount","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/submission-count\"","className":"SubmissionPolicyResource","line":259,"otherAnnotations":["@GetMapping(\"participations/{participationId}/submission-count\")","@EnforceAtLeastStudent"]}]},{"filePath":"PushNotificationResource","classRequestMapping":"\"api/push_notification/\"","endpoints":[{"requestMapping":"\"api/push_notification/\"","endpoint":"register","httpMethodAnnotation":"PostMapping","URI":"\"register\"","className":"PushNotificationResource","line":78,"otherAnnotations":["@PostMapping(\"register\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/push_notification/\"","endpoint":"unregister","httpMethodAnnotation":"DeleteMapping","URI":"\"unregister\"","className":"PushNotificationResource","line":117,"otherAnnotations":["@DeleteMapping(\"unregister\")","@EnforceAtLeastStudent"]}]},{"filePath":"ComplaintResponseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"lockComplaint","httpMethodAnnotation":"PostMapping","URI":"\"complaints/{complaintId}/response\"","className":"ComplaintResponseResource","line":62,"otherAnnotations":["@PostMapping(\"complaints/{complaintId}/response\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"removeLockFromComplaint","httpMethodAnnotation":"DeleteMapping","URI":"\"complaints/{complaintId}/response\"","className":"ComplaintResponseResource","line":79,"otherAnnotations":["@DeleteMapping(\"complaints/{complaintId}/response\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"refreshLockOrResolveComplaint","httpMethodAnnotation":"PatchMapping","URI":"\"complaints/{complaintId}/response\"","className":"ComplaintResponseResource","line":96,"otherAnnotations":["@PatchMapping(\"complaints/{complaintId}/response\")","@EnforceAtLeastTutor"]}]},{"filePath":"RepositoryProgrammingExerciseParticipationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getFiles","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/files\"","className":"RepositoryProgrammingExerciseParticipationResource","line":186,"otherAnnotations":["@Override","@GetMapping(value = \"repository/{participationId}/files\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFilesForPlagiarismView","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/files-plagiarism-view\"","className":"RepositoryProgrammingExerciseParticipationResource","line":199,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/files-plagiarism-view\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFilesAtCommit","httpMethodAnnotation":"GetMapping","URI":"\"repository-files-content/{commitId}\"","className":"RepositoryProgrammingExerciseParticipationResource","line":220,"otherAnnotations":["@GetMapping(value = \"repository-files-content/{commitId}\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFilesWithInformationAboutChange","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/files-change\"","className":"RepositoryProgrammingExerciseParticipationResource","line":240,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/files-change\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getFile","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/file\"","className":"RepositoryProgrammingExerciseParticipationResource","line":254,"otherAnnotations":["@Override","@GetMapping(value = \"repository/{participationId}/file\", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFileForPlagiarismView","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/file-plagiarism-view\"","className":"RepositoryProgrammingExerciseParticipationResource","line":268,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/file-plagiarism-view\", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFilesWithContent","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/files-content\"","className":"RepositoryProgrammingExerciseParticipationResource","line":287,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/files-content\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getFileNames","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/file-names\"","className":"RepositoryProgrammingExerciseParticipationResource","line":303,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/file-names\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"createFile","httpMethodAnnotation":"PostMapping","URI":"\"repository/{participationId}/file\"","className":"RepositoryProgrammingExerciseParticipationResource","line":315,"otherAnnotations":["@Override","@PostMapping(value = \"repository/{participationId}/file\", produces = MediaType.APPLICATION_JSON_VALUE)","@FeatureToggle(Feature.ProgrammingExercises)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"createFolder","httpMethodAnnotation":"PostMapping","URI":"\"repository/{participationId}/folder\"","className":"RepositoryProgrammingExerciseParticipationResource","line":323,"otherAnnotations":["@Override","@PostMapping(value = \"repository/{participationId}/folder\", produces = MediaType.APPLICATION_JSON_VALUE)","@FeatureToggle(Feature.ProgrammingExercises)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"renameFile","httpMethodAnnotation":"PostMapping","URI":"\"repository/{participationId}/rename-file\"","className":"RepositoryProgrammingExerciseParticipationResource","line":331,"otherAnnotations":["@Override","@PostMapping(value = \"repository/{participationId}/rename-file\", produces = MediaType.APPLICATION_JSON_VALUE)","@FeatureToggle(Feature.ProgrammingExercises)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteFile","httpMethodAnnotation":"DeleteMapping","URI":"\"repository/{participationId}/file\"","className":"RepositoryProgrammingExerciseParticipationResource","line":339,"otherAnnotations":["@Override","@DeleteMapping(value = \"repository/{participationId}/file\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"pullChanges","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/pull\"","className":"RepositoryProgrammingExerciseParticipationResource","line":346,"otherAnnotations":["@Override","@GetMapping(value = \"repository/{participationId}/pull\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateParticipationFiles","httpMethodAnnotation":"PutMapping","URI":"\"repository/{participationId}/files\"","className":"RepositoryProgrammingExerciseParticipationResource","line":361,"otherAnnotations":["@PutMapping(\"repository/{participationId}/files\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"commitChanges","httpMethodAnnotation":"PostMapping","URI":"\"repository/{participationId}/commit\"","className":"RepositoryProgrammingExerciseParticipationResource","line":406,"otherAnnotations":["@Override","@PostMapping(value = \"repository/{participationId}/commit\", produces = MediaType.APPLICATION_JSON_VALUE)","@FeatureToggle(Feature.ProgrammingExercises)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"resetToLastCommit","httpMethodAnnotation":"PostMapping","URI":"\"repository/{participationId}/reset\"","className":"RepositoryProgrammingExerciseParticipationResource","line":414,"otherAnnotations":["@Override","@PostMapping(value = \"repository/{participationId}/reset\", produces = MediaType.APPLICATION_JSON_VALUE)","@FeatureToggle(Feature.ProgrammingExercises)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getStatus","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}\"","className":"RepositoryProgrammingExerciseParticipationResource","line":422,"otherAnnotations":["@Override","@GetMapping(value = \"repository/{participationId}\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getBuildLogs","httpMethodAnnotation":"GetMapping","URI":"\"repository/{participationId}/buildlogs\"","className":"RepositoryProgrammingExerciseParticipationResource","line":438,"otherAnnotations":["@GetMapping(value = \"repository/{participationId}/buildlogs\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastStudent"]}]},{"filePath":"TestRepositoryResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getFiles","httpMethodAnnotation":"GetMapping","URI":"\"test-repository/{exerciseId}/files\"","className":"TestRepositoryResource","line":99,"otherAnnotations":["@Override","@GetMapping(value = \"test-repository/{exerciseId}/files\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getFile","httpMethodAnnotation":"GetMapping","URI":"\"test-repository/{exerciseId}/file\"","className":"TestRepositoryResource","line":106,"otherAnnotations":["@Override","@GetMapping(value = \"test-repository/{exerciseId}/file\", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"createFile","httpMethodAnnotation":"PostMapping","URI":"\"test-repository/{exerciseId}/file\"","className":"TestRepositoryResource","line":113,"otherAnnotations":["@Override","@PostMapping(value = \"test-repository/{exerciseId}/file\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"createFolder","httpMethodAnnotation":"PostMapping","URI":"\"test-repository/{exerciseId}/folder\"","className":"TestRepositoryResource","line":121,"otherAnnotations":["@Override","@PostMapping(value = \"test-repository/{exerciseId}/folder\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"renameFile","httpMethodAnnotation":"PostMapping","URI":"\"test-repository/{exerciseId}/rename-file\"","className":"TestRepositoryResource","line":129,"otherAnnotations":["@Override","@PostMapping(value = \"test-repository/{exerciseId}/rename-file\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"deleteFile","httpMethodAnnotation":"DeleteMapping","URI":"\"test-repository/{exerciseId}/file\"","className":"TestRepositoryResource","line":137,"otherAnnotations":["@Override","@DeleteMapping(value = \"test-repository/{exerciseId}/file\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"pullChanges","httpMethodAnnotation":"GetMapping","URI":"\"test-repository/{exerciseId}/pull\"","className":"TestRepositoryResource","line":145,"otherAnnotations":["@Override","@GetMapping(value = \"test-repository/{exerciseId}/pull\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"commitChanges","httpMethodAnnotation":"PostMapping","URI":"\"test-repository/{exerciseId}/commit\"","className":"TestRepositoryResource","line":152,"otherAnnotations":["@Override","@PostMapping(value = \"test-repository/{exerciseId}/commit\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"resetToLastCommit","httpMethodAnnotation":"PostMapping","URI":"\"test-repository/{exerciseId}/reset\"","className":"TestRepositoryResource","line":160,"otherAnnotations":["@Override","@PostMapping(value = \"test-repository/{exerciseId}/reset\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"getStatus","httpMethodAnnotation":"GetMapping","URI":"\"test-repository/{exerciseId}\"","className":"TestRepositoryResource","line":168,"otherAnnotations":["@Override","@GetMapping(value = \"test-repository/{exerciseId}\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateTestFiles","httpMethodAnnotation":"PutMapping","URI":"\"test-repository/{exerciseId}/files\"","className":"TestRepositoryResource","line":184,"otherAnnotations":["@PutMapping(\"test-repository/{exerciseId}/files\")","@EnforceAtLeastTutor"]}]},{"filePath":"NotificationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllNotificationsForCurrentUserFilteredBySettings","httpMethodAnnotation":"GetMapping","URI":"\"notifications\"","className":"NotificationResource","line":74,"otherAnnotations":["@GetMapping(\"notifications\")","@EnforceAtLeastStudent"]}]},{"filePath":"FileResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"saveMarkdownFile","httpMethodAnnotation":"PostMapping","URI":"\"markdown-file-upload\"","className":"FileResource","line":151,"otherAnnotations":["@PostMapping(\"markdown-file-upload\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getMarkdownFile","httpMethodAnnotation":"GetMapping","URI":"\"files/markdown/{filename}\"","className":"FileResource","line":170,"otherAnnotations":["@GetMapping(\"files/markdown/{filename}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getTemplateFile","httpMethodAnnotation":"GetMapping","URI":"\"files/templates/{language}/{projectType}\"","className":"FileResource","line":188,"otherAnnotations":["@GetMapping({ \"files/templates/{language}/{projectType}\", \"files/templates/{language}\" })","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getTemplateFile","httpMethodAnnotation":"GetMapping","URI":"\"files/templates/{language}\"","className":"FileResource","line":188,"otherAnnotations":["@GetMapping({ \"files/templates/{language}/{projectType}\", \"files/templates/{language}\" })","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getDragAndDropBackgroundFile","httpMethodAnnotation":"GetMapping","URI":"\"files/drag-and-drop/backgrounds/{questionId}/*\"","className":"FileResource","line":224,"otherAnnotations":["@GetMapping(\"files/drag-and-drop/backgrounds/{questionId}/*\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getDragItemFile","httpMethodAnnotation":"GetMapping","URI":"\"files/drag-and-drop/drag-items/{dragItemId}/*\"","className":"FileResource","line":240,"otherAnnotations":["@GetMapping(\"files/drag-and-drop/drag-items/{dragItemId}/*\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFileUploadSubmission","httpMethodAnnotation":"GetMapping","URI":"\"files/file-upload-exercises/{exerciseId}/submissions/{submissionId}/*\"","className":"FileResource","line":260,"otherAnnotations":["@GetMapping(\"files/file-upload-exercises/{exerciseId}/submissions/{submissionId}/*\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseIcon","httpMethodAnnotation":"GetMapping","URI":"\"files/course/icons/{courseId}/*\"","className":"FileResource","line":293,"otherAnnotations":["@GetMapping(\"files/course/icons/{courseId}/*\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseCodeOfConduct","httpMethodAnnotation":"GetMapping","URI":"\"files/templates/code-of-conduct\"","className":"FileResource","line":307,"otherAnnotations":["@GetMapping(\"files/templates/code-of-conduct\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getUserSignature","httpMethodAnnotation":"GetMapping","URI":"\"files/exam-user/signatures/{examUserId}/*\"","className":"FileResource","line":322,"otherAnnotations":["@GetMapping(\"files/exam-user/signatures/{examUserId}/*\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getExamUserImage","httpMethodAnnotation":"GetMapping","URI":"\"files/exam-user/{examUserId}/*\"","className":"FileResource","line":338,"otherAnnotations":["@GetMapping(\"files/exam-user/{examUserId}/*\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getLectureAttachment","httpMethodAnnotation":"GetMapping","URI":"\"files/attachments/lecture/{lectureId}/{filename}\"","className":"FileResource","line":355,"otherAnnotations":["@GetMapping(\"files/attachments/lecture/{lectureId}/{filename}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLecturePdfAttachmentsMerged","httpMethodAnnotation":"GetMapping","URI":"\"files/attachments/lecture/{lectureId}/merge-pdf\"","className":"FileResource","line":383,"otherAnnotations":["@GetMapping(\"files/attachments/lecture/{lectureId}/merge-pdf\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAttachmentUnitAttachment","httpMethodAnnotation":"GetMapping","URI":"\"files/attachments/attachment-unit/{attachmentUnitId}/*\"","className":"FileResource","line":415,"otherAnnotations":["@GetMapping(\"files/attachments/attachment-unit/{attachmentUnitId}/*\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAttachmentUnitAttachmentSlide","httpMethodAnnotation":"GetMapping","URI":"\"files/attachments/attachment-unit/{attachmentUnitId}/slide/{slideNumber}\"","className":"FileResource","line":438,"otherAnnotations":["@GetMapping(\"files/attachments/attachment-unit/{attachmentUnitId}/slide/{slideNumber}\")","@EnforceAtLeastStudent"]}]},{"filePath":"AndroidAppSiteAssociationResource","classRequestMapping":"\".well-known/\"","endpoints":[{"requestMapping":"\".well-known/\"","endpoint":"getAndroidAssetLinks","httpMethodAnnotation":"GetMapping","URI":"\"assetlinks.json\"","className":"AndroidAppSiteAssociationResource","line":40,"otherAnnotations":["@GetMapping(\"assetlinks.json\")","@ManualConfig"]}]},{"filePath":"LinkPreviewResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getLinkPreview","httpMethodAnnotation":"PostMapping","URI":"\"link-preview\"","className":"LinkPreviewResource","line":40,"otherAnnotations":["@PostMapping(\"link-preview\")","@EnforceAtLeastStudent","@Cacheable(value = \"linkPreview\", key = \"#url\", unless = \"#result == null\")"]}]},{"filePath":"AccountResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"saveAccount","httpMethodAnnotation":"PutMapping","URI":"\"account\"","className":"AccountResource","line":60,"otherAnnotations":["@PutMapping(\"account\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"changePassword","httpMethodAnnotation":"PostMapping","URI":"\"account/change-password\"","className":"AccountResource","line":85,"otherAnnotations":["@PostMapping(\"account/change-password\")","@EnforceAtLeastStudent"]}]},{"filePath":"AthenaResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getTextFeedbackSuggestions","httpMethodAnnotation":"GetMapping","URI":"\"athena/text-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\"","className":"AthenaResource","line":160,"otherAnnotations":["@GetMapping(\"athena/text-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingFeedbackSuggestions","httpMethodAnnotation":"GetMapping","URI":"\"athena/programming-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\"","className":"AthenaResource","line":174,"otherAnnotations":["@GetMapping(\"athena/programming-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getModelingFeedbackSuggestions","httpMethodAnnotation":"GetMapping","URI":"\"athena/modeling-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\"","className":"AthenaResource","line":188,"otherAnnotations":["@GetMapping(\"athena/modeling-exercises/{exerciseId}/submissions/{submissionId}/feedback-suggestions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getAvailableModulesForTextExercises","httpMethodAnnotation":"GetMapping","URI":"\"athena/courses/{courseId}/text-exercises/available-modules\"","className":"AthenaResource","line":201,"otherAnnotations":["@GetMapping(\"athena/courses/{courseId}/text-exercises/available-modules\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAvailableModulesForProgrammingExercises","httpMethodAnnotation":"GetMapping","URI":"\"athena/courses/{courseId}/programming-exercises/available-modules\"","className":"AthenaResource","line":213,"otherAnnotations":["@GetMapping(\"athena/courses/{courseId}/programming-exercises/available-modules\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAvailableModulesForModelingExercises","httpMethodAnnotation":"GetMapping","URI":"\"athena/courses/{courseId}/modeling-exercises/available-modules\"","className":"AthenaResource","line":225,"otherAnnotations":["@GetMapping(\"athena/courses/{courseId}/modeling-exercises/available-modules\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getRepository","httpMethodAnnotation":"GetMapping","URI":"\"public/athena/programming-exercises/{exerciseId}/submissions/{submissionId}/repository\"","className":"AthenaResource","line":251,"otherAnnotations":["@GetMapping(\"public/athena/programming-exercises/{exerciseId}/submissions/{submissionId}/repository\")","// We check the Athena secret instead\n@EnforceNothing","@ManualConfig"]},{"requestMapping":"\"api/\"","endpoint":"getTemplateRepository","httpMethodAnnotation":"GetMapping","URI":"\"public/athena/programming-exercises/{exerciseId}/repository/template\"","className":"AthenaResource","line":267,"otherAnnotations":["@GetMapping(\"public/athena/programming-exercises/{exerciseId}/repository/template\")","// We check the Athena secret instead\n@EnforceNothing","@ManualConfig"]},{"requestMapping":"\"api/\"","endpoint":"getSolutionRepository","httpMethodAnnotation":"GetMapping","URI":"\"public/athena/programming-exercises/{exerciseId}/repository/solution\"","className":"AthenaResource","line":283,"otherAnnotations":["@GetMapping(\"public/athena/programming-exercises/{exerciseId}/repository/solution\")","// We check the Athena secret instead\n@EnforceNothing","@ManualConfig"]},{"requestMapping":"\"api/\"","endpoint":"getTestRepository","httpMethodAnnotation":"GetMapping","URI":"\"public/athena/programming-exercises/{exerciseId}/repository/tests\"","className":"AthenaResource","line":299,"otherAnnotations":["@GetMapping(\"public/athena/programming-exercises/{exerciseId}/repository/tests\")","// We check the Athena secret instead\n@EnforceNothing","@ManualConfig"]}]},{"filePath":"TutorialGroupSessionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getOneOfTutorialGroup","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\"","className":"TutorialGroupSessionResource","line":102,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"update","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\"","className":"TutorialGroupSessionResource","line":125,"otherAnnotations":["@PutMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"updateAttendanceCount","httpMethodAnnotation":"PatchMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/attendance-count\"","className":"TutorialGroupSessionResource","line":171,"otherAnnotations":["@PatchMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/attendance-count\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"deleteSession","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\"","className":"TutorialGroupSessionResource","line":193,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"create","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions\"","className":"TutorialGroupSessionResource","line":213,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"cancel","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/cancel\"","className":"TutorialGroupSessionResource","line":256,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/cancel\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"activate","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/activate\"","className":"TutorialGroupSessionResource","line":284,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/sessions/{sessionId}/activate\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]}]},{"filePath":"TutorialGroupFreePeriodResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getOneOfConfiguration","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\"","className":"TutorialGroupFreePeriodResource","line":74,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"update","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\"","className":"TutorialGroupFreePeriodResource","line":97,"otherAnnotations":["@PutMapping(\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"create","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods\"","className":"TutorialGroupFreePeriodResource","line":145,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"delete","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\"","className":"TutorialGroupFreePeriodResource","line":190,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}/tutorial-free-periods/{tutorialGroupFreePeriodId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]}]},{"filePath":"TutorialGroupResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getTitle","httpMethodAnnotation":"GetMapping","URI":"\"tutorial-groups/{tutorialGroupId}/title\"","className":"TutorialGroupResource","line":132,"otherAnnotations":["@GetMapping(\"tutorial-groups/{tutorialGroupId}/title\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"getUniqueCampusValues","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/campus-values\"","className":"TutorialGroupResource","line":148,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups/campus-values\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"getUniqueLanguageValues","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/language-values\"","className":"TutorialGroupResource","line":166,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups/language-values\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"getAllForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups\"","className":"TutorialGroupResource","line":183,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"getOneOfCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\"","className":"TutorialGroupResource","line":203,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"create","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups\"","className":"TutorialGroupResource","line":222,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"delete","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\"","className":"TutorialGroupResource","line":283,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"update","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\"","className":"TutorialGroupResource","line":318,"otherAnnotations":["@PutMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"deregisterStudent","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/deregister/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"TutorialGroupResource","line":406,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/deregister/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"registerStudent","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/register/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"TutorialGroupResource","line":428,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/register/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"registerMultipleStudentsToTutorialGroup","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/register-multiple\"","className":"TutorialGroupResource","line":455,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/{tutorialGroupId}/register-multiple\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"importRegistrations","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups/import\"","className":"TutorialGroupResource","line":477,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups/import\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"exportTutorialGroupsToCSV","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/export/csv\"","className":"TutorialGroupResource","line":550,"otherAnnotations":["@GetMapping(value = \"courses/{courseId}/tutorial-groups/export/csv\", produces = \"text/csv\")","@EnforceAtLeastInstructorInCourse","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"exportTutorialGroupsToJSON","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups/export/json\"","className":"TutorialGroupResource","line":581,"otherAnnotations":["@GetMapping(value = \"courses/{courseId}/tutorial-groups/export/json\", produces = MediaType.APPLICATION_JSON_VALUE)","@EnforceAtLeastInstructorInCourse","@FeatureToggle(Feature.TutorialGroups)"]}]},{"filePath":"TutorialGroupsConfigurationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getOneOfCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration\"","className":"TutorialGroupsConfigurationResource","line":69,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutorial-groups-configuration\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"create","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration\"","className":"TutorialGroupsConfigurationResource","line":86,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutorial-groups-configuration\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]},{"requestMapping":"\"api/\"","endpoint":"update","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}\"","className":"TutorialGroupsConfigurationResource","line":121,"otherAnnotations":["@PutMapping(\"courses/{courseId}/tutorial-groups-configuration/{tutorialGroupsConfigurationId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.TutorialGroups)"]}]},{"filePath":"BonusResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getBonusForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/bonus\"","className":"BonusResource","line":95,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/bonus\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"calculateGradeWithBonus","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/bonus/calculate-raw\"","className":"BonusResource","line":134,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/bonus/calculate-raw\")","@EnforceAdmin","// TODO: Remove the manual configuration once the endpoint gets it's final pre-authorization when the feature releases.\n@ManualConfig"]},{"requestMapping":"\"api/\"","endpoint":"createBonusForExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/bonus\"","className":"BonusResource","line":163,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/bonus\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateBonus","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/bonus/{bonusId}\"","className":"BonusResource","line":228,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/bonus/{bonusId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteBonus","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/bonus/{bonusId}\"","className":"BonusResource","line":282,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/bonus/{bonusId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"ApollonConversionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"convertApollonModel","httpMethodAnnotation":"PostMapping","URI":"\"apollon/convert-to-pdf\"","className":"ApollonConversionResource","line":42,"otherAnnotations":["@PostMapping(\"apollon/convert-to-pdf\")","@EnforceAtLeastStudent"]}]},{"filePath":"IrisModelsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllModels","httpMethodAnnotation":"GetMapping","URI":"\"iris/models\"","className":"IrisModelsResource","line":36,"otherAnnotations":["@GetMapping(\"iris/models\")","@EnforceAtLeastEditor"]}]},{"filePath":"IrisResource","classRequestMapping":"\"api/iris/\"","endpoints":[{"requestMapping":"\"api/iris/\"","endpoint":"getStatus","httpMethodAnnotation":"GetMapping","URI":"\"status\"","className":"IrisResource","line":37,"otherAnnotations":["@GetMapping(\"status\")","@EnforceAtLeastStudent"]}]},{"filePath":"IrisExerciseChatSessionResource","classRequestMapping":"\"api/iris/exercise-chat/\"","endpoints":[{"requestMapping":"\"api/iris/exercise-chat/\"","endpoint":"getCurrentSessionOrCreateIfNotExists","httpMethodAnnotation":"PostMapping","URI":"\"{exerciseId}/sessions/current\"","className":"IrisExerciseChatSessionResource","line":70,"otherAnnotations":["@PostMapping(\"{exerciseId}/sessions/current\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/iris/exercise-chat/\"","endpoint":"getAllSessions","httpMethodAnnotation":"GetMapping","URI":"\"{exerciseId}/sessions\"","className":"IrisExerciseChatSessionResource","line":96,"otherAnnotations":["@GetMapping(\"{exerciseId}/sessions\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/iris/exercise-chat/\"","endpoint":"createSessionForExercise","httpMethodAnnotation":"PostMapping","URI":"\"{exerciseId}/sessions\"","className":"IrisExerciseChatSessionResource","line":118,"otherAnnotations":["@PostMapping(\"{exerciseId}/sessions\")","@EnforceAtLeastStudentInExercise"]}]},{"filePath":"IrisCourseChatSessionResource","classRequestMapping":"\"api/iris/course-chat/\"","endpoints":[{"requestMapping":"\"api/iris/course-chat/\"","endpoint":"getCurrentSessionOrCreateIfNotExists","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/sessions/current\"","className":"IrisCourseChatSessionResource","line":70,"otherAnnotations":["@PostMapping(\"{courseId}/sessions/current\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/iris/course-chat/\"","endpoint":"getAllSessions","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/sessions\"","className":"IrisCourseChatSessionResource","line":87,"otherAnnotations":["@GetMapping(\"{courseId}/sessions\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/iris/course-chat/\"","endpoint":"createSessionForCourse","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/sessions\"","className":"IrisCourseChatSessionResource","line":109,"otherAnnotations":["@PostMapping(\"{courseId}/sessions\")","@EnforceAtLeastStudentInCourse"]}]},{"filePath":"IrisSettingsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getGlobalSettings","httpMethodAnnotation":"GetMapping","URI":"\"iris/global-iris-settings\"","className":"IrisSettingsResource","line":58,"otherAnnotations":["@GetMapping(\"iris/global-iris-settings\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getRawCourseSettings","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/raw-iris-settings\"","className":"IrisSettingsResource","line":71,"otherAnnotations":["@GetMapping(\"courses/{courseId}/raw-iris-settings\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getRawProgrammingExerciseSettings","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/raw-iris-settings\"","className":"IrisSettingsResource","line":86,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/raw-iris-settings\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseSettings","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/iris-settings\"","className":"IrisSettingsResource","line":103,"otherAnnotations":["@GetMapping(\"courses/{courseId}/iris-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingExerciseSettings","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/iris-settings\"","className":"IrisSettingsResource","line":122,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/iris-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateCourseSettings","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/raw-iris-settings\"","className":"IrisSettingsResource","line":140,"otherAnnotations":["@PutMapping(\"courses/{courseId}/raw-iris-settings\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateProgrammingExerciseSettings","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/raw-iris-settings\"","className":"IrisSettingsResource","line":158,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/raw-iris-settings\")","@EnforceAtLeastInstructor"]}]},{"filePath":"IrisMessageResource","classRequestMapping":"\"api/iris/\"","endpoints":[{"requestMapping":"\"api/iris/\"","endpoint":"getMessages","httpMethodAnnotation":"GetMapping","URI":"\"sessions/{sessionId}/messages\"","className":"IrisMessageResource","line":65,"otherAnnotations":["@GetMapping(\"sessions/{sessionId}/messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/iris/\"","endpoint":"createMessage","httpMethodAnnotation":"PostMapping","URI":"\"sessions/{sessionId}/messages\"","className":"IrisMessageResource","line":83,"otherAnnotations":["@PostMapping(\"sessions/{sessionId}/messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/iris/\"","endpoint":"resendMessage","httpMethodAnnotation":"PostMapping","URI":"\"sessions/{sessionId}/messages/{messageId}/resend\"","className":"IrisMessageResource","line":110,"otherAnnotations":["@PostMapping(\"sessions/{sessionId}/messages/{messageId}/resend\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/iris/\"","endpoint":"rateMessage","httpMethodAnnotation":"PutMapping","URI":"\"sessions/{sessionId}/messages/{messageId}/helpful\"","className":"IrisMessageResource","line":140,"otherAnnotations":["@PutMapping(value = \"sessions/{sessionId}/messages/{messageId}/helpful\")","@EnforceAtLeastStudent"]}]},{"filePath":"TextSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createTextSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/text-submissions\"","className":"TextSubmissionResource","line":107,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/text-submissions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateTextSubmission","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/text-submissions\"","className":"TextSubmissionResource","line":127,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/text-submissions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getTextSubmissionWithResults","httpMethodAnnotation":"GetMapping","URI":"\"text-submissions/{submissionId}\"","className":"TextSubmissionResource","line":164,"otherAnnotations":["@GetMapping(\"text-submissions/{submissionId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAllTextSubmissions","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/text-submissions\"","className":"TextSubmissionResource","line":190,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/text-submissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getTextSubmissionWithoutAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/text-submission-without-assessment\"","className":"TextSubmissionResource","line":208,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/text-submission-without-assessment\")","@EnforceAtLeastTutor"]}]},{"filePath":"SubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"deleteSubmission","httpMethodAnnotation":"DeleteMapping","URI":"\"submissions/{submissionId}\"","className":"SubmissionResource","line":105,"otherAnnotations":["@DeleteMapping(\"submissions/{submissionId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getTestRunSubmissionsForAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/test-run-submissions\"","className":"SubmissionResource","line":141,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/test-run-submissions\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getSubmissionsWithComplaintsForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/submissions-with-complaints\"","className":"SubmissionResource","line":179,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/submissions-with-complaints\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getSubmissionsWithMoreFeedbackRequestForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/more-feedback-requests-with-complaints\"","className":"SubmissionResource","line":200,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/more-feedback-requests-with-complaints\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getSubmissionsOnPageWithSize","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/submissions-for-import\"","className":"SubmissionResource","line":219,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/submissions-for-import\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getSubmissionVersions","httpMethodAnnotation":"GetMapping","URI":"\"submissions/{submissionId}/versions\"","className":"SubmissionResource","line":258,"otherAnnotations":["@GetMapping(\"submissions/{submissionId}/versions\")","@EnforceAtLeastInstructor"]}]},{"filePath":"LtiResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"lti13DeepLinking","httpMethodAnnotation":"PostMapping","URI":"\"lti13/deep-linking/{courseId}\"","className":"LtiResource","line":84,"otherAnnotations":["@PostMapping(\"lti13/deep-linking/{courseId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllConfiguredLtiPlatforms","httpMethodAnnotation":"GetMapping","URI":"\"lti-platforms\"","className":"LtiResource","line":112,"otherAnnotations":["@GetMapping(\"lti-platforms\")","@EnforceAtLeastInstructor"]}]},{"filePath":"QuizSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"saveOrSubmitForLiveMode","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/submissions/live\"","className":"QuizSubmissionResource","line":100,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/submissions/live\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"submitForPractice","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/submissions/practice\"","className":"QuizSubmissionResource","line":125,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/submissions/practice\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"submitForPreview","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/submissions/preview\"","className":"QuizSubmissionResource","line":188,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/submissions/preview\")","@EnforceAtLeastTutorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"submitQuizForExam","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/submissions/exam\"","className":"QuizSubmissionResource","line":226,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/submissions/exam\")","@EnforceAtLeastStudentInExercise"]}]},{"filePath":"StatisticsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getChartData","httpMethodAnnotation":"GetMapping","URI":"\"management/statistics/data-for-content\"","className":"StatisticsResource","line":63,"otherAnnotations":["@GetMapping(\"management/statistics/data-for-content\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseStatistics","httpMethodAnnotation":"GetMapping","URI":"\"management/statistics/course-statistics\"","className":"StatisticsResource","line":84,"otherAnnotations":["@GetMapping(\"management/statistics/course-statistics\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseStatistics","httpMethodAnnotation":"GetMapping","URI":"\"management/statistics/exercise-statistics\"","className":"StatisticsResource","line":98,"otherAnnotations":["@GetMapping(\"management/statistics/exercise-statistics\")","@EnforceAtLeastTutor"]}]},{"filePath":"ConversationMessageResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createMessage","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/messages\"","className":"ConversationMessageResource","line":80,"otherAnnotations":["@PostMapping(\"courses/{courseId}/messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getMessages","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/messages\"","className":"ConversationMessageResource","line":111,"otherAnnotations":["@GetMapping(\"courses/{courseId}/messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateMessage","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/messages/{messageId}\"","className":"ConversationMessageResource","line":161,"otherAnnotations":["@PutMapping(\"courses/{courseId}/messages/{messageId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteMessage","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/messages/{messageId}\"","className":"ConversationMessageResource","line":179,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/messages/{messageId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateDisplayPriority","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/messages/{postId}/display-priority\"","className":"ConversationMessageResource","line":199,"otherAnnotations":["@PutMapping(\"courses/{courseId}/messages/{postId}/display-priority\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"computeSimilarityScoresWitCoursePosts","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/messages/similarity-check\"","className":"ConversationMessageResource","line":213,"otherAnnotations":["@PostMapping(\"courses/{courseId}/messages/similarity-check\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAllPostTagsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/messages/tags\"","className":"ConversationMessageResource","line":228,"otherAnnotations":["@GetMapping(\"courses/{courseId}/messages/tags\")","// TODO: unused, delete\n@EnforceAtLeastStudent"]}]},{"filePath":"AnswerMessageResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createAnswerMessage","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/answer-messages\"","className":"AnswerMessageResource","line":47,"otherAnnotations":["@PostMapping(\"courses/{courseId}/answer-messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateAnswerMessage","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/answer-messages/{answerMessageId}\"","className":"AnswerMessageResource","line":67,"otherAnnotations":["@PutMapping(\"courses/{courseId}/answer-messages/{answerMessageId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteAnswerMessage","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/answer-messages/{answerMessageId}\"","className":"AnswerMessageResource","line":85,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/answer-messages/{answerMessageId}\")","@EnforceAtLeastStudent"]}]},{"filePath":"ReactionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createReaction","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/postings/reactions\"","className":"ReactionResource","line":50,"otherAnnotations":["@PostMapping(\"courses/{courseId}/postings/reactions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteReaction","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/postings/reactions/{reactionId}\"","className":"ReactionResource","line":72,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/postings/reactions/{reactionId}\")","@EnforceAtLeastStudent"]}]},{"filePath":"ConversationResource","classRequestMapping":"\"api/courses/\"","endpoints":[{"requestMapping":"\"api/courses/\"","endpoint":"getConversationsOfUser","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/conversations\"","className":"ConversationResource","line":82,"otherAnnotations":["@GetMapping(\"{courseId}/conversations\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"updateIsFavorite","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/conversations/{conversationId}/favorite\"","className":"ConversationResource","line":102,"otherAnnotations":["@PostMapping(\"{courseId}/conversations/{conversationId}/favorite\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"updateIsHidden","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/conversations/{conversationId}/hidden\"","className":"ConversationResource","line":120,"otherAnnotations":["@PostMapping(\"{courseId}/conversations/{conversationId}/hidden\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"updateIsMuted","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/conversations/{conversationId}/muted\"","className":"ConversationResource","line":138,"otherAnnotations":["@PostMapping(\"{courseId}/conversations/{conversationId}/muted\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"hasUnreadMessages","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/unread-messages\"","className":"ConversationResource","line":154,"otherAnnotations":["@GetMapping(\"{courseId}/unread-messages\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"markAsRead","httpMethodAnnotation":"PatchMapping","URI":"\"{courseId}/conversations/{conversationId}/mark-as-read\"","className":"ConversationResource","line":171,"otherAnnotations":["@PatchMapping(\"{courseId}/conversations/{conversationId}/mark-as-read\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"isCodeOfConductAccepted","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/code-of-conduct/agreement\"","className":"ConversationResource","line":190,"otherAnnotations":["@GetMapping(\"{courseId}/code-of-conduct/agreement\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"acceptCodeOfConduct","httpMethodAnnotation":"PatchMapping","URI":"\"{courseId}/code-of-conduct/agreement\"","className":"ConversationResource","line":206,"otherAnnotations":["@PatchMapping(\"{courseId}/code-of-conduct/agreement\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"getResponsibleUsersForCodeOfConduct","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/code-of-conduct/responsible-users\"","className":"ConversationResource","line":223,"otherAnnotations":["@GetMapping(\"{courseId}/code-of-conduct/responsible-users\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"searchMembersOfConversation","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/conversations/{conversationId}/members/search\"","className":"ConversationResource","line":249,"otherAnnotations":["@GetMapping(\"{courseId}/conversations/{conversationId}/members/search\")","@EnforceAtLeastStudent"]}]},{"filePath":"OneToOneChatResource","classRequestMapping":"\"api/courses/\"","endpoints":[{"requestMapping":"\"api/courses/\"","endpoint":"startOneToOneChat","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/one-to-one-chats\"","className":"OneToOneChatResource","line":71,"otherAnnotations":["@PostMapping(\"{courseId}/one-to-one-chats\")","@EnforceAtLeastStudent"]}]},{"filePath":"ChannelResource","classRequestMapping":"\"api/courses/\"","endpoints":[{"requestMapping":"\"api/courses/\"","endpoint":"getCourseChannelsOverview","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/channels/overview\"","className":"ChannelResource","line":106,"otherAnnotations":["@GetMapping(\"{courseId}/channels/overview\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"getCoursePublicChannelsOverview","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/channels/public-overview\"","className":"ChannelResource","line":135,"otherAnnotations":["@GetMapping(\"{courseId}/channels/public-overview\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"getExerciseChannel","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/exercises/{exerciseId}/channel\"","className":"ChannelResource","line":161,"otherAnnotations":["@GetMapping(\"{courseId}/exercises/{exerciseId}/channel\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"getLectureChannel","httpMethodAnnotation":"GetMapping","URI":"\"{courseId}/lectures/{lectureId}/channel\"","className":"ChannelResource","line":186,"otherAnnotations":["@GetMapping(\"{courseId}/lectures/{lectureId}/channel\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"createChannel","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels\"","className":"ChannelResource","line":212,"otherAnnotations":["@PostMapping(\"{courseId}/channels\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"updateChannel","httpMethodAnnotation":"PutMapping","URI":"\"{courseId}/channels/{channelId}\"","className":"ChannelResource","line":244,"otherAnnotations":["@PutMapping(\"{courseId}/channels/{channelId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"deleteChannel","httpMethodAnnotation":"DeleteMapping","URI":"\"{courseId}/channels/{channelId}\"","className":"ChannelResource","line":272,"otherAnnotations":["@DeleteMapping(\"{courseId}/channels/{channelId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"archiveChannel","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/archive\"","className":"ChannelResource","line":303,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/archive\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"unArchiveChannel","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/unarchive\"","className":"ChannelResource","line":322,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/unarchive\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"grantChannelModeratorRole","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/grant-channel-moderator\"","className":"ChannelResource","line":342,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/grant-channel-moderator\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"revokeChannelModeratorRole","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/revoke-channel-moderator\"","className":"ChannelResource","line":365,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/revoke-channel-moderator\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"registerUsersToChannel","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/register\"","className":"ChannelResource","line":395,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/register\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"deregisterUsers","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/channels/{channelId}/deregister\"","className":"ChannelResource","line":433,"otherAnnotations":["@PostMapping(\"{courseId}/channels/{channelId}/deregister\")","@EnforceAtLeastStudent"]}]},{"filePath":"GroupChatResource","classRequestMapping":"\"api/courses/\"","endpoints":[{"requestMapping":"\"api/courses/\"","endpoint":"startGroupChat","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/group-chats\"","className":"GroupChatResource","line":80,"otherAnnotations":["@PostMapping(\"{courseId}/group-chats\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"updateGroupChat","httpMethodAnnotation":"PutMapping","URI":"\"{courseId}/group-chats/{groupChatId}\"","className":"GroupChatResource","line":115,"otherAnnotations":["@PutMapping(\"{courseId}/group-chats/{groupChatId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"registerUsersToGroupChat","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/group-chats/{groupChatId}/register\"","className":"GroupChatResource","line":139,"otherAnnotations":["@PostMapping(\"{courseId}/group-chats/{groupChatId}/register\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/courses/\"","endpoint":"deregisterUsersFromGroupChat","httpMethodAnnotation":"PostMapping","URI":"\"{courseId}/group-chats/{groupChatId}/deregister\"","className":"GroupChatResource","line":167,"otherAnnotations":["@PostMapping(\"{courseId}/group-chats/{groupChatId}/deregister\")","@EnforceAtLeastStudent"]}]},{"filePath":"ModelingSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createModelingSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/modeling-submissions\"","className":"ModelingSubmissionResource","line":108,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/modeling-submissions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateModelingSubmission","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/modeling-submissions\"","className":"ModelingSubmissionResource","line":128,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/modeling-submissions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAllModelingSubmissions","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/modeling-submissions\"","className":"ModelingSubmissionResource","line":171,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@ApiResponses({ @ApiResponse(code = 200, message = GET_200_SUBMISSIONS_REASON, response = ModelingSubmission.class, responseContainer = \"List\"), @ApiResponse(code = 403, message = ErrorConstants.REQ_403_REASON), @ApiResponse(code = 404, message = ErrorConstants.REQ_404_REASON) })","@GetMapping(\"exercises/{exerciseId}/modeling-submissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getModelingSubmission","httpMethodAnnotation":"GetMapping","URI":"\"modeling-submissions/{submissionId}\"","className":"ModelingSubmissionResource","line":195,"otherAnnotations":["@GetMapping(\"modeling-submissions/{submissionId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getModelingSubmissionWithoutAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/modeling-submission-without-assessment\"","className":"ModelingSubmissionResource","line":258,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/modeling-submission-without-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getLatestSubmissionForModelingEditor","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/latest-modeling-submission\"","className":"ModelingSubmissionResource","line":300,"otherAnnotations":["@GetMapping(\"participations/{participationId}/latest-modeling-submission\")","@EnforceAtLeastStudent"]}]},{"filePath":"GradingScaleResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getGradingScaleForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/grading-scale\"","className":"GradingScaleResource","line":85,"otherAnnotations":["@GetMapping(\"courses/{courseId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGradingScaleForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale\"","className":"GradingScaleResource","line":102,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllGradingScalesInInstructorGroupOnPage","httpMethodAnnotation":"GetMapping","URI":"\"grading-scales\"","className":"GradingScaleResource","line":120,"otherAnnotations":["@GetMapping(\"grading-scales\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"createGradingScaleForCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/grading-scale\"","className":"GradingScaleResource","line":135,"otherAnnotations":["@PostMapping(\"courses/{courseId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"createGradingScaleForExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale\"","className":"GradingScaleResource","line":173,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateGradingScaleForCourse","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/grading-scale\"","className":"GradingScaleResource","line":201,"otherAnnotations":["@PutMapping(\"courses/{courseId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateGradingScaleForExam","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale\"","className":"GradingScaleResource","line":226,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteGradingScaleForCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/grading-scale\"","className":"GradingScaleResource","line":251,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/grading-scale\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteGradingScaleForExam","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale\"","className":"GradingScaleResource","line":269,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/grading-scale\")","@EnforceAtLeastInstructor"]}]},{"filePath":"UserResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"searchAllUsers","httpMethodAnnotation":"GetMapping","URI":"\"users/search\"","className":"UserResource","line":96,"otherAnnotations":["@GetMapping(\"users/search\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateUserNotificationDate","httpMethodAnnotation":"PutMapping","URI":"\"users/notification-date\"","className":"UserResource","line":120,"otherAnnotations":["@PutMapping(\"users/notification-date\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateUserNotificationVisibility","httpMethodAnnotation":"PutMapping","URI":"\"users/notification-visibility\"","className":"UserResource","line":135,"otherAnnotations":["@PutMapping(\"users/notification-visibility\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"initializeUser","httpMethodAnnotation":"PutMapping","URI":"\"users/initialize\"","className":"UserResource","line":151,"otherAnnotations":["@PutMapping(\"users/initialize\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"setIrisAcceptedToTimestamp","httpMethodAnnotation":"PutMapping","URI":"\"users/accept-iris\"","className":"UserResource","line":173,"otherAnnotations":["@PutMapping(\"users/accept-iris\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"addSshPublicKey","httpMethodAnnotation":"PutMapping","URI":"\"users/sshpublickey\"","className":"UserResource","line":191,"otherAnnotations":["@PutMapping(\"users/sshpublickey\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteSshPublicKey","httpMethodAnnotation":"DeleteMapping","URI":"\"users/sshpublickey\"","className":"UserResource","line":218,"otherAnnotations":["@DeleteMapping(\"users/sshpublickey\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getVcsAccessToken","httpMethodAnnotation":"GetMapping","URI":"\"users/vcsToken\"","className":"UserResource","line":236,"otherAnnotations":["@GetMapping(\"users/vcsToken\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"createVcsAccessToken","httpMethodAnnotation":"PutMapping","URI":"\"users/vcsToken\"","className":"UserResource","line":252,"otherAnnotations":["@PutMapping(\"users/vcsToken\")","@EnforceAtLeastStudent"]}]},{"filePath":"LearningPathResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"enableLearningPathsForCourse","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/learning-paths/enable\"","className":"LearningPathResource","line":108,"otherAnnotations":["@PutMapping(\"courses/{courseId}/learning-paths/enable\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"generateMissingLearningPathsForCourse","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/learning-paths/generate-missing\"","className":"LearningPathResource","line":129,"otherAnnotations":["@PutMapping(\"courses/{courseId}/learning-paths/generate-missing\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathsOnPage","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/learning-paths\"","className":"LearningPathResource","line":147,"otherAnnotations":["@GetMapping(\"courses/{courseId}/learning-paths\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getHealthStatusForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/learning-path-health\"","className":"LearningPathResource","line":162,"otherAnnotations":["@GetMapping(\"courses/{courseId}/learning-path-health\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPath","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}\"","className":"LearningPathResource","line":177,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathCompetencyGraph","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/competency-graph\"","className":"LearningPathResource","line":196,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/competency-graph\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathNgxGraph","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/graph\"","className":"LearningPathResource","line":215,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/graph\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathNgxPath","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/path\"","className":"LearningPathResource","line":229,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/path\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getRelativeLearningPathNavigation","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/relative-navigation\"","className":"LearningPathResource","line":246,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/relative-navigation\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathNavigation","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/navigation\"","className":"LearningPathResource","line":265,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/navigation\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathNavigationOverview","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/navigation-overview\"","className":"LearningPathResource","line":281,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/navigation-overview\")","@FeatureToggle(Feature.LearningPaths)","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningPathId","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/learning-path-id\"","className":"LearningPathResource","line":309,"otherAnnotations":["@GetMapping(\"courses/{courseId}/learning-path-id\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"generateLearningPath","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/learning-path\"","className":"LearningPathResource","line":325,"otherAnnotations":["@PostMapping(\"courses/{courseId}/learning-path\")","@EnforceAtLeastStudentInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getCompetencyProgressForLearningPath","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/competency-progress\"","className":"LearningPathResource","line":349,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/competency-progress\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCompetencyOrderForLearningPath","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/competencies\"","className":"LearningPathResource","line":371,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/competencies\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLearningObjectsForCompetency","httpMethodAnnotation":"GetMapping","URI":"\"learning-path/{learningPathId}/competencies/{competencyId}/learning-objects\"","className":"LearningPathResource","line":393,"otherAnnotations":["@GetMapping(\"learning-path/{learningPathId}/competencies/{competencyId}/learning-objects\")","@EnforceAtLeastStudent"]}]},{"filePath":"ScienceSettingsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getScienceSettingsForCurrentUser","httpMethodAnnotation":"GetMapping","URI":"\"science-settings\"","className":"ScienceSettingsResource","line":61,"otherAnnotations":["@GetMapping(\"science-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"saveScienceSettingsForCurrentUser","httpMethodAnnotation":"PutMapping","URI":"\"science-settings\"","className":"ScienceSettingsResource","line":79,"otherAnnotations":["@PutMapping(\"science-settings\")","@EnforceAtLeastStudent"]}]},{"filePath":"ScienceResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"science","httpMethodAnnotation":"PutMapping","URI":"\"science\"","className":"ScienceResource","line":42,"otherAnnotations":["@PutMapping(value = \"science\")","@FeatureToggle(Feature.Science)","@EnforceAtLeastStudent"]}]},{"filePath":"AdminSystemNotificationResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"createSystemNotification","httpMethodAnnotation":"PostMapping","URI":"\"system-notifications\"","className":"AdminSystemNotificationResource","line":60,"otherAnnotations":["@PostMapping(\"system-notifications\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateSystemNotification","httpMethodAnnotation":"PutMapping","URI":"\"system-notifications\"","className":"AdminSystemNotificationResource","line":81,"otherAnnotations":["@PutMapping(\"system-notifications\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteSystemNotification","httpMethodAnnotation":"DeleteMapping","URI":"\"system-notifications/{notificationId}\"","className":"AdminSystemNotificationResource","line":103,"otherAnnotations":["@DeleteMapping(\"system-notifications/{notificationId}\")","@EnforceAdmin"]}]},{"filePath":"AdminTextAssessmentEventResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getEventsByCourseId","httpMethodAnnotation":"GetMapping","URI":"\"event-insights/text-assessment/events/{courseId}\"","className":"AdminTextAssessmentEventResource","line":38,"otherAnnotations":["@GetMapping(\"event-insights/text-assessment/events/{courseId}\")","@EnforceAdmin"]}]},{"filePath":"AdminDataExportResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"requestDataExportForUser","httpMethodAnnotation":"PostMapping","URI":"\"data-exports/{login}\"","className":"AdminDataExportResource","line":36,"otherAnnotations":["@PostMapping(\"data-exports/{login}\")","@EnforceAdmin"]}]},{"filePath":"AdminExamResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getCurrentAndUpcomingExams","httpMethodAnnotation":"GetMapping","URI":"\"courses/upcoming-exams\"","className":"AdminExamResource","line":40,"otherAnnotations":["@GetMapping(\"courses/upcoming-exams\")","@EnforceAdmin"]}]},{"filePath":"AdminIrisSettingsResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"updateGlobalSettings","httpMethodAnnotation":"PutMapping","URI":"\"iris/global-iris-settings\"","className":"AdminIrisSettingsResource","line":34,"otherAnnotations":["@PutMapping(\"iris/global-iris-settings\")","@EnforceAdmin"]}]},{"filePath":"AdminBuildJobQueueResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getQueuedBuildJobs","httpMethodAnnotation":"GetMapping","URI":"\"queued-jobs\"","className":"AdminBuildJobQueueResource","line":56,"otherAnnotations":["@GetMapping(\"queued-jobs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getRunningBuildJobs","httpMethodAnnotation":"GetMapping","URI":"\"running-jobs\"","className":"AdminBuildJobQueueResource","line":69,"otherAnnotations":["@GetMapping(\"running-jobs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getBuildAgentSummary","httpMethodAnnotation":"GetMapping","URI":"\"build-agents\"","className":"AdminBuildJobQueueResource","line":82,"otherAnnotations":["@GetMapping(\"build-agents\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getBuildAgentDetails","httpMethodAnnotation":"GetMapping","URI":"\"build-agent\"","className":"AdminBuildJobQueueResource","line":96,"otherAnnotations":["@GetMapping(\"build-agent\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"cancelBuildJob","httpMethodAnnotation":"DeleteMapping","URI":"\"cancel-job/{buildJobId}\"","className":"AdminBuildJobQueueResource","line":111,"otherAnnotations":["@DeleteMapping(\"cancel-job/{buildJobId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"cancelAllQueuedBuildJobs","httpMethodAnnotation":"DeleteMapping","URI":"\"cancel-all-queued-jobs\"","className":"AdminBuildJobQueueResource","line":126,"otherAnnotations":["@DeleteMapping(\"cancel-all-queued-jobs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"cancelAllRunningBuildJobs","httpMethodAnnotation":"DeleteMapping","URI":"\"cancel-all-running-jobs\"","className":"AdminBuildJobQueueResource","line":141,"otherAnnotations":["@DeleteMapping(\"cancel-all-running-jobs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"cancelAllRunningBuildJobsForAgent","httpMethodAnnotation":"DeleteMapping","URI":"\"cancel-all-running-jobs-for-agent\"","className":"AdminBuildJobQueueResource","line":157,"otherAnnotations":["@DeleteMapping(\"cancel-all-running-jobs-for-agent\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getFinishedBuildJobs","httpMethodAnnotation":"GetMapping","URI":"\"finished-jobs\"","className":"AdminBuildJobQueueResource","line":173,"otherAnnotations":["@GetMapping(\"finished-jobs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getBuildJobStatistics","httpMethodAnnotation":"GetMapping","URI":"\"build-job-statistics\"","className":"AdminBuildJobQueueResource","line":192,"otherAnnotations":["@GetMapping(\"build-job-statistics\")","@EnforceAdmin"]}]},{"filePath":"AdminStandardizedCompetencyResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"createStandardizedCompetency","httpMethodAnnotation":"PostMapping","URI":"\"standardized-competencies\"","className":"AdminStandardizedCompetencyResource","line":63,"otherAnnotations":["@PostMapping(\"standardized-competencies\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateStandardizedCompetency","httpMethodAnnotation":"PutMapping","URI":"\"standardized-competencies/{competencyId}\"","className":"AdminStandardizedCompetencyResource","line":81,"otherAnnotations":["@PutMapping(\"standardized-competencies/{competencyId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteStandardizedCompetency","httpMethodAnnotation":"DeleteMapping","URI":"\"standardized-competencies/{competencyId}\"","className":"AdminStandardizedCompetencyResource","line":99,"otherAnnotations":["@DeleteMapping(\"standardized-competencies/{competencyId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"createKnowledgeArea","httpMethodAnnotation":"PostMapping","URI":"\"standardized-competencies/knowledge-areas\"","className":"AdminStandardizedCompetencyResource","line":117,"otherAnnotations":["@PostMapping(\"standardized-competencies/knowledge-areas\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateKnowledgeArea","httpMethodAnnotation":"PutMapping","URI":"\"standardized-competencies/knowledge-areas/{knowledgeAreaId}\"","className":"AdminStandardizedCompetencyResource","line":136,"otherAnnotations":["@PutMapping(\"standardized-competencies/knowledge-areas/{knowledgeAreaId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteKnowledgeArea","httpMethodAnnotation":"DeleteMapping","URI":"\"standardized-competencies/knowledge-areas/{knowledgeAreaId}\"","className":"AdminStandardizedCompetencyResource","line":153,"otherAnnotations":["@DeleteMapping(\"standardized-competencies/knowledge-areas/{knowledgeAreaId}\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"importStandardizedCompetencyCatalog","httpMethodAnnotation":"PutMapping","URI":"\"standardized-competencies/import\"","className":"AdminStandardizedCompetencyResource","line":170,"otherAnnotations":["@PutMapping(\"standardized-competencies/import\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"exportStandardizedCompetencyCatalog","httpMethodAnnotation":"GetMapping","URI":"\"standardized-competencies/export\"","className":"AdminStandardizedCompetencyResource","line":186,"otherAnnotations":["@GetMapping(\"standardized-competencies/export\")","@FeatureToggle(Feature.StandardizedCompetencies)","@EnforceAdmin"]}]},{"filePath":"AdminCourseResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getAllGroupsForAllCourses","httpMethodAnnotation":"GetMapping","URI":"\"courses/groups\"","className":"AdminCourseResource","line":92,"otherAnnotations":["@GetMapping(\"courses/groups\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"createCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses\"","className":"AdminCourseResource","line":115,"otherAnnotations":["@PostMapping(value = \"courses\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}\"","className":"AdminCourseResource","line":169,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}\")","@EnforceAdmin"]}]},{"filePath":"AdminStatisticsResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getChartData","httpMethodAnnotation":"GetMapping","URI":"\"management/statistics/data\"","className":"AdminStatisticsResource","line":46,"otherAnnotations":["@GetMapping(\"management/statistics/data\")","@EnforceAdmin"]}]},{"filePath":"AdminExerciseResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getUpcomingExercises","httpMethodAnnotation":"GetMapping","URI":"\"exercises/upcoming\"","className":"AdminExerciseResource","line":40,"otherAnnotations":["@GetMapping(\"exercises/upcoming\")","@EnforceAdmin"]}]},{"filePath":"AdminUserResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"createUser","httpMethodAnnotation":"PostMapping","URI":"\"users\"","className":"AdminUserResource","line":110,"otherAnnotations":["@PostMapping(\"users\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateUser","httpMethodAnnotation":"PutMapping","URI":"\"users\"","className":"AdminUserResource","line":146,"otherAnnotations":["@PutMapping(\"users\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getUser","httpMethodAnnotation":"GetMapping","URI":"\"users/{login:\" + Constants.LOGIN_REGEX + \"}\"","className":"AdminUserResource","line":183,"otherAnnotations":["@GetMapping(\"users/{login:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"importUsers","httpMethodAnnotation":"PostMapping","URI":"\"users/import\"","className":"AdminUserResource","line":203,"otherAnnotations":["@PostMapping(\"users/import\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"syncUserViaLdap","httpMethodAnnotation":"PutMapping","URI":"\"users/{userId}/sync-ldap\"","className":"AdminUserResource","line":217,"otherAnnotations":["@PutMapping(\"users/{userId}/sync-ldap\")","@EnforceAdmin","@Profile(\"ldap | ldap-only\")"]},{"requestMapping":"\"api/admin/\"","endpoint":"getAllUsers","httpMethodAnnotation":"GetMapping","URI":"\"users\"","className":"AdminUserResource","line":237,"otherAnnotations":["@GetMapping(\"users\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getAuthorities","httpMethodAnnotation":"GetMapping","URI":"\"users/authorities\"","className":"AdminUserResource","line":250,"otherAnnotations":["@GetMapping(\"users/authorities\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteUser","httpMethodAnnotation":"DeleteMapping","URI":"\"users/{login:\" + Constants.LOGIN_REGEX + \"}\"","className":"AdminUserResource","line":262,"otherAnnotations":["@DeleteMapping(\"users/{login:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteUsers","httpMethodAnnotation":"DeleteMapping","URI":"\"users\"","className":"AdminUserResource","line":279,"otherAnnotations":["@DeleteMapping(\"users\")","@EnforceAdmin"]}]},{"filePath":"LogResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getList","httpMethodAnnotation":"GetMapping","URI":"\"logs\"","className":"LogResource","line":35,"otherAnnotations":["@GetMapping(\"logs\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"changeLevel","httpMethodAnnotation":"PutMapping","URI":"\"logs\"","className":"LogResource","line":48,"otherAnnotations":["@PutMapping(\"logs\")","@EnforceAdmin"]}]},{"filePath":"AdminPrivacyStatementResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getPrivacyStatementForUpdate","httpMethodAnnotation":"GetMapping","URI":"\"privacy-statement-for-update\"","className":"AdminPrivacyStatementResource","line":42,"otherAnnotations":["@EnforceAdmin","@GetMapping(\"privacy-statement-for-update\")"]},{"requestMapping":"\"api/admin/\"","endpoint":"updatePrivacyStatement","httpMethodAnnotation":"PutMapping","URI":"\"privacy-statement\"","className":"AdminPrivacyStatementResource","line":57,"otherAnnotations":["@EnforceAdmin","@PutMapping(\"privacy-statement\")"]}]},{"filePath":"AdminImprintResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getImprintForUpdate","httpMethodAnnotation":"GetMapping","URI":"\"imprint-for-update\"","className":"AdminImprintResource","line":42,"otherAnnotations":["@GetMapping(\"imprint-for-update\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateImprint","httpMethodAnnotation":"PutMapping","URI":"\"imprint\"","className":"AdminImprintResource","line":57,"otherAnnotations":["@PutMapping(\"imprint\")","@EnforceAdmin"]}]},{"filePath":"AuditResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getAll","httpMethodAnnotation":"GetMapping","URI":"\"audits\"","className":"AuditResource","line":50,"otherAnnotations":["@GetMapping(\"audits\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getByDates","httpMethodAnnotation":"GetMapping","URI":"\"audits\"","className":"AuditResource","line":66,"otherAnnotations":["@GetMapping(value = \"audits\", params = { \"fromDate\", \"toDate\" })","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"get","httpMethodAnnotation":"GetMapping","URI":"\"audits/{id:.+}\"","className":"AuditResource","line":85,"otherAnnotations":["@GetMapping(\"audits/{id:.+}\")","@EnforceAdmin"]}]},{"filePath":"FeatureToggleResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"toggleFeatures","httpMethodAnnotation":"PutMapping","URI":"\"feature-toggle\"","className":"FeatureToggleResource","line":38,"otherAnnotations":["@PutMapping(\"feature-toggle\")","@EnforceAdmin"]}]},{"filePath":"AdminLtiConfigurationResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"getLtiPlatformConfiguration","httpMethodAnnotation":"GetMapping","URI":"\"lti-platform/{platformId}\"","className":"AdminLtiConfigurationResource","line":75,"otherAnnotations":["@GetMapping(\"lti-platform/{platformId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteLtiPlatformConfiguration","httpMethodAnnotation":"DeleteMapping","URI":"\"lti-platform/{platformId}\"","className":"AdminLtiConfigurationResource","line":89,"otherAnnotations":["@DeleteMapping(\"lti-platform/{platformId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateLtiPlatformConfiguration","httpMethodAnnotation":"PutMapping","URI":"\"lti-platform\"","className":"AdminLtiConfigurationResource","line":105,"otherAnnotations":["@PutMapping(\"lti-platform\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"addLtiPlatformConfiguration","httpMethodAnnotation":"PostMapping","URI":"\"lti-platform\"","className":"AdminLtiConfigurationResource","line":125,"otherAnnotations":["@PostMapping(\"lti-platform\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"lti13DynamicRegistration","httpMethodAnnotation":"PostMapping","URI":"\"lti13/dynamic-registration\"","className":"AdminLtiConfigurationResource","line":147,"otherAnnotations":["@PostMapping(\"lti13/dynamic-registration\")","@EnforceAdmin"]}]},{"filePath":"AdminOrganizationResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"addCourseToOrganization","httpMethodAnnotation":"PostMapping","URI":"\"organizations/{organizationId}/courses/{courseId}\"","className":"AdminOrganizationResource","line":74,"otherAnnotations":["@PostMapping(\"organizations/{organizationId}/courses/{courseId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"removeCourseFromOrganization","httpMethodAnnotation":"DeleteMapping","URI":"\"organizations/{organizationId}/courses/{courseId}\"","className":"AdminOrganizationResource","line":92,"otherAnnotations":["@DeleteMapping(\"organizations/{organizationId}/courses/{courseId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"addUserToOrganization","httpMethodAnnotation":"PostMapping","URI":"\"organizations/{organizationId}/users/{userLogin}\"","className":"AdminOrganizationResource","line":109,"otherAnnotations":["@PostMapping(\"organizations/{organizationId}/users/{userLogin}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"removeUserFromOrganization","httpMethodAnnotation":"DeleteMapping","URI":"\"organizations/{organizationId}/users/{userLogin}\"","className":"AdminOrganizationResource","line":130,"otherAnnotations":["@DeleteMapping(\"organizations/{organizationId}/users/{userLogin}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"addOrganization","httpMethodAnnotation":"PostMapping","URI":"\"organizations\"","className":"AdminOrganizationResource","line":147,"otherAnnotations":["@PostMapping(\"organizations\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"updateOrganization","httpMethodAnnotation":"PutMapping","URI":"\"organizations/{organizationId}\"","className":"AdminOrganizationResource","line":163,"otherAnnotations":["@PutMapping(\"organizations/{organizationId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteOrganization","httpMethodAnnotation":"DeleteMapping","URI":"\"organizations/{organizationId}\"","className":"AdminOrganizationResource","line":184,"otherAnnotations":["@DeleteMapping(\"organizations/{organizationId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getAllOrganizations","httpMethodAnnotation":"GetMapping","URI":"\"organizations\"","className":"AdminOrganizationResource","line":197,"otherAnnotations":["@GetMapping(\"organizations\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getNumberOfUsersAndCoursesByOrganization","httpMethodAnnotation":"GetMapping","URI":"\"organizations/{organizationId}/count\"","className":"AdminOrganizationResource","line":212,"otherAnnotations":["@GetMapping(\"organizations/{organizationId}/count\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getNumberOfUsersAndCoursesOfAllOrganizations","httpMethodAnnotation":"GetMapping","URI":"\"organizations/count-all\"","className":"AdminOrganizationResource","line":229,"otherAnnotations":["@GetMapping(\"organizations/count-all\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getOrganizationById","httpMethodAnnotation":"GetMapping","URI":"\"organizations/{organizationId}\"","className":"AdminOrganizationResource","line":252,"otherAnnotations":["@GetMapping(\"organizations/{organizationId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getOrganizationByIdWithUsersAndCourses","httpMethodAnnotation":"GetMapping","URI":"\"organizations/{organizationId}/full\"","className":"AdminOrganizationResource","line":267,"otherAnnotations":["@GetMapping(\"organizations/{organizationId}/full\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getAllOrganizationsByUser","httpMethodAnnotation":"GetMapping","URI":"\"organizations/users/{userId}\"","className":"AdminOrganizationResource","line":281,"otherAnnotations":["@GetMapping(\"organizations/users/{userId}\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"getOrganizationTitle","httpMethodAnnotation":"GetMapping","URI":"\"organizations/{organizationId}/title\"","className":"AdminOrganizationResource","line":295,"otherAnnotations":["@GetMapping(\"organizations/{organizationId}/title\")","@EnforceAdmin"]}]},{"filePath":"AdminModelingExerciseResource","classRequestMapping":"\"api/admin/\"","endpoints":[{"requestMapping":"\"api/admin/\"","endpoint":"checkClusters","httpMethodAnnotation":"GetMapping","URI":"\"modeling-exercises/{exerciseId}/check-clusters\"","className":"AdminModelingExerciseResource","line":61,"otherAnnotations":["@GetMapping(\"modeling-exercises/{exerciseId}/check-clusters\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"deleteModelingExerciseClustersAndElements","httpMethodAnnotation":"DeleteMapping","URI":"\"modeling-exercises/{exerciseId}/clusters\"","className":"AdminModelingExerciseResource","line":75,"otherAnnotations":["@DeleteMapping(\"modeling-exercises/{exerciseId}/clusters\")","@EnforceAdmin"]},{"requestMapping":"\"api/admin/\"","endpoint":"triggerAutomaticAssessment","httpMethodAnnotation":"PostMapping","URI":"\"modeling-exercises/{exerciseId}/trigger-automatic-assessment\"","className":"AdminModelingExerciseResource","line":93,"otherAnnotations":["@PostMapping(\"modeling-exercises/{exerciseId}/trigger-automatic-assessment\")","@EnforceAdmin"]}]},{"filePath":"SystemNotificationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllSystemNotifications","httpMethodAnnotation":"GetMapping","URI":"\"system-notifications\"","className":"SystemNotificationResource","line":52,"otherAnnotations":["@GetMapping(\"system-notifications\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getSystemNotification","httpMethodAnnotation":"GetMapping","URI":"\"system-notifications/{notificationId}\"","className":"SystemNotificationResource","line":67,"otherAnnotations":["@GetMapping(\"system-notifications/{notificationId}\")","@EnforceAtLeastEditor"]}]},{"filePath":"ExamUserResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateExamUser","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/exam-users\"","className":"ExamUserResource","line":75,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/exam-users\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"saveUsersImages","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/exam-users-save-images\"","className":"ExamUserResource","line":123,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/exam-users-save-images\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllWhoDidNotSign","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/verify-exam-users\"","className":"ExamUserResource","line":138,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/verify-exam-users\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"isAttendanceChecked","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/attendance\"","className":"ExamUserResource","line":153,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/attendance\")","@EnforceAtLeastStudent"]}]},{"filePath":"QuizParticipationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"startParticipation","httpMethodAnnotation":"PostMapping","URI":"\"quiz-exercises/{exerciseId}/start-participation\"","className":"QuizParticipationResource","line":78,"otherAnnotations":["@PostMapping(\"quiz-exercises/{exerciseId}/start-participation\")","@EnforceAtLeastStudentInExercise"]}]},{"filePath":"ParticipantScoreResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getScoresOfCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/course-scores\"","className":"ParticipantScoreResource","line":63,"otherAnnotations":["@GetMapping(\"courses/{courseId}/course-scores\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getScoresOfExam","httpMethodAnnotation":"GetMapping","URI":"\"exams/{examId}/exam-scores\"","className":"ParticipantScoreResource","line":89,"otherAnnotations":["@GetMapping(\"exams/{examId}/exam-scores\")","@EnforceAtLeastInstructor"]}]},{"filePath":"AppleAppSiteAssociationResource","classRequestMapping":"\".well-known/\"","endpoints":[{"requestMapping":"\".well-known/\"","endpoint":"getAppleAppSiteAssociation","httpMethodAnnotation":"GetMapping","URI":"\"apple-app-site-association\"","className":"AppleAppSiteAssociationResource","line":35,"otherAnnotations":["@GetMapping(\"apple-app-site-association\")","@ManualConfig"]}]},{"filePath":"FileUploadAssessmentResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAssessmentBySubmissionId","httpMethodAnnotation":"GetMapping","URI":"\"file-upload-submissions/{submissionId}/result\"","className":"FileUploadAssessmentResource","line":71,"otherAnnotations":["@Override","@GetMapping(\"file-upload-submissions/{submissionId}/result\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"saveFileUploadAssessment","httpMethodAnnotation":"PutMapping","URI":"\"file-upload-submissions/{submissionId}/feedback\"","className":"FileUploadAssessmentResource","line":86,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@PutMapping(\"file-upload-submissions/{submissionId}/feedback\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateFileUploadAssessmentAfterComplaint","httpMethodAnnotation":"PutMapping","URI":"\"file-upload-submissions/{submissionId}/assessment-after-complaint\"","className":"FileUploadAssessmentResource","line":104,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@PutMapping(\"file-upload-submissions/{submissionId}/assessment-after-complaint\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAssessment","httpMethodAnnotation":"PutMapping","URI":"\"file-upload-submissions/{submissionId}/cancel-assessment\"","className":"FileUploadAssessmentResource","line":133,"otherAnnotations":["@PutMapping(\"file-upload-submissions/{submissionId}/cancel-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAssessment","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}/file-upload-submissions/{submissionId}/results/{resultId}\"","className":"FileUploadAssessmentResource","line":147,"otherAnnotations":["@Override","@DeleteMapping(\"participations/{participationId}/file-upload-submissions/{submissionId}/results/{resultId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"PlantUmlResource","classRequestMapping":"\"api/plantuml/\"","endpoints":[{"requestMapping":"\"api/plantuml/\"","endpoint":"generatePng","httpMethodAnnotation":"GetMapping","URI":"\"png\"","className":"PlantUmlResource","line":44,"otherAnnotations":["@GetMapping(\"png\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/plantuml/\"","endpoint":"generateSvg","httpMethodAnnotation":"GetMapping","URI":"\"svg\"","className":"PlantUmlResource","line":64,"otherAnnotations":["@GetMapping(\"svg\")","@EnforceAtLeastStudent"]}]},{"filePath":"ProgrammingExerciseSolutionEntryResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getSolutionEntry","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/solution-entries/{solutionEntryId}\"","className":"ProgrammingExerciseSolutionEntryResource","line":95,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/solution-entries/{solutionEntryId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getAllSolutionEntries","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":117,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/solution-entries\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getSolutionEntriesForCodeHint","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":135,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/solution-entries\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getSolutionEntriesForTestCase","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":160,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"createSolutionEntryForTestCase","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":186,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateSolutionEntry","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries/{solutionEntryId}\"","className":"ProgrammingExerciseSolutionEntryResource","line":212,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries/{solutionEntryId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"deleteSolutionEntry","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries/{solutionEntryId}\"","className":"ProgrammingExerciseSolutionEntryResource","line":243,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/test-cases/{testCaseId}/solution-entries/{solutionEntryId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAllSolutionEntriesForExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":267,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/solution-entries\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createStructuralSolutionEntries","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/structural-solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":286,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/structural-solution-entries\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"createBehavioralSolutionEntries","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/behavioral-solution-entries\"","className":"ProgrammingExerciseSolutionEntryResource","line":309,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/behavioral-solution-entries\")","@EnforceAtLeastEditor"]}]},{"filePath":"ProgrammingExerciseGitDiffReportResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getGitDiffReport","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/diff-report\"","className":"ProgrammingExerciseGitDiffReportResource","line":85,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/diff-report\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getGitDiffReportForSubmissions","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/submissions/{submissionId1}/diff-report/{submissionId2}\"","className":"ProgrammingExerciseGitDiffReportResource","line":109,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/submissions/{submissionId1}/diff-report/{submissionId2}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGitDiffReportForSubmissionWithTemplate","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/submissions/{submissionId1}/diff-report-with-template\"","className":"ProgrammingExerciseGitDiffReportResource","line":139,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/submissions/{submissionId1}/diff-report-with-template\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGitDiffReportForCommits","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/commits/{commitHash1}/diff-report/{commitHash2}\"","className":"ProgrammingExerciseGitDiffReportResource","line":169,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/commits/{commitHash1}/diff-report/{commitHash2}\")","@EnforceAtLeastStudent"]}]},{"filePath":"ProgrammingExerciseTaskResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getTasks","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/tasks\"","className":"ProgrammingExerciseTaskResource","line":54,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/tasks\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getTasksWithUnassignedTask","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/tasks-with-unassigned-test-cases\"","className":"ProgrammingExerciseTaskResource","line":75,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/tasks-with-unassigned-test-cases\")","@EnforceAtLeastTutor"]}]},{"filePath":"ExerciseHintResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createExerciseHint","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints\"","className":"ExerciseHintResource","line":89,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/exercise-hints\")","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"updateExerciseHint","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\"","className":"ExerciseHintResource","line":127,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\")","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getHintTitle","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/title\"","className":"ExerciseHintResource","line":169,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseHint","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\"","className":"ExerciseHintResource","line":185,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\")","@EnforceAtLeastTutorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseHintsForExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints\"","className":"ExerciseHintResource","line":212,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/exercise-hints\")","@EnforceAtLeastTutorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getActivatedExerciseHintsForExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/activated\"","className":"ExerciseHintResource","line":227,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/exercise-hints/activated\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getAvailableExerciseHintsForExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/available\"","className":"ExerciseHintResource","line":248,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/exercise-hints/available\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"activateExerciseHint","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/activate\"","className":"ExerciseHintResource","line":274,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/activate\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"rateExerciseHint","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/rating/{ratingValue}\"","className":"ExerciseHintResource","line":303,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}/rating/{ratingValue}\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"deleteExerciseHint","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\"","className":"ExerciseHintResource","line":327,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/exercise-hints/{exerciseHintId}\")","@EnforceAtLeastEditorInExercise"]}]},{"filePath":"CoverageReportResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getLatestFullCoverageReport","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/full-testwise-coverage-report\"","className":"CoverageReportResource","line":42,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/full-testwise-coverage-report\")","@EnforceAtLeastTutorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getLatestCoverageReport","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/testwise-coverage-report\"","className":"CoverageReportResource","line":59,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/testwise-coverage-report\")","@EnforceAtLeastTutorInExercise"]}]},{"filePath":"CodeHintResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllCodeHints","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/code-hints\"","className":"CodeHintResource","line":69,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/code-hints\")","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"generateCodeHintsForExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/code-hints\"","className":"CodeHintResource","line":83,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/code-hints\")","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"generateDescriptionForCodeHint","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/generate-description\"","className":"CodeHintResource","line":108,"otherAnnotations":["@Profile(\"iris\")","@PostMapping(\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/generate-description\")","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"removeSolutionEntryFromCodeHint","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/solution-entries/{solutionEntryId}\"","className":"CodeHintResource","line":144,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/code-hints/{codeHintId}/solution-entries/{solutionEntryId}\")","@EnforceAtLeastEditorInExercise"]}]},{"filePath":"FileUploadSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createFileUploadSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/file-upload-submissions\"","className":"FileUploadSubmissionResource","line":108,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/file-upload-submissions\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getFileUploadSubmission","httpMethodAnnotation":"GetMapping","URI":"\"file-upload-submissions/{submissionId}\"","className":"FileUploadSubmissionResource","line":181,"otherAnnotations":["@GetMapping(\"file-upload-submissions/{submissionId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getAllFileUploadSubmissions","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/file-upload-submissions\"","className":"FileUploadSubmissionResource","line":233,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/file-upload-submissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getFileUploadSubmissionWithoutAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/file-upload-submission-without-assessment\"","className":"FileUploadSubmissionResource","line":249,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/file-upload-submission-without-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getDataForFileUpload","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/file-upload-editor\"","className":"FileUploadSubmissionResource","line":299,"otherAnnotations":["@GetMapping(\"participations/{participationId}/file-upload-editor\")","@EnforceAtLeastStudent"]}]},{"filePath":"RatingResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getRatingForResult","httpMethodAnnotation":"GetMapping","URI":"\"results/{resultId}/rating\"","className":"RatingResource","line":76,"otherAnnotations":["@GetMapping(\"results/{resultId}/rating\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"createRatingForResult","httpMethodAnnotation":"PostMapping","URI":"\"results/{resultId}/rating/{ratingValue}\"","className":"RatingResource","line":95,"otherAnnotations":["@PostMapping(\"results/{resultId}/rating/{ratingValue}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateRatingForResult","httpMethodAnnotation":"PutMapping","URI":"\"results/{resultId}/rating/{ratingValue}\"","className":"RatingResource","line":117,"otherAnnotations":["@PutMapping(\"results/{resultId}/rating/{ratingValue}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getRatingForInstructorDashboard","httpMethodAnnotation":"GetMapping","URI":"\"course/{courseId}/rating\"","className":"RatingResource","line":132,"otherAnnotations":["@GetMapping(\"course/{courseId}/rating\")","@EnforceAtLeastInstructor"]}]},{"filePath":"ExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getExercise","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}\"","className":"ExerciseResource","line":140,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseForExampleSolution","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/example-solution\"","className":"ExerciseResource","line":192,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/example-solution\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/for-assessment-dashboard\"","className":"ExerciseResource","line":224,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/for-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseTitle","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/title\"","className":"ExerciseResource","line":262,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getStatsForExerciseAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/stats-for-assessment-dashboard\"","className":"ExerciseResource","line":275,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/stats-for-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"reset","httpMethodAnnotation":"DeleteMapping","URI":"\"exercises/{exerciseId}/reset\"","className":"ExerciseResource","line":291,"otherAnnotations":["@DeleteMapping(\"exercises/{exerciseId}/reset\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseDetails","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/details\"","className":"ExerciseResource","line":307,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/details\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"toggleSecondCorrectionEnabled","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/toggle-second-correction\"","className":"ExerciseResource","line":367,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/toggle-second-correction\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getLatestDueDate","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/latest-due-date\"","className":"ExerciseResource","line":382,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/latest-due-date\")","@EnforceAtLeastStudent"]}]},{"filePath":"TutorParticipationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"initTutorParticipation","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/tutor-participations\"","className":"TutorParticipationResource","line":81,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/tutor-participations\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"assessExampleSubmissionForTutorParticipation","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/assess-example-submission\"","className":"TutorParticipationResource","line":109,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/assess-example-submission\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteTutorParticipationForGuidedTour","httpMethodAnnotation":"DeleteMapping","URI":"\"guided-tour/exercises/{exerciseId}/example-submission\"","className":"TutorParticipationResource","line":136,"otherAnnotations":["@DeleteMapping(\"guided-tour/exercises/{exerciseId}/example-submission\")","@EnforceAtLeastTutor"]}]},{"filePath":"TextExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createTextExercise","httpMethodAnnotation":"PostMapping","URI":"\"text-exercises\"","className":"TextExerciseResource","line":202,"otherAnnotations":["@PostMapping(\"text-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateTextExercise","httpMethodAnnotation":"PutMapping","URI":"\"text-exercises\"","className":"TextExerciseResource","line":247,"otherAnnotations":["@PutMapping(\"text-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getTextExercisesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/text-exercises\"","className":"TextExerciseResource","line":301,"otherAnnotations":["@GetMapping(\"courses/{courseId}/text-exercises\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getTextExercise","httpMethodAnnotation":"GetMapping","URI":"\"text-exercises/{exerciseId}\"","className":"TextExerciseResource","line":335,"otherAnnotations":["@GetMapping(\"text-exercises/{exerciseId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteTextExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"text-exercises/{exerciseId}\"","className":"TextExerciseResource","line":371,"otherAnnotations":["@DeleteMapping(\"text-exercises/{exerciseId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getDataForTextEditor","httpMethodAnnotation":"GetMapping","URI":"\"text-editor/{participationId}\"","className":"TextExerciseResource","line":392,"otherAnnotations":["@GetMapping(\"text-editor/{participationId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"text-exercises\"","className":"TextExerciseResource","line":475,"otherAnnotations":["@GetMapping(\"text-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importExercise","httpMethodAnnotation":"PostMapping","URI":"\"text-exercises/import/{sourceExerciseId}\"","className":"TextExerciseResource","line":496,"otherAnnotations":["@PostMapping(\"text-exercises/import/{sourceExerciseId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"exportSubmissions","httpMethodAnnotation":"PostMapping","URI":"\"text-exercises/{exerciseId}/export-submissions\"","className":"TextExerciseResource","line":534,"otherAnnotations":["@PostMapping(\"text-exercises/{exerciseId}/export-submissions\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.Exports)"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismResult","httpMethodAnnotation":"GetMapping","URI":"\"text-exercises/{exerciseId}/plagiarism-result\"","className":"TextExerciseResource","line":560,"otherAnnotations":["@GetMapping(\"text-exercises/{exerciseId}/plagiarism-result\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"checkPlagiarism","httpMethodAnnotation":"GetMapping","URI":"\"text-exercises/{exerciseId}/check-plagiarism\"","className":"TextExerciseResource","line":582,"otherAnnotations":["@GetMapping(\"text-exercises/{exerciseId}/check-plagiarism\")","@FeatureToggle(Feature.PlagiarismChecks)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"reEvaluateAndUpdateTextExercise","httpMethodAnnotation":"PutMapping","URI":"\"text-exercises/{exerciseId}/re-evaluate\"","className":"TextExerciseResource","line":610,"otherAnnotations":["@PutMapping(\"text-exercises/{exerciseId}/re-evaluate\")","@EnforceAtLeastEditor"]}]},{"filePath":"TeamResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createTeam","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/teams\"","className":"TeamResource","line":131,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/teams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateTeam","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/teams/{teamId}\"","className":"TeamResource","line":176,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/teams/{teamId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getTeam","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/teams/{teamId}\"","className":"TeamResource","line":247,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/teams/{teamId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getTeamsForExercise","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/teams\"","className":"TeamResource","line":271,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/teams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteTeam","httpMethodAnnotation":"DeleteMapping","URI":"\"exercises/{exerciseId}/teams/{teamId}\"","className":"TeamResource","line":290,"otherAnnotations":["@DeleteMapping(\"exercises/{exerciseId}/teams/{teamId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"existsTeamByShortName","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/teams/exists\"","className":"TeamResource","line":323,"otherAnnotations":["@GetMapping(\"courses/{courseId}/teams/exists\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"searchTeamInExercise","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exercises/{exerciseId}/team-search-users\"","className":"TeamResource","line":340,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exercises/{exerciseId}/team-search-users\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"importTeamsFromList","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/teams/import-from-list\"","className":"TeamResource","line":363,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/teams/import-from-list\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importTeamsFromSourceExercise","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{destinationExerciseId}/teams/import-from-exercise/{sourceExerciseId}\"","className":"TeamResource","line":402,"otherAnnotations":["@PutMapping(\"exercises/{destinationExerciseId}/teams/import-from-exercise/{sourceExerciseId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseWithExercisesAndParticipationsForTeam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/teams/{teamShortName}/with-exercises-and-participations\"","className":"TeamResource","line":447,"otherAnnotations":["@GetMapping(\"courses/{courseId}/teams/{teamShortName}/with-exercises-and-participations\")","@EnforceAtLeastStudent"]}]},{"filePath":"BuildPlanResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getBuildPlanForEditor","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/build-plan/for-editor\"","className":"BuildPlanResource","line":53,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/build-plan/for-editor\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"setBuildPlan","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/build-plan\"","className":"BuildPlanResource","line":77,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/build-plan\")","@EnforceAtLeastEditor"]}]},{"filePath":"BuildJobQueueResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getQueuedBuildJobsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/queued-jobs\"","className":"BuildJobQueueResource","line":68,"otherAnnotations":["@GetMapping(\"courses/{courseId}/queued-jobs\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getRunningBuildJobsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/running-jobs\"","className":"BuildJobQueueResource","line":86,"otherAnnotations":["@GetMapping(\"courses/{courseId}/running-jobs\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"cancelBuildJob","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/cancel-job/{buildJobId}\"","className":"BuildJobQueueResource","line":105,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/cancel-job/{buildJobId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAllQueuedBuildJobs","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/cancel-all-queued-jobs\"","className":"BuildJobQueueResource","line":126,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/cancel-all-queued-jobs\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAllRunningBuildJobs","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/cancel-all-running-jobs\"","className":"BuildJobQueueResource","line":146,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/cancel-all-running-jobs\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getFinishedBuildJobsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/finished-jobs\"","className":"BuildJobQueueResource","line":167,"otherAnnotations":["@GetMapping(\"courses/{courseId}/finished-jobs\")","@EnforceAtLeastInstructorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getBuildJobStatistics","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/build-job-statistics\"","className":"BuildJobQueueResource","line":184,"otherAnnotations":["@GetMapping(\"courses/{courseId}/build-job-statistics\")","@EnforceAtLeastInstructorInCourse"]}]},{"filePath":"BuildLogResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getBuildLogForBuildJob","httpMethodAnnotation":"GetMapping","URI":"\"build-log/{buildJobId}\"","className":"BuildLogResource","line":41,"otherAnnotations":["@GetMapping(\"build-log/{buildJobId}\")","@EnforceAtLeastEditor"]}]},{"filePath":"ProgrammingExerciseExportImportResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"importProgrammingExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/import/{sourceExerciseId}\"","className":"ProgrammingExerciseExportImportResource","line":185,"otherAnnotations":["@PostMapping(\"programming-exercises/import/{sourceExerciseId}\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"importProgrammingExerciseFromFile","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/programming-exercises/import-from-file\"","className":"ProgrammingExerciseExportImportResource","line":291,"otherAnnotations":["@PostMapping(\"courses/{courseId}/programming-exercises/import-from-file\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"exportInstructorExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/export-instructor-exercise\"","className":"ProgrammingExerciseExportImportResource","line":318,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/export-instructor-exercise\")","@EnforceAtLeastInstructor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportInstructorRepository","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/export-instructor-repository/{repositoryType}\"","className":"ProgrammingExerciseExportImportResource","line":352,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/export-instructor-repository/{repositoryType}\")","@EnforceAtLeastTutor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportInstructorAuxiliaryRepository","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/export-instructor-auxiliary-repository/{repositoryId}\"","className":"ProgrammingExerciseExportImportResource","line":373,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/export-instructor-auxiliary-repository/{repositoryId}\")","@EnforceAtLeastTutor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportSubmissionsByStudentLogins","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/export-repos-by-participant-identifiers/{participantIdentifiers}\"","className":"ProgrammingExerciseExportImportResource","line":419,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/export-repos-by-participant-identifiers/{participantIdentifiers}\")","@EnforceAtLeastTutor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportSubmissionsByParticipationIds","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/export-repos-by-participation-ids/{participationIds}\"","className":"ProgrammingExerciseExportImportResource","line":464,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/export-repos-by-participation-ids/{participationIds}\")","@EnforceAtLeastTutor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportStudentRequestedRepository","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/export-student-requested-repository\"","className":"ProgrammingExerciseExportImportResource","line":523,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/export-student-requested-repository\")","@EnforceAtLeastStudent","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]},{"requestMapping":"\"api/\"","endpoint":"exportStudentRepository","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/export-student-repository/{participationId}\"","className":"ProgrammingExerciseExportImportResource","line":550,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/export-student-repository/{participationId}\")","@EnforceAtLeastStudent","@FeatureToggle({ Feature.ProgrammingExercises, Feature.Exports })"]}]},{"filePath":"ProgrammingAssessmentResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateProgrammingManualResultAfterComplaint","httpMethodAnnotation":"PutMapping","URI":"\"programming-submissions/{submissionId}/assessment-after-complaint\"","className":"ProgrammingAssessmentResource","line":80,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@PutMapping(\"programming-submissions/{submissionId}/assessment-after-complaint\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAssessment","httpMethodAnnotation":"PutMapping","URI":"\"programming-submissions/{submissionId}/cancel-assessment\"","className":"ProgrammingAssessmentResource","line":116,"otherAnnotations":["@PutMapping(\"programming-submissions/{submissionId}/cancel-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"saveProgrammingAssessment","httpMethodAnnotation":"PutMapping","URI":"\"participations/{participationId}/manual-results\"","className":"ProgrammingAssessmentResource","line":130,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@PutMapping(\"participations/{participationId}/manual-results\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAssessment","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}/programming-submissions/{submissionId}/results/{resultId}\"","className":"ProgrammingAssessmentResource","line":201,"otherAnnotations":["@Override","@DeleteMapping(\"participations/{participationId}/programming-submissions/{submissionId}/results/{resultId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"ProgrammingExerciseParticipationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getParticipationWithLatestResultForStudentParticipation","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/student-participation-with-latest-result-and-feedbacks\"","className":"ProgrammingExerciseParticipationResource","line":106,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/student-participation-with-latest-result-and-feedbacks\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationWithAllResultsForStudentParticipation","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/student-participation-with-all-results\"","className":"ProgrammingExerciseParticipationResource","line":129,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/student-participation-with-all-results\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLatestResultWithFeedbacksForProgrammingExerciseParticipation","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/latest-result-with-feedbacks\"","className":"ProgrammingExerciseParticipationResource","line":154,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/latest-result-with-feedbacks\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"checkIfParticipationHashResult","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/has-result\"","className":"ProgrammingExerciseParticipationResource","line":178,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/has-result\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLatestPendingSubmission","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/latest-pending-submission\"","className":"ProgrammingExerciseParticipationResource","line":194,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/latest-pending-submission\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLatestPendingSubmissionsByExerciseId","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/latest-pending-submissions\"","className":"ProgrammingExerciseParticipationResource","line":216,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/latest-pending-submissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"resetRepository","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercise-participations/{participationId}/reset-repository\"","className":"ProgrammingExerciseParticipationResource","line":243,"otherAnnotations":["@PutMapping(\"programming-exercise-participations/{participationId}/reset-repository\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCommitInfosForParticipationRepo","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/commits-info\"","className":"ProgrammingExerciseParticipationResource","line":283,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/commits-info\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getCommitHistoryForParticipationRepo","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/commit-history\"","className":"ProgrammingExerciseParticipationResource","line":299,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/commit-history\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCommitHistoryForTemplateSolutionOrTestRepo","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise/{exerciseID}/commit-history/{repositoryType}\"","className":"ProgrammingExerciseParticipationResource","line":317,"otherAnnotations":["@GetMapping(\"programming-exercise/{exerciseID}/commit-history/{repositoryType}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationRepositoryFiles","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise-participations/{participationId}/files-content/{commitId}\"","className":"ProgrammingExerciseParticipationResource","line":350,"otherAnnotations":["@GetMapping(\"programming-exercise-participations/{participationId}/files-content/{commitId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationRepositoryFilesForCommitsDetailsView","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercise/{exerciseId}/files-content-commit-details/{commitId}\"","className":"ProgrammingExerciseParticipationResource","line":371,"otherAnnotations":["@GetMapping(\"programming-exercise/{exerciseId}/files-content-commit-details/{commitId}\")","@EnforceAtLeastStudent"]}]},{"filePath":"ProgrammingExerciseGradingResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"reEvaluateGradedResults","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/grading/re-evaluate\"","className":"ProgrammingExerciseGradingResource","line":67,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/grading/re-evaluate\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGradingStatistics","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/grading/statistics\"","className":"ProgrammingExerciseGradingResource","line":90,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/grading/statistics\")","@EnforceAtLeastEditor"]}]},{"filePath":"ProgrammingExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createProgrammingExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/setup\"","className":"ProgrammingExerciseResource","line":229,"otherAnnotations":["@PostMapping(\"programming-exercises/setup\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"updateProgrammingExercise","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises\"","className":"ProgrammingExerciseResource","line":271,"otherAnnotations":["@PutMapping(\"programming-exercises\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"updateProgrammingExerciseTimeline","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/timeline\"","className":"ProgrammingExerciseResource","line":363,"otherAnnotations":["@PutMapping(\"programming-exercises/timeline\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"updateProblemStatement","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/problem-statement\"","className":"ProgrammingExerciseResource","line":387,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/problem-statement\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingExercisesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/programming-exercises\"","className":"ProgrammingExerciseResource","line":410,"otherAnnotations":["@GetMapping(\"courses/{courseId}/programming-exercises\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingExercise","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}\"","className":"ProgrammingExerciseResource","line":442,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingExerciseWithSetupParticipations","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/with-participations\"","className":"ProgrammingExerciseResource","line":477,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/with-participations\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingExerciseWithTemplateAndSolutionParticipation","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/with-template-and-solution-participation\"","className":"ProgrammingExerciseResource","line":501,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/with-template-and-solution-participation\")","@EnforceAtLeastTutorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"deleteProgrammingExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}\"","className":"ProgrammingExerciseResource","line":520,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"combineTemplateRepositoryCommits","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/combine-template-commits\"","className":"ProgrammingExerciseResource","line":543,"otherAnnotations":["@PutMapping(value = \"programming-exercises/{exerciseId}/combine-template-commits\", produces = MediaType.TEXT_PLAIN_VALUE)","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"generateStructureOracleForExercise","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/generate-tests\"","className":"ProgrammingExerciseResource","line":566,"otherAnnotations":["@PutMapping(value = \"programming-exercises/{exerciseId}/generate-tests\", produces = MediaType.TEXT_PLAIN_VALUE)","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"hasAtLeastOneStudentResult","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/test-case-state\"","className":"ProgrammingExerciseResource","line":615,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/test-case-state\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises\"","className":"ProgrammingExerciseResource","line":635,"otherAnnotations":["@GetMapping(\"programming-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesWithSCAOnPage","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/with-sca\"","className":"ProgrammingExerciseResource","line":653,"otherAnnotations":["@GetMapping(\"programming-exercises/with-sca\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAuxiliaryRepositories","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/auxiliary-repository\"","className":"ProgrammingExerciseResource","line":669,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/auxiliary-repository\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"reset","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/reset\"","className":"ProgrammingExerciseResource","line":691,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/reset\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"reEvaluateAndUpdateProgrammingExercise","httpMethodAnnotation":"PutMapping","URI":"\"programming-exercises/{exerciseId}/re-evaluate\"","className":"ProgrammingExerciseResource","line":730,"otherAnnotations":["@PutMapping(\"programming-exercises/{exerciseId}/re-evaluate\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"deleteTaskWithSolutionEntries","httpMethodAnnotation":"DeleteMapping","URI":"\"programming-exercises/{exerciseId}/tasks\"","className":"ProgrammingExerciseResource","line":758,"otherAnnotations":["@DeleteMapping(\"programming-exercises/{exerciseId}/tasks\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"redirectGetSolutionRepositoryFiles","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/solution-files-content\"","className":"ProgrammingExerciseResource","line":780,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/solution-files-content\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"redirectGetTemplateRepositoryFiles","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/template-files-content\"","className":"ProgrammingExerciseResource","line":804,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/template-files-content\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"redirectGetSolutionRepositoryFilesWithoutContent","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/file-names\"","className":"ProgrammingExerciseResource","line":828,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/file-names\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"getBuildLogStatistics","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/build-log-statistics\"","className":"ProgrammingExerciseResource","line":850,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/build-log-statistics\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"getRepositoryCheckoutDirectories","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/repository-checkout-directories\"","className":"ProgrammingExerciseResource","line":871,"otherAnnotations":["@GetMapping(\"programming-exercises/repository-checkout-directories\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]}]},{"filePath":"ProgrammingExerciseLockResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"unlockAllRepositories","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/unlock-all-repositories\"","className":"ProgrammingExerciseLockResource","line":37,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/unlock-all-repositories\")","@EnforceAtLeastInstructorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"lockAllRepositories","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/lock-all-repositories\"","className":"ProgrammingExerciseLockResource","line":53,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/lock-all-repositories\")","@EnforceAtLeastInstructorInExercise"]}]},{"filePath":"ProgrammingExerciseTestCaseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getTestCases","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/test-cases\"","className":"ProgrammingExerciseTestCaseResource","line":73,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/test-cases\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateTestCases","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/update-test-cases\"","className":"ProgrammingExerciseTestCaseResource","line":93,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/update-test-cases\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"resetTestCases","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/test-cases/reset\"","className":"ProgrammingExerciseTestCaseResource","line":121,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/test-cases/reset\")","@EnforceAtLeastEditor"]}]},{"filePath":"ProgrammingExercisePlagiarismResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getPlagiarismResult","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/plagiarism-result\"","className":"ProgrammingExercisePlagiarismResource","line":73,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/plagiarism-result\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"checkPlagiarism","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/check-plagiarism\"","className":"ProgrammingExercisePlagiarismResource","line":96,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/check-plagiarism\")","@EnforceAtLeastEditor","@FeatureToggle({ Feature.ProgrammingExercises, Feature.PlagiarismChecks })"]},{"requestMapping":"\"api/\"","endpoint":"checkPlagiarismWithJPlagReport","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/check-plagiarism-jplag-report\"","className":"ProgrammingExercisePlagiarismResource","line":129,"otherAnnotations":["@GetMapping(value = \"programming-exercises/{exerciseId}/check-plagiarism-jplag-report\")","@EnforceAtLeastEditor","@FeatureToggle(Feature.ProgrammingExercises)"]}]},{"filePath":"ProgrammingSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"triggerBuild","httpMethodAnnotation":"PostMapping","URI":"\"programming-submissions/{participationId}/trigger-build\"","className":"ProgrammingSubmissionResource","line":131,"otherAnnotations":["@PostMapping(\"programming-submissions/{participationId}/trigger-build\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"triggerFailedBuild","httpMethodAnnotation":"PostMapping","URI":"\"programming-submissions/{participationId}/trigger-failed-build\"","className":"ProgrammingSubmissionResource","line":172,"otherAnnotations":["@PostMapping(\"programming-submissions/{participationId}/trigger-failed-build\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"triggerInstructorBuildForExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/trigger-instructor-build-all\"","className":"ProgrammingSubmissionResource","line":213,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/trigger-instructor-build-all\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"triggerInstructorBuildForExercise","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/{exerciseId}/trigger-instructor-build\"","className":"ProgrammingSubmissionResource","line":235,"otherAnnotations":["@PostMapping(\"programming-exercises/{exerciseId}/trigger-instructor-build\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"getAllProgrammingSubmissions","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/programming-submissions\"","className":"ProgrammingSubmissionResource","line":267,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/programming-submissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"lockAndGetProgrammingSubmission","httpMethodAnnotation":"GetMapping","URI":"\"programming-submissions/{submissionId}/lock\"","className":"ProgrammingSubmissionResource","line":302,"otherAnnotations":["@GetMapping(\"programming-submissions/{submissionId}/lock\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getProgrammingSubmissionWithoutAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/programming-submission-without-assessment\"","className":"ProgrammingSubmissionResource","line":367,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/programming-submission-without-assessment\")","@EnforceAtLeastTutor"]}]},{"filePath":"ComplaintResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createComplaint","httpMethodAnnotation":"PostMapping","URI":"\"complaints\"","className":"ComplaintResource","line":107,"otherAnnotations":["@PostMapping(\"complaints\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getComplaintBySubmissionId","httpMethodAnnotation":"GetMapping","URI":"\"complaints\"","className":"ComplaintResource","line":151,"otherAnnotations":["@GetMapping(value = \"complaints\", params = { \"submissionId\" })","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getComplaintsForTestRunDashboard","httpMethodAnnotation":"GetMapping","URI":"\"complaints\"","className":"ComplaintResource","line":196,"otherAnnotations":["@GetMapping(value = \"complaints\", params = { \"exerciseId\" })","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getComplaintsByCourseId","httpMethodAnnotation":"GetMapping","URI":"\"complaints\"","className":"ComplaintResource","line":215,"otherAnnotations":["@GetMapping(value = \"complaints\", params = { \"courseId\", \"complaintType\" })","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getComplaintsByExerciseId","httpMethodAnnotation":"GetMapping","URI":"\"complaints\"","className":"ComplaintResource","line":257,"otherAnnotations":["@GetMapping(value = \"complaints\", params = { \"exerciseId\", \"complaintType\" })","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getComplaintsByCourseIdAndExamId","httpMethodAnnotation":"GetMapping","URI":"\"complaints\"","className":"ComplaintResource","line":294,"otherAnnotations":["@GetMapping(value = \"complaints\", params = { \"courseId\", \"examId\" })","@EnforceAtLeastInstructor"]}]},{"filePath":"ModelingAssessmentResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAssessmentBySubmissionId","httpMethodAnnotation":"GetMapping","URI":"\"modeling-submissions/{submissionId}/result\"","className":"ModelingAssessmentResource","line":85,"otherAnnotations":["@Override","@GetMapping(\"modeling-submissions/{submissionId}/result\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getModelingExampleAssessment","httpMethodAnnotation":"GetMapping","URI":"\"exercise/{exerciseId}/modeling-submissions/{submissionId}/example-assessment\"","className":"ModelingAssessmentResource","line":99,"otherAnnotations":["@GetMapping(\"exercise/{exerciseId}/modeling-submissions/{submissionId}/example-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"saveModelingAssessment","httpMethodAnnotation":"PutMapping","URI":"\"modeling-submissions/{submissionId}/result/{resultId}/assessment\"","className":"ModelingAssessmentResource","line":115,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@ApiResponses({ @ApiResponse(code = 200, message = PUT_SUBMIT_ASSESSMENT_200_REASON, response = Result.class), @ApiResponse(code = 403, message = ErrorConstants.REQ_403_REASON), @ApiResponse(code = 404, message = ErrorConstants.REQ_404_REASON) })","@PutMapping(\"modeling-submissions/{submissionId}/result/{resultId}/assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"saveModelingExampleAssessment","httpMethodAnnotation":"PutMapping","URI":"\"modeling-submissions/{exampleSubmissionId}/example-assessment\"","className":"ModelingAssessmentResource","line":133,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@ApiResponses({ @ApiResponse(code = 200, message = PUT_SUBMIT_ASSESSMENT_200_REASON, response = Result.class), @ApiResponse(code = 403, message = ErrorConstants.REQ_403_REASON), @ApiResponse(code = 404, message = ErrorConstants.REQ_404_REASON) })","@PutMapping(\"modeling-submissions/{exampleSubmissionId}/example-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateModelingAssessmentAfterComplaint","httpMethodAnnotation":"PutMapping","URI":"\"modeling-submissions/{submissionId}/assessment-after-complaint\"","className":"ModelingAssessmentResource","line":152,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@ApiResponses({ @ApiResponse(code = 200, message = POST_ASSESSMENT_AFTER_COMPLAINT_200_REASON, response = Result.class), @ApiResponse(code = 403, message = ErrorConstants.REQ_403_REASON), @ApiResponse(code = 404, message = ErrorConstants.REQ_404_REASON) })","@PutMapping(\"modeling-submissions/{submissionId}/assessment-after-complaint\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAssessment","httpMethodAnnotation":"PutMapping","URI":"\"modeling-submissions/{submissionId}/cancel-assessment\"","className":"ModelingAssessmentResource","line":187,"otherAnnotations":["@PutMapping(\"modeling-submissions/{submissionId}/cancel-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAssessment","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}/modeling-submissions/{submissionId}/results/{resultId}\"","className":"ModelingAssessmentResource","line":201,"otherAnnotations":["@Override","@DeleteMapping(\"participations/{participationId}/modeling-submissions/{submissionId}/results/{resultId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"CourseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateCourse","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}\"","className":"CourseResource","line":228,"otherAnnotations":["@PutMapping(value = \"courses/{courseId}\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateOnlineCourseConfiguration","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/onlineCourseConfiguration\"","className":"CourseResource","line":373,"otherAnnotations":["@PutMapping(\"courses/{courseId}/onlineCourseConfiguration\")","@EnforceAtLeastInstructor","@Profile(\"lti\")"]},{"requestMapping":"\"api/\"","endpoint":"findAllOnlineCoursesForLtiDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-lti-dashboard\"","className":"CourseResource","line":415,"otherAnnotations":["@GetMapping(\"courses/for-lti-dashboard\")","@EnforceAtLeastInstructor","@Profile(\"lti\")"]},{"requestMapping":"\"api/\"","endpoint":"enrollInCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/enroll\"","className":"CourseResource","line":439,"otherAnnotations":["@PostMapping(\"courses/{courseId}/enroll\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"unenrollFromCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/unenroll\"","className":"CourseResource","line":458,"otherAnnotations":["@PostMapping(\"courses/{courseId}/unenroll\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourses","httpMethodAnnotation":"GetMapping","URI":"\"courses\"","className":"CourseResource","line":474,"otherAnnotations":["@GetMapping(\"courses\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForImport","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-import\"","className":"CourseResource","line":496,"otherAnnotations":["@GetMapping(\"courses/for-import\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesWithQuizExercises","httpMethodAnnotation":"GetMapping","URI":"\"courses/courses-with-quiz\"","className":"CourseResource","line":511,"otherAnnotations":["@GetMapping(\"courses/courses-with-quiz\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesWithUserStats","httpMethodAnnotation":"GetMapping","URI":"\"courses/with-user-stats\"","className":"CourseResource","line":530,"otherAnnotations":["@GetMapping(\"courses/with-user-stats\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForManagementOverview","httpMethodAnnotation":"GetMapping","URI":"\"courses/course-management-overview\"","className":"CourseResource","line":551,"otherAnnotations":["@GetMapping(\"courses/course-management-overview\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseForEnrollment","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/for-enrollment\"","className":"CourseResource","line":563,"otherAnnotations":["@GetMapping(\"courses/{courseId}/for-enrollment\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForEnrollment","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-enrollment\"","className":"CourseResource","line":581,"otherAnnotations":["@GetMapping(\"courses/for-enrollment\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseForDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/for-dashboard\"","className":"CourseResource","line":598,"otherAnnotations":["@GetMapping(\"courses/{courseId}/for-dashboard\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForDropdown","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-dropdown\"","className":"CourseResource","line":639,"otherAnnotations":["@GetMapping(\"courses/for-dropdown\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-dashboard\"","className":"CourseResource","line":662,"otherAnnotations":["@GetMapping(\"courses/for-dashboard\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCoursesForNotifications","httpMethodAnnotation":"GetMapping","URI":"\"courses/for-notifications\"","className":"CourseResource","line":712,"otherAnnotations":["@GetMapping(\"courses/for-notifications\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/for-assessment-dashboard\"","className":"CourseResource","line":726,"otherAnnotations":["@GetMapping(\"courses/{courseId}/for-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getStatsForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/stats-for-assessment-dashboard\"","className":"CourseResource","line":751,"otherAnnotations":["@GetMapping(\"courses/{courseId}/stats-for-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}\"","className":"CourseResource","line":766,"otherAnnotations":["@GetMapping(\"courses/{courseId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseWithExercises","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/with-exercises\"","className":"CourseResource","line":798,"otherAnnotations":["@GetMapping(\"courses/{courseId}/with-exercises\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseWithOrganizations","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/with-organizations\"","className":"CourseResource","line":813,"otherAnnotations":["@GetMapping(\"courses/{courseId}/with-organizations\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getLockedSubmissionsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/lockedSubmissions\"","className":"CourseResource","line":828,"otherAnnotations":["@GetMapping(\"courses/{courseId}/lockedSubmissions\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExercisesForCourseOverview","httpMethodAnnotation":"GetMapping","URI":"\"courses/exercises-for-management-overview\"","className":"CourseResource","line":852,"otherAnnotations":["@GetMapping(\"courses/exercises-for-management-overview\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseStatsForCourseOverview","httpMethodAnnotation":"GetMapping","URI":"\"courses/stats-for-management-overview\"","className":"CourseResource","line":873,"otherAnnotations":["@GetMapping(\"courses/stats-for-management-overview\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"archiveCourse","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/archive\"","className":"CourseResource","line":903,"otherAnnotations":["@PutMapping(\"courses/{courseId}/archive\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.Exports)"]},{"requestMapping":"\"api/\"","endpoint":"downloadCourseArchive","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/download-archive\"","className":"CourseResource","line":934,"otherAnnotations":["@EnforceAtLeastInstructor","@GetMapping(\"courses/{courseId}/download-archive\")"]},{"requestMapping":"\"api/\"","endpoint":"cleanup","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/cleanup\"","className":"CourseResource","line":963,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/cleanup\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getCategoriesInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/categories\"","className":"CourseResource","line":983,"otherAnnotations":["@GetMapping(\"courses/{courseId}/categories\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getStudentsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/students\"","className":"CourseResource","line":998,"otherAnnotations":["@GetMapping(\"courses/{courseId}/students\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"searchStudentsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/students/search\"","className":"CourseResource","line":1013,"otherAnnotations":["@GetMapping(\"courses/{courseId}/students/search\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"searchUsersInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/users/search\"","className":"CourseResource","line":1036,"otherAnnotations":["@GetMapping(\"courses/{courseId}/users/search\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getTutorsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/tutors\"","className":"CourseResource","line":1082,"otherAnnotations":["@GetMapping(\"courses/{courseId}/tutors\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getEditorsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/editors\"","className":"CourseResource","line":1096,"otherAnnotations":["@GetMapping(\"courses/{courseId}/editors\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getInstructorsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/instructors\"","className":"CourseResource","line":1110,"otherAnnotations":["@GetMapping(\"courses/{courseId}/instructors\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"searchOtherUsersInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/search-other-users\"","className":"CourseResource","line":1125,"otherAnnotations":["@GetMapping(\"courses/{courseId}/search-other-users\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"searchMembersOfCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/members/search\"","className":"CourseResource","line":1146,"otherAnnotations":["@GetMapping(\"courses/{courseId}/members/search\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getCourseTitle","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/title\"","className":"CourseResource","line":1167,"otherAnnotations":["@GetMapping(\"courses/{courseId}/title\")","@EnforceAtLeastStudent","@ResponseBody"]},{"requestMapping":"\"api/\"","endpoint":"addStudentToCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1182,"otherAnnotations":["@PostMapping(\"courses/{courseId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"addTutorToCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/tutors/{tutorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1197,"otherAnnotations":["@PostMapping(\"courses/{courseId}/tutors/{tutorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"addEditorToCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/editors/{editorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1212,"otherAnnotations":["@PostMapping(\"courses/{courseId}/editors/{editorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"addInstructorToCourse","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/instructors/{instructorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1228,"otherAnnotations":["@PostMapping(\"courses/{courseId}/instructors/{instructorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeStudentFromCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1272,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeTutorFromCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/tutors/{tutorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1287,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/tutors/{tutorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeEditorFromCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/editors/{editorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1302,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/editors/{editorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeInstructorFromCourse","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/instructors/{instructorLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"CourseResource","line":1318,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/instructors/{instructorLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getCourseDTOForDetailView","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/management-detail\"","className":"CourseResource","line":1354,"otherAnnotations":["@GetMapping(\"courses/{courseId}/management-detail\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getActiveStudentsForCourseDetailView","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/statistics\"","className":"CourseResource","line":1372,"otherAnnotations":["@GetMapping(\"courses/{courseId}/statistics\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getActiveStudentsForCourseLiveTime","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/statistics-lifetime-overview\"","className":"CourseResource","line":1392,"otherAnnotations":["@GetMapping(\"courses/{courseId}/statistics-lifetime-overview\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"addUsersToCourseGroup","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/{courseGroup}\"","className":"CourseResource","line":1419,"otherAnnotations":["@PostMapping(\"courses/{courseId}/{courseGroup}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getNumberOfAllowedComplaintsInCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/allowed-complaints\"","className":"CourseResource","line":1438,"otherAnnotations":["@GetMapping(\"courses/{courseId}/allowed-complaints\")","@EnforceAtLeastStudent"]}]},{"filePath":"ParticipationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"startParticipation","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/participations\"","className":"ParticipationResource","line":209,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/participations\")","@EnforceAtLeastStudentInExercise"]},{"requestMapping":"\"api/\"","endpoint":"startPracticeParticipation","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/participations/practice\"","className":"ParticipationResource","line":266,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/participations/practice\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"resumeParticipation","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/resume-programming-participation/{participationId}\"","className":"ParticipationResource","line":309,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/resume-programming-participation/{participationId}\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"requestFeedback","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/request-feedback\"","className":"ParticipationResource","line":352,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/request-feedback\")","@EnforceAtLeastStudent","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"updateParticipation","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/participations\"","className":"ParticipationResource","line":430,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/participations\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateParticipationDueDates","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/participations/update-individual-due-date\"","className":"ParticipationResource","line":510,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/participations/update-individual-due-date\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllParticipationsForExercise","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/participations\"","className":"ParticipationResource","line":571,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/participations\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getAllParticipationsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/participations\"","className":"ParticipationResource","line":613,"otherAnnotations":["@GetMapping(\"courses/{courseId}/participations\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationWithLatestResult","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/withLatestResult\"","className":"ParticipationResource","line":674,"otherAnnotations":["@GetMapping(\"participations/{participationId}/withLatestResult\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationForCurrentUser","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}\"","className":"ParticipationResource","line":696,"otherAnnotations":["@GetMapping(\"participations/{participationId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationBuildArtifact","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/buildArtifact\"","className":"ParticipationResource","line":712,"otherAnnotations":["@GetMapping(\"participations/{participationId}/buildArtifact\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getParticipationForCurrentUser","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/participation\"","className":"ParticipationResource","line":731,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/participation\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteParticipation","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}\"","className":"ParticipationResource","line":819,"otherAnnotations":["@DeleteMapping(\"participations/{participationId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteParticipationForGuidedTour","httpMethodAnnotation":"DeleteMapping","URI":"\"guided-tour/participations/{participationId}\"","className":"ParticipationResource","line":842,"otherAnnotations":["@DeleteMapping(\"guided-tour/participations/{participationId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"cleanupBuildPlan","httpMethodAnnotation":"PutMapping","URI":"\"participations/{participationId}/cleanupBuildPlan\"","className":"ParticipationResource","line":894,"otherAnnotations":["@PutMapping(\"participations/{participationId}/cleanupBuildPlan\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.ProgrammingExercises)"]},{"requestMapping":"\"api/\"","endpoint":"getSubmissionsOfParticipation","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/submissions\"","className":"ParticipationResource","line":937,"otherAnnotations":["@GetMapping(\"participations/{participationId}/submissions\")","@EnforceAtLeastInstructor"]}]},{"filePath":"OrganizationResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllOrganizationsByCourse","httpMethodAnnotation":"GetMapping","URI":"\"organizations/courses/{courseId}\"","className":"OrganizationResource","line":43,"otherAnnotations":["@GetMapping(\"organizations/courses/{courseId}\")","@EnforceAtLeastTutor"]}]},{"filePath":"ExerciseScoresChartResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getCourseExerciseScores","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/charts/exercise-scores\"","className":"ExerciseScoresChartResource","line":71,"otherAnnotations":["@GetMapping(\"courses/{courseId}/charts/exercise-scores\")","@EnforceAtLeastStudent"]}]},{"filePath":"TextAssessmentEventResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"addAssessmentEvent","httpMethodAnnotation":"PostMapping","URI":"\"event-insights/text-assessment/events\"","className":"TextAssessmentEventResource","line":83,"otherAnnotations":["@PostMapping(\"event-insights/text-assessment/events\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getNumberOfTutorsInvolved","httpMethodAnnotation":"GetMapping","URI":"\"event-insights/text-assessment/courses/{courseId}/text-exercises/{exerciseId}/tutors-involved\"","className":"TextAssessmentEventResource","line":105,"otherAnnotations":["@GetMapping(\"event-insights/text-assessment/courses/{courseId}/text-exercises/{exerciseId}/tutors-involved\")","@EnforceAtLeastInstructor"]}]},{"filePath":"TutorEffortResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"calculateTutorEfforts","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exercises/{exerciseId}/tutor-effort\"","className":"TutorEffortResource","line":64,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exercises/{exerciseId}/tutor-effort\")","@EnforceAtLeastInstructor"]}]},{"filePath":"NotificationSettingsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getNotificationSettingsForCurrentUser","httpMethodAnnotation":"GetMapping","URI":"\"notification-settings\"","className":"NotificationSettingsResource","line":67,"otherAnnotations":["@GetMapping(\"notification-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"saveNotificationSettingsForCurrentUser","httpMethodAnnotation":"PutMapping","URI":"\"notification-settings\"","className":"NotificationSettingsResource","line":88,"otherAnnotations":["@PutMapping(\"notification-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getMutedConversations","httpMethodAnnotation":"GetMapping","URI":"\"muted-conversations\"","className":"NotificationSettingsResource","line":110,"otherAnnotations":["@GetMapping(\"muted-conversations\")","@EnforceAtLeastStudent"]}]},{"filePath":"ExampleSubmissionResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createExampleSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/example-submissions\"","className":"ExampleSubmissionResource","line":88,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/example-submissions\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateExampleSubmission","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/example-submissions\"","className":"ExampleSubmissionResource","line":107,"otherAnnotations":["@PutMapping(\"exercises/{exerciseId}/example-submissions\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"prepareExampleAssessment","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/prepare-assessment\"","className":"ExampleSubmissionResource","line":126,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/prepare-assessment\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getExampleSubmission","httpMethodAnnotation":"GetMapping","URI":"\"example-submissions/{exampleSubmissionId}\"","className":"ExampleSubmissionResource","line":166,"otherAnnotations":["@GetMapping(\"example-submissions/{exampleSubmissionId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteExampleSubmission","httpMethodAnnotation":"DeleteMapping","URI":"\"example-submissions/{exampleSubmissionId}\"","className":"ExampleSubmissionResource","line":189,"otherAnnotations":["@DeleteMapping(\"example-submissions/{exampleSubmissionId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importExampleSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/example-submissions/import/{sourceSubmissionId}\"","className":"ExampleSubmissionResource","line":207,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/example-submissions/import/{sourceSubmissionId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"FileUploadExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createFileUploadExercise","httpMethodAnnotation":"PostMapping","URI":"\"file-upload-exercises\"","className":"FileUploadExerciseResource","line":143,"otherAnnotations":["@PostMapping(\"file-upload-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importFileUploadExercise","httpMethodAnnotation":"PostMapping","URI":"\"file-upload-exercises/import/{sourceId}\"","className":"FileUploadExerciseResource","line":181,"otherAnnotations":["@PostMapping(\"file-upload-exercises/import/{sourceId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"file-upload-exercises\"","className":"FileUploadExerciseResource","line":242,"otherAnnotations":["@GetMapping(\"file-upload-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateFileUploadExercise","httpMethodAnnotation":"PutMapping","URI":"\"file-upload-exercises/{exerciseId}\"","className":"FileUploadExerciseResource","line":259,"otherAnnotations":["@PutMapping(\"file-upload-exercises/{exerciseId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getFileUploadExercisesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/file-upload-exercises\"","className":"FileUploadExerciseResource","line":301,"otherAnnotations":["@GetMapping(value = \"courses/{courseId}/file-upload-exercises\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getFileUploadExercise","httpMethodAnnotation":"GetMapping","URI":"\"file-upload-exercises/{exerciseId}\"","className":"FileUploadExerciseResource","line":322,"otherAnnotations":["@GetMapping(\"file-upload-exercises/{exerciseId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteFileUploadExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"file-upload-exercises/{exerciseId}\"","className":"FileUploadExerciseResource","line":356,"otherAnnotations":["@DeleteMapping(\"file-upload-exercises/{exerciseId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"exportSubmissions","httpMethodAnnotation":"PostMapping","URI":"\"file-upload-exercises/{exerciseId}/export-submissions\"","className":"FileUploadExerciseResource","line":376,"otherAnnotations":["@PostMapping(\"file-upload-exercises/{exerciseId}/export-submissions\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.Exports)"]},{"requestMapping":"\"api/\"","endpoint":"reEvaluateAndUpdateFileUploadExercise","httpMethodAnnotation":"PutMapping","URI":"\"file-upload-exercises/{exerciseId}/re-evaluate\"","className":"FileUploadExerciseResource","line":403,"otherAnnotations":["@PutMapping(\"file-upload-exercises/{exerciseId}/re-evaluate\")","@EnforceAtLeastEditor"]}]},{"filePath":"ExamLockResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"unlockAllRepositories","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/unlock-all-repositories\"","className":"ExamLockResource","line":42,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/unlock-all-repositories\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"lockAllRepositories","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/lock-all-repositories\"","className":"ExamLockResource","line":61,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/lock-all-repositories\")","@EnforceAtLeastInstructor"]}]},{"filePath":"ApollonDiagramResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createApollonDiagram","httpMethodAnnotation":"PostMapping","URI":"\"course/{courseId}/apollon-diagrams\"","className":"ApollonDiagramResource","line":67,"otherAnnotations":["@PostMapping(\"course/{courseId}/apollon-diagrams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateApollonDiagram","httpMethodAnnotation":"PutMapping","URI":"\"course/{courseId}/apollon-diagrams\"","className":"ApollonDiagramResource","line":96,"otherAnnotations":["@PutMapping(\"course/{courseId}/apollon-diagrams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getDiagramTitle","httpMethodAnnotation":"GetMapping","URI":"\"apollon-diagrams/{diagramId}/title\"","className":"ApollonDiagramResource","line":121,"otherAnnotations":["@GetMapping(\"apollon-diagrams/{diagramId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getDiagramsByCourse","httpMethodAnnotation":"GetMapping","URI":"\"course/{courseId}/apollon-diagrams\"","className":"ApollonDiagramResource","line":134,"otherAnnotations":["@GetMapping(\"course/{courseId}/apollon-diagrams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getApollonDiagram","httpMethodAnnotation":"GetMapping","URI":"\"course/{courseId}/apollon-diagrams/{apollonDiagramId}\"","className":"ApollonDiagramResource","line":152,"otherAnnotations":["@GetMapping(\"course/{courseId}/apollon-diagrams/{apollonDiagramId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteApollonDiagram","httpMethodAnnotation":"DeleteMapping","URI":"\"course/{courseId}/apollon-diagrams/{apollonDiagramId}\"","className":"ApollonDiagramResource","line":171,"otherAnnotations":["@DeleteMapping(\"course/{courseId}/apollon-diagrams/{apollonDiagramId}\")","@EnforceAtLeastEditor"]}]},{"filePath":"TextAssessmentResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"saveTextAssessment","httpMethodAnnotation":"PutMapping","URI":"\"participations/{participationId}/results/{resultId}/text-assessment\"","className":"TextAssessmentResource","line":133,"otherAnnotations":["@PutMapping(\"participations/{participationId}/results/{resultId}/text-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"saveTextExampleAssessment","httpMethodAnnotation":"PutMapping","URI":"\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/example-text-assessment\"","className":"TextAssessmentResource","line":167,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@ApiResponses({ @ApiResponse(code = 403, message = ErrorConstants.REQ_403_REASON), @ApiResponse(code = 404, message = ErrorConstants.REQ_404_REASON) })","@PutMapping(\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/example-text-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteTextExampleAssessment","httpMethodAnnotation":"DeleteMapping","URI":"\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/example-text-assessment/feedback\"","className":"TextAssessmentResource","line":201,"otherAnnotations":["@ResponseStatus(HttpStatus.NO_CONTENT)","@DeleteMapping(\"exercises/{exerciseId}/example-submissions/{exampleSubmissionId}/example-text-assessment/feedback\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"submitTextAssessment","httpMethodAnnotation":"PostMapping","URI":"\"participations/{participationId}/results/{resultId}/submit-text-assessment\"","className":"TextAssessmentResource","line":244,"otherAnnotations":["@PostMapping(\"participations/{participationId}/results/{resultId}/submit-text-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateTextAssessmentAfterComplaint","httpMethodAnnotation":"PutMapping","URI":"\"participations/{participationId}/submissions/{submissionId}/text-assessment-after-complaint\"","className":"TextAssessmentResource","line":282,"otherAnnotations":["@ResponseStatus(HttpStatus.OK)","@PutMapping(\"participations/{participationId}/submissions/{submissionId}/text-assessment-after-complaint\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"cancelAssessment","httpMethodAnnotation":"PostMapping","URI":"\"participations/{participationId}/submissions/{submissionId}/cancel-assessment\"","className":"TextAssessmentResource","line":316,"otherAnnotations":["@PostMapping(\"participations/{participationId}/submissions/{submissionId}/cancel-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteAssessment","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}/text-submissions/{submissionId}/results/{resultId}\"","className":"TextAssessmentResource","line":336,"otherAnnotations":["@Override","@DeleteMapping(\"participations/{participationId}/text-submissions/{submissionId}/results/{resultId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"retrieveParticipationForSubmission","httpMethodAnnotation":"GetMapping","URI":"\"text-submissions/{submissionId}/for-assessment\"","className":"TextAssessmentResource","line":356,"otherAnnotations":["@GetMapping(\"text-submissions/{submissionId}/for-assessment\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExampleResultForTutor","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/submissions/{submissionId}/example-result\"","className":"TextAssessmentResource","line":432,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/submissions/{submissionId}/example-result\")","@EnforceAtLeastTutor"]}]},{"filePath":"ExerciseGroupResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createExerciseGroup","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/exerciseGroups\"","className":"ExerciseGroupResource","line":95,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/exerciseGroups\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateExerciseGroup","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/exerciseGroups\"","className":"ExerciseGroupResource","line":132,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/exerciseGroups\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importExerciseGroup","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/import-exercise-group\"","className":"ExerciseGroupResource","line":159,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/import-exercise-group\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseGroup","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}\"","className":"ExerciseGroupResource","line":180,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseGroupsForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/exerciseGroups\"","className":"ExerciseGroupResource","line":198,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/exerciseGroups\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"deleteExerciseGroup","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}\"","className":"ExerciseGroupResource","line":221,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/exerciseGroups/{exerciseGroupId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"LectureResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createLecture","httpMethodAnnotation":"PostMapping","URI":"\"lectures\"","className":"LectureResource","line":109,"otherAnnotations":["@PostMapping(\"lectures\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateLecture","httpMethodAnnotation":"PutMapping","URI":"\"lectures\"","className":"LectureResource","line":130,"otherAnnotations":["@PutMapping(\"lectures\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAllLecturesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"lectures\"","className":"LectureResource","line":157,"otherAnnotations":["@GetMapping(\"lectures\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getLecturesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/lectures\"","className":"LectureResource","line":171,"otherAnnotations":["@GetMapping(\"courses/{courseId}/lectures\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getLecturesWithSlidesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/lectures-with-slides\"","className":"LectureResource","line":195,"otherAnnotations":["@GetMapping(\"courses/{courseId}/lectures-with-slides\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLecture","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}\"","className":"LectureResource","line":216,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"importLecture","httpMethodAnnotation":"PostMapping","URI":"\"lectures/import/{sourceLectureId}\"","className":"LectureResource","line":242,"otherAnnotations":["@PostMapping(\"lectures/import/{sourceLectureId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"ingestLectures","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/ingest\"","className":"LectureResource","line":271,"otherAnnotations":["@PostMapping(\"courses/{courseId}/ingest\")"]},{"requestMapping":"\"api/\"","endpoint":"getLectureWithDetails","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/details\"","className":"LectureResource","line":295,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/details\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLectureWithDetailsAndSlides","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/details-with-slides\"","className":"LectureResource","line":317,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/details-with-slides\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getLectureTitle","httpMethodAnnotation":"GetMapping","URI":"\"lectures/{lectureId}/title\"","className":"LectureResource","line":340,"otherAnnotations":["@GetMapping(\"lectures/{lectureId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteLecture","httpMethodAnnotation":"DeleteMapping","URI":"\"lectures/{lectureId}\"","className":"LectureResource","line":395,"otherAnnotations":["@DeleteMapping(\"lectures/{lectureId}\")","@EnforceAtLeastInstructor"]}]},{"filePath":"StaticCodeAnalysisResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getStaticCodeAnalysisCategories","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/static-code-analysis-categories\"","className":"StaticCodeAnalysisResource","line":69,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/static-code-analysis-categories\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"updateStaticCodeAnalysisCategories","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/static-code-analysis-categories\"","className":"StaticCodeAnalysisResource","line":89,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/static-code-analysis-categories\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"resetStaticCodeAnalysisCategories","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}/static-code-analysis-categories/reset\"","className":"StaticCodeAnalysisResource","line":111,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}/static-code-analysis-categories/reset\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importStaticCodeAnalysisCategoriesFromExercise","httpMethodAnnotation":"PatchMapping","URI":"\"programming-exercises/{exerciseId}\" + \"/static-code-analysis-categories/import\"","className":"StaticCodeAnalysisResource","line":132,"otherAnnotations":["@PatchMapping(\"programming-exercises/{exerciseId}\" + \"/static-code-analysis-categories/import\")","@EnforceAtLeastEditor"]}]},{"filePath":"LongFeedbackTextResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getLongFeedback","httpMethodAnnotation":"GetMapping","URI":"\"results/{resultId}/feedbacks/{feedbackId}/long-feedback\"","className":"LongFeedbackTextResource","line":46,"otherAnnotations":["@GetMapping(\"results/{resultId}/feedbacks/{feedbackId}/long-feedback\")","@EnforceAtLeastStudent"]}]},{"filePath":"GradeStepResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getAllGradeStepsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/grading-scale/grade-steps\"","className":"GradeStepResource","line":84,"otherAnnotations":["@GetMapping(\"courses/{courseId}/grading-scale/grade-steps\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getAllGradeStepsForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale/grade-steps\"","className":"GradeStepResource","line":105,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/grading-scale/grade-steps\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getGradeStepsByIdForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/grading-scale/grade-steps/{gradeStepId}\"","className":"GradeStepResource","line":138,"otherAnnotations":["@GetMapping(\"courses/{courseId}/grading-scale/grade-steps/{gradeStepId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGradeStepsByIdForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale/grade-steps/{gradeStepId}\"","className":"GradeStepResource","line":157,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/grading-scale/grade-steps/{gradeStepId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getGradeStepByPercentageForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/grading-scale/match-grade-step\"","className":"GradeStepResource","line":175,"otherAnnotations":["@GetMapping(\"courses/{courseId}/grading-scale/match-grade-step\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getGradeStepByPercentageForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/grading-scale/match-grade-step\"","className":"GradeStepResource","line":212,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/grading-scale/match-grade-step\")","@EnforceAtLeastStudent"]}]},{"filePath":"QuizExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createQuizExercise","httpMethodAnnotation":"PostMapping","URI":"\"quiz-exercises\"","className":"QuizExerciseResource","line":215,"otherAnnotations":["@PostMapping(value = \"quiz-exercises\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateQuizExercise","httpMethodAnnotation":"PutMapping","URI":"\"quiz-exercises/{exerciseId}\"","className":"QuizExerciseResource","line":260,"otherAnnotations":["@PutMapping(value = \"quiz-exercises/{exerciseId}\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditorInExercise"]},{"requestMapping":"\"api/\"","endpoint":"getQuizExercisesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/quiz-exercises\"","className":"QuizExerciseResource","line":320,"otherAnnotations":["@GetMapping(\"courses/{courseId}/quiz-exercises\")","@EnforceAtLeastTutorInCourse"]},{"requestMapping":"\"api/\"","endpoint":"getQuizExercisesForExam","httpMethodAnnotation":"GetMapping","URI":"\"exams/{examId}/quiz-exercises\"","className":"QuizExerciseResource","line":344,"otherAnnotations":["@GetMapping(\"exams/{examId}/quiz-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getQuizExercise","httpMethodAnnotation":"GetMapping","URI":"\"quiz-exercises/{quizExerciseId}\"","className":"QuizExerciseResource","line":368,"otherAnnotations":["@GetMapping(\"quiz-exercises/{quizExerciseId}\")","@EnforceAtLeastTutorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"recalculateStatistics","httpMethodAnnotation":"GetMapping","URI":"\"quiz-exercises/{quizExerciseId}/recalculate-statistics\"","className":"QuizExerciseResource","line":395,"otherAnnotations":["@GetMapping(\"quiz-exercises/{quizExerciseId}/recalculate-statistics\")","@EnforceAtLeastTutorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"getQuizExerciseForStudent","httpMethodAnnotation":"GetMapping","URI":"\"quiz-exercises/{quizExerciseId}/for-student\"","className":"QuizExerciseResource","line":411,"otherAnnotations":["@GetMapping(\"quiz-exercises/{quizExerciseId}/for-student\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"joinBatch","httpMethodAnnotation":"PostMapping","URI":"\"quiz-exercises/{quizExerciseId}/join\"","className":"QuizExerciseResource","line":437,"otherAnnotations":["@PostMapping(\"quiz-exercises/{quizExerciseId}/join\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"addBatch","httpMethodAnnotation":"PutMapping","URI":"\"quiz-exercises/{quizExerciseId}/add-batch\"","className":"QuizExerciseResource","line":465,"otherAnnotations":["@PutMapping(\"quiz-exercises/{quizExerciseId}/add-batch\")","@EnforceAtLeastTutorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"startBatch","httpMethodAnnotation":"PutMapping","URI":"\"quiz-exercises/{quizBatchId}/start-batch\"","className":"QuizExerciseResource","line":491,"otherAnnotations":["@PutMapping(\"quiz-exercises/{quizBatchId}/start-batch\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"performActionForQuizExercise","httpMethodAnnotation":"PutMapping","URI":"\"quiz-exercises/{quizExerciseId}/{action}\"","className":"QuizExerciseResource","line":528,"otherAnnotations":["@PutMapping(\"quiz-exercises/{quizExerciseId}/{action}\")","@EnforceAtLeastEditorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"evaluateQuizExercise","httpMethodAnnotation":"PostMapping","URI":"\"quiz-exercises/{quizExerciseId}/evaluate\"","className":"QuizExerciseResource","line":638,"otherAnnotations":["@PostMapping(\"quiz-exercises/{quizExerciseId}/evaluate\")","@EnforceAtLeastInstructorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"deleteQuizExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"quiz-exercises/{quizExerciseId}\"","className":"QuizExerciseResource","line":658,"otherAnnotations":["@DeleteMapping(\"quiz-exercises/{quizExerciseId}\")","@EnforceAtLeastInstructorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"reEvaluateQuizExercise","httpMethodAnnotation":"PutMapping","URI":"\"quiz-exercises/{quizExerciseId}/re-evaluate\"","className":"QuizExerciseResource","line":706,"otherAnnotations":["@PutMapping(value = \"quiz-exercises/{quizExerciseId}/re-evaluate\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastInstructorInExercise(resourceIdFieldName = \"quizExerciseId\")"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"quiz-exercises\"","className":"QuizExerciseResource","line":745,"otherAnnotations":["@GetMapping(\"quiz-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"importExercise","httpMethodAnnotation":"PostMapping","URI":"\"quiz-exercises/import/{sourceExerciseId}\"","className":"QuizExerciseResource","line":766,"otherAnnotations":["@PostMapping(value = \"quiz-exercises/import/{sourceExerciseId}\", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)","@EnforceAtLeastEditor"]}]},{"filePath":"ModelingExerciseResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createModelingExercise","httpMethodAnnotation":"PostMapping","URI":"\"modeling-exercises\"","className":"ModelingExerciseResource","line":160,"otherAnnotations":["@PostMapping(\"modeling-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesOnPage","httpMethodAnnotation":"GetMapping","URI":"\"modeling-exercises\"","className":"ModelingExerciseResource","line":199,"otherAnnotations":["@GetMapping(\"modeling-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"updateModelingExercise","httpMethodAnnotation":"PutMapping","URI":"\"modeling-exercises\"","className":"ModelingExerciseResource","line":216,"otherAnnotations":["@PutMapping(\"modeling-exercises\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getModelingExercisesForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/modeling-exercises\"","className":"ModelingExerciseResource","line":266,"otherAnnotations":["@GetMapping(\"courses/{courseId}/modeling-exercises\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getModelingExercise","httpMethodAnnotation":"GetMapping","URI":"\"modeling-exercises/{exerciseId}\"","className":"ModelingExerciseResource","line":297,"otherAnnotations":["@GetMapping(\"modeling-exercises/{exerciseId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteModelingExercise","httpMethodAnnotation":"DeleteMapping","URI":"\"modeling-exercises/{exerciseId}\"","className":"ModelingExerciseResource","line":324,"otherAnnotations":["@DeleteMapping(\"modeling-exercises/{exerciseId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"importExercise","httpMethodAnnotation":"PostMapping","URI":"\"modeling-exercises/import/{sourceExerciseId}\"","className":"ModelingExerciseResource","line":353,"otherAnnotations":["@PostMapping(\"modeling-exercises/import/{sourceExerciseId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"exportSubmissions","httpMethodAnnotation":"PostMapping","URI":"\"modeling-exercises/{exerciseId}/export-submissions\"","className":"ModelingExerciseResource","line":381,"otherAnnotations":["@PostMapping(\"modeling-exercises/{exerciseId}/export-submissions\")","@EnforceAtLeastTutor","@FeatureToggle(Feature.Exports)"]},{"requestMapping":"\"api/\"","endpoint":"getPlagiarismResult","httpMethodAnnotation":"GetMapping","URI":"\"modeling-exercises/{exerciseId}/plagiarism-result\"","className":"ModelingExerciseResource","line":407,"otherAnnotations":["@GetMapping(\"modeling-exercises/{exerciseId}/plagiarism-result\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"checkPlagiarism","httpMethodAnnotation":"GetMapping","URI":"\"modeling-exercises/{exerciseId}/check-plagiarism\"","className":"ModelingExerciseResource","line":430,"otherAnnotations":["@GetMapping(\"modeling-exercises/{exerciseId}/check-plagiarism\")","@FeatureToggle(Feature.PlagiarismChecks)","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"reEvaluateAndUpdateModelingExercise","httpMethodAnnotation":"PutMapping","URI":"\"modeling-exercises/{exerciseId}/re-evaluate\"","className":"ModelingExerciseResource","line":458,"otherAnnotations":["@PutMapping(\"modeling-exercises/{exerciseId}/re-evaluate\")","@EnforceAtLeastEditor"]}]},{"filePath":"StudentExamResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getStudentExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}\"","className":"StudentExamResource","line":175,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getStudentExamsForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams\"","className":"StudentExamResource","line":212,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateWorkingTime","httpMethodAnnotation":"PatchMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/working-time\"","className":"StudentExamResource","line":233,"otherAnnotations":["@PatchMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/working-time\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"attendanceCheck","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}/attendance-check\"","className":"StudentExamResource","line":274,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}/attendance-check\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"submitStudentExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/submit\"","className":"StudentExamResource","line":309,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/student-exams/submit\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getStudentExamForConduction","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/conduction\"","className":"StudentExamResource","line":361,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/conduction\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getTestRunForConduction","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/test-run/{testRunId}/conduction\"","className":"StudentExamResource","line":424,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/test-run/{testRunId}/conduction\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getStudentExamsForCoursePerUser","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/test-exams-per-user\"","className":"StudentExamResource","line":460,"otherAnnotations":["@GetMapping(\"courses/{courseId}/test-exams-per-user\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getStudentExamForSummary","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/summary\"","className":"StudentExamResource","line":481,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/summary\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getStudentExamGradesForSummary","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/grade-summary\"","className":"StudentExamResource","line":528,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/grade-summary\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getExamLiveEvents","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/live-events\"","className":"StudentExamResource","line":558,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/live-events\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"findAllTestRunsForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/test-runs\"","className":"StudentExamResource","line":588,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/test-runs\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"createTestRun","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/test-run\"","className":"StudentExamResource","line":607,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/test-run\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"assessUnsubmittedStudentExamsAndEmptySubmissions","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/assess-unsubmitted-and-empty-student-exams\"","className":"StudentExamResource","line":633,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/student-exams/assess-unsubmitted-and-empty-student-exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteTestRun","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/test-run/{testRunId}\"","className":"StudentExamResource","line":668,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/test-run/{testRunId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"startExercises","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/start-exercises\"","className":"StudentExamResource","line":687,"otherAnnotations":["@PostMapping(value = \"courses/{courseId}/exams/{examId}/student-exams/start-exercises\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getExerciseStartStatus","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/start-exercises/status\"","className":"StudentExamResource","line":726,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/student-exams/start-exercises/status\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"submitStudentExam","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/toggle-to-submitted\"","className":"StudentExamResource","line":829,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/toggle-to-submitted\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"unsubmitStudentExam","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/toggle-to-unsubmitted\"","className":"StudentExamResource","line":866,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/student-exams/{studentExamId}/toggle-to-unsubmitted\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getLongestWorkingTimeForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/longest-working-time\"","className":"StudentExamResource","line":901,"otherAnnotations":["@EnforceAtLeastInstructor","@GetMapping(\"courses/{courseId}/exams/{examId}/longest-working-time\")"]}]},{"filePath":"PublicBuildPlanResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"getBuildPlan","httpMethodAnnotation":"GetMapping","URI":"\"programming-exercises/{exerciseId}/build-plan\"","className":"PublicBuildPlanResource","line":41,"otherAnnotations":["@GetMapping(\"programming-exercises/{exerciseId}/build-plan\")","@EnforceNothing"]}]},{"filePath":"PublicResultResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"processNewProgrammingExerciseResult","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/new-result\"","className":"PublicResultResource","line":83,"otherAnnotations":["@PostMapping(\"programming-exercises/new-result\")","@EnforceNothing"]}]},{"filePath":"PublicSystemNotificationResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"getActiveAndFutureSystemNotifications","httpMethodAnnotation":"GetMapping","URI":"\"system-notifications/active\"","className":"PublicSystemNotificationResource","line":41,"otherAnnotations":["@GetMapping(\"system-notifications/active\")","@EnforceNothing"]}]},{"filePath":"PublicPyrisStatusUpdateResource","classRequestMapping":"\"api/public/pyris/\"","endpoints":[{"requestMapping":"\"api/public/pyris/\"","endpoint":"setStatusOfJob","httpMethodAnnotation":"PostMapping","URI":"\"pipelines/tutor-chat/runs/{runId}/status\"","className":"PublicPyrisStatusUpdateResource","line":58,"otherAnnotations":["// TODO: Rename this to 'exercise-chat' with next breaking Pyris version\n@PostMapping(\"pipelines/tutor-chat/runs/{runId}/status\")","@EnforceNothing"]},{"requestMapping":"\"api/public/pyris/\"","endpoint":"setStatusOfCourseChatJob","httpMethodAnnotation":"PostMapping","URI":"\"pipelines/course-chat/runs/{runId}/status\"","className":"PublicPyrisStatusUpdateResource","line":86,"otherAnnotations":["@PostMapping(\"pipelines/course-chat/runs/{runId}/status\")","@EnforceNothing"]},{"requestMapping":"\"api/public/pyris/\"","endpoint":"setStatusOfIngestionJob","httpMethodAnnotation":"PostMapping","URI":"\"webhooks/ingestion/runs/{runId}/status\"","className":"PublicPyrisStatusUpdateResource","line":112,"otherAnnotations":["@PostMapping(\"webhooks/ingestion/runs/{runId}/status\")","@EnforceNothing"]}]},{"filePath":"PublicProgrammingSubmissionResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"processNewProgrammingSubmission","httpMethodAnnotation":"PostMapping","URI":"\"programming-submissions/{participationId}\"","className":"PublicProgrammingSubmissionResource","line":77,"otherAnnotations":["@PostMapping(\"programming-submissions/{participationId}\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"testCaseChanged","httpMethodAnnotation":"PostMapping","URI":"\"programming-exercises/test-cases-changed/{exerciseId}\"","className":"PublicProgrammingSubmissionResource","line":143,"otherAnnotations":["@PostMapping(\"programming-exercises/test-cases-changed/{exerciseId}\")","@EnforceNothing"]}]},{"filePath":"PublicLtiResource","classRequestMapping":"","endpoints":[{"requestMapping":"","endpoint":"lti13LaunchRedirect","httpMethodAnnotation":"PostMapping","URI":"LTI13_LOGIN_REDIRECT_PROXY_PATH","className":"PublicLtiResource","line":52,"otherAnnotations":["@PostMapping({ LTI13_LOGIN_REDIRECT_PROXY_PATH, LTI13_DEEPLINK_REDIRECT_PATH })","@EnforceNothing"]},{"requestMapping":"","endpoint":"lti13LaunchRedirect","httpMethodAnnotation":"PostMapping","URI":"LTI13_DEEPLINK_REDIRECT_PATH","className":"PublicLtiResource","line":52,"otherAnnotations":["@PostMapping({ LTI13_LOGIN_REDIRECT_PROXY_PATH, LTI13_DEEPLINK_REDIRECT_PATH })","@EnforceNothing"]}]},{"filePath":"PublicOAuth2JWKSResource","classRequestMapping":"","endpoints":[{"requestMapping":"","endpoint":"getJwkSet","httpMethodAnnotation":"GetMapping","URI":"\".well-known/jwks.json\"","className":"PublicOAuth2JWKSResource","line":40,"otherAnnotations":["@GetMapping(\".well-known/jwks.json\")","@EnforceNothing","@ManualConfig"]}]},{"filePath":"PublicImprintResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"getImprint","httpMethodAnnotation":"GetMapping","URI":"\"imprint\"","className":"PublicImprintResource","line":40,"otherAnnotations":["@GetMapping(\"imprint\")","@EnforceNothing"]}]},{"filePath":"PublicPrivacyStatementResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"getPrivacyStatement","httpMethodAnnotation":"GetMapping","URI":"\"privacy-statement\"","className":"PublicPrivacyStatementResource","line":40,"otherAnnotations":["@EnforceNothing","@GetMapping(\"privacy-statement\")"]}]},{"filePath":"PublicTimeResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"time","httpMethodAnnotation":"GetMapping","URI":"\"time\"","className":"PublicTimeResource","line":25,"otherAnnotations":["@GetMapping(\"time\")","@EnforceNothing"]}]},{"filePath":"PublicUserJwtResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"authorize","httpMethodAnnotation":"PostMapping","URI":"\"authenticate\"","className":"PublicUserJwtResource","line":70,"otherAnnotations":["@PostMapping(\"authenticate\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"authorizeSAML2","httpMethodAnnotation":"PostMapping","URI":"\"saml2\"","className":"PublicUserJwtResource","line":104,"otherAnnotations":["@PostMapping(\"saml2\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"logout","httpMethodAnnotation":"PostMapping","URI":"\"logout\"","className":"PublicUserJwtResource","line":143,"otherAnnotations":["@PostMapping(\"logout\")","@EnforceNothing"]}]},{"filePath":"PublicAccountResource","classRequestMapping":"\"api/public/\"","endpoints":[{"requestMapping":"\"api/public/\"","endpoint":"registerAccount","httpMethodAnnotation":"PostMapping","URI":"\"register\"","className":"PublicAccountResource","line":83,"otherAnnotations":["@PostMapping(\"register\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"activateAccount","httpMethodAnnotation":"GetMapping","URI":"\"activate\"","className":"PublicAccountResource","line":115,"otherAnnotations":["@GetMapping(\"activate\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"authenticatedLogin","httpMethodAnnotation":"GetMapping","URI":"\"authenticate\"","className":"PublicAccountResource","line":134,"otherAnnotations":["@GetMapping(\"authenticate\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"getAccount","httpMethodAnnotation":"GetMapping","URI":"\"account\"","className":"PublicAccountResource","line":147,"otherAnnotations":["@GetMapping(\"account\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"changeLanguageKey","httpMethodAnnotation":"PostMapping","URI":"\"account/change-language\"","className":"PublicAccountResource","line":180,"otherAnnotations":["@PostMapping(\"account/change-language\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"requestPasswordReset","httpMethodAnnotation":"PostMapping","URI":"\"account/reset-password/init\"","className":"PublicAccountResource","line":198,"otherAnnotations":["@PostMapping(\"account/reset-password/init\")","@EnforceNothing"]},{"requestMapping":"\"api/public/\"","endpoint":"finishPasswordReset","httpMethodAnnotation":"PostMapping","URI":"\"account/reset-password/finish\"","className":"PublicAccountResource","line":231,"otherAnnotations":["@PostMapping(\"account/reset-password/finish\")","@EnforceNothing"]}]},{"filePath":"DataExportResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"requestDataExport","httpMethodAnnotation":"PostMapping","URI":"\"data-exports\"","className":"DataExportResource","line":67,"otherAnnotations":["@PostMapping(\"data-exports\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"downloadDataExport","httpMethodAnnotation":"GetMapping","URI":"\"data-exports/{dataExportId}\"","className":"DataExportResource","line":108,"otherAnnotations":["@GetMapping(\"data-exports/{dataExportId}\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"canRequestExport","httpMethodAnnotation":"GetMapping","URI":"\"data-exports/can-request\"","className":"DataExportResource","line":155,"otherAnnotations":["@GetMapping(\"data-exports/can-request\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"canDownloadAnyExport","httpMethodAnnotation":"GetMapping","URI":"\"data-exports/can-download\"","className":"DataExportResource","line":167,"otherAnnotations":["@GetMapping(\"data-exports/can-download\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"canDownloadSpecificExport","httpMethodAnnotation":"GetMapping","URI":"\"data-exports/{dataExportId}/can-download\"","className":"DataExportResource","line":179,"otherAnnotations":["@GetMapping(\"data-exports/{dataExportId}/can-download\")","@EnforceAtLeastStudent"]}]},{"filePath":"ResultResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"getResultsForExerciseWithPointsPerCriterion","httpMethodAnnotation":"GetMapping","URI":"\"exercises/{exerciseId}/results-with-points-per-criterion\"","className":"ResultResource","line":115,"otherAnnotations":["@GetMapping(\"exercises/{exerciseId}/results-with-points-per-criterion\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getResult","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/results/{resultId}\"","className":"ResultResource","line":140,"otherAnnotations":["@GetMapping(\"participations/{participationId}/results/{resultId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getResultDetails","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/results/{resultId}/details\"","className":"ResultResource","line":158,"otherAnnotations":["@GetMapping(\"participations/{participationId}/results/{resultId}/details\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getBuildJobIdsForResultsOfParticipation","httpMethodAnnotation":"GetMapping","URI":"\"participations/{participationId}/results/build-job-ids\"","className":"ResultResource","line":181,"otherAnnotations":["@GetMapping(\"participations/{participationId}/results/build-job-ids\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"deleteResult","httpMethodAnnotation":"DeleteMapping","URI":"\"participations/{participationId}/results/{resultId}\"","className":"ResultResource","line":202,"otherAnnotations":["@DeleteMapping(\"participations/{participationId}/results/{resultId}\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"createResultForExternalSubmission","httpMethodAnnotation":"PostMapping","URI":"\"exercises/{exerciseId}/external-submission-results\"","className":"ResultResource","line":221,"otherAnnotations":["@PostMapping(\"exercises/{exerciseId}/external-submission-results\")","@EnforceAtLeastInstructor"]}]},{"filePath":"GuidedTourSettingsResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"updateGuidedTourSettings","httpMethodAnnotation":"PutMapping","URI":"\"guided-tour-settings\"","className":"GuidedTourSettingsResource","line":46,"otherAnnotations":["@PutMapping(\"guided-tour-settings\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"deleteGuidedTourSetting","httpMethodAnnotation":"DeleteMapping","URI":"\"guided-tour-settings/{settingsKey}\"","className":"GuidedTourSettingsResource","line":60,"otherAnnotations":["@DeleteMapping(\"guided-tour-settings/{settingsKey}\")","@EnforceAtLeastStudent"]}]},{"filePath":"MetricsResource","classRequestMapping":"\"api/metrics/\"","endpoints":[{"requestMapping":"\"api/metrics/\"","endpoint":"getCourseMetricsForUser","httpMethodAnnotation":"GetMapping","URI":"\"course/{courseId}/student\"","className":"MetricsResource","line":41,"otherAnnotations":["@GetMapping(\"course/{courseId}/student\")","@EnforceAtLeastStudentInCourse"]}]},{"filePath":"ExamResource","classRequestMapping":"\"api/\"","endpoints":[{"requestMapping":"\"api/\"","endpoint":"createExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams\"","className":"ExamResource","line":218,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateExam","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams\"","className":"ExamResource","line":248,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"updateExamWorkingTime","httpMethodAnnotation":"PatchMapping","URI":"\"courses/{courseId}/exams/{examId}/working-time\"","className":"ExamResource","line":313,"otherAnnotations":["@PatchMapping(\"courses/{courseId}/exams/{examId}/working-time\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"createExamAnnouncement","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/announcements\"","className":"ExamResource","line":348,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/announcements\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"importExamWithExercises","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exam-import\"","className":"ExamResource","line":373,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exam-import\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllActiveExams","httpMethodAnnotation":"GetMapping","URI":"\"exams/active\"","className":"ExamResource","line":514,"otherAnnotations":["@GetMapping(\"exams/active\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExamsOnPage","httpMethodAnnotation":"GetMapping","URI":"\"exams\"","className":"ExamResource","line":530,"otherAnnotations":["@GetMapping(\"exams\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getExamForImportWithExercises","httpMethodAnnotation":"GetMapping","URI":"\"exams/{examId}\"","className":"ExamResource","line":543,"otherAnnotations":["@GetMapping(\"exams/{examId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}\"","className":"ExamResource","line":563,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getExamTitle","httpMethodAnnotation":"GetMapping","URI":"\"exams/{examId}/title\"","className":"ExamResource","line":612,"otherAnnotations":["@GetMapping(\"exams/{examId}/title\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"getExamStatistics","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/statistics\"","className":"ExamResource","line":626,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/statistics\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExamScore","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/scores\"","className":"ExamResource","line":649,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/scores\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getExamForAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/exam-for-assessment-dashboard\"","className":"ExamResource","line":667,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/exam-for-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExamForTestRunAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/exam-for-test-run-assessment-dashboard\"","className":"ExamResource","line":704,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/exam-for-test-run-assessment-dashboard\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getStatsForExamAssessmentDashboard","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/stats-for-exam-assessment-dashboard\"","className":"ExamResource","line":730,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/stats-for-exam-assessment-dashboard\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExamsForCourse","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams\"","className":"ExamResource","line":747,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getExamsWithQuizExercisesForUser","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams-for-user\"","className":"ExamResource","line":765,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams-for-user\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"cleanup","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/cleanup\"","className":"ExamResource","line":788,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/cleanup\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"deleteExam","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}\"","className":"ExamResource","line":810,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"resetExam","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/reset\"","className":"ExamResource","line":834,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/reset\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"addStudentToExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"ExamResource","line":858,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"generateStudentExams","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/generate-student-exams\"","className":"ExamResource","line":890,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/generate-student-exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"generateMissingStudentExams","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/generate-missing-student-exams\"","className":"ExamResource","line":935,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/generate-missing-student-exams\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"evaluateQuizExercises","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/student-exams/evaluate-quiz-exercises\"","className":"ExamResource","line":966,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/student-exams/evaluate-quiz-exercises\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"addStudentsToExam","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/students\"","className":"ExamResource","line":999,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/students\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"registerCourseStudents","httpMethodAnnotation":"PostMapping","URI":"\"courses/{courseId}/exams/{examId}/register-course-students\"","className":"ExamResource","line":1017,"otherAnnotations":["@PostMapping(\"courses/{courseId}/exams/{examId}/register-course-students\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeStudentFromExam","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\"","className":"ExamResource","line":1044,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/students/{studentLogin:\" + Constants.LOGIN_REGEX + \"}\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"removeAllStudentsFromExam","httpMethodAnnotation":"DeleteMapping","URI":"\"courses/{courseId}/exams/{examId}/students\"","className":"ExamResource","line":1077,"otherAnnotations":["@DeleteMapping(\"courses/{courseId}/exams/{examId}/students\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getOwnStudentExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/own-student-exam\"","className":"ExamResource","line":1105,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/own-student-exam\")","@EnforceAtLeastStudent"]},{"requestMapping":"\"api/\"","endpoint":"updateOrderOfExerciseGroups","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/exercise-groups-order\"","className":"ExamResource","line":1123,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/exercise-groups-order\")","@EnforceAtLeastEditor"]},{"requestMapping":"\"api/\"","endpoint":"getLatestIndividualEndDateOfExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/latest-end-date\"","className":"ExamResource","line":1162,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/latest-end-date\")","@EnforceAtLeastTutor"]},{"requestMapping":"\"api/\"","endpoint":"getLockedSubmissionsForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/lockedSubmissions\"","className":"ExamResource","line":1180,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/lockedSubmissions\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"archiveExam","httpMethodAnnotation":"PutMapping","URI":"\"courses/{courseId}/exams/{examId}/archive\"","className":"ExamResource","line":1206,"otherAnnotations":["@PutMapping(\"courses/{courseId}/exams/{examId}/archive\")","@EnforceAtLeastInstructor","@FeatureToggle(Feature.Exports)"]},{"requestMapping":"\"api/\"","endpoint":"downloadExamArchive","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/download-archive\"","className":"ExamResource","line":1235,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/download-archive\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllExercisesWithPotentialPlagiarismForExam","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/exercises-with-potential-plagiarism\"","className":"ExamResource","line":1268,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/exercises-with-potential-plagiarism\")","@EnforceAtLeastInstructor"]},{"requestMapping":"\"api/\"","endpoint":"getAllSuspiciousExamSessions","httpMethodAnnotation":"GetMapping","URI":"\"courses/{courseId}/exams/{examId}/suspicious-sessions\"","className":"ExamResource","line":1302,"otherAnnotations":["@GetMapping(\"courses/{courseId}/exams/{examId}/suspicious-sessions\")","@EnforceAtLeastInstructor"]}]}]
\ No newline at end of file
diff --git a/supporting_scripts/analysis-of-endpoint-connections/eslint.conjig.json b/supporting_scripts/analysis-of-endpoint-connections/eslint.config.json
similarity index 72%
rename from supporting_scripts/analysis-of-endpoint-connections/eslint.conjig.json
rename to supporting_scripts/analysis-of-endpoint-connections/eslint.config.json
index 0b47d7836035..393e1c0972cf 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/eslint.conjig.json
+++ b/supporting_scripts/analysis-of-endpoint-connections/eslint.config.json
@@ -10,10 +10,5 @@
             "jsx": true
         }
     },
-    "rules": {},
-    "settings": {
-        "react": {
-            "version": "detect"
-        }
-    }
+    "rules": {}
 }
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/AnalysisOfEndpointConnections.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/AnalysisOfEndpointConnections.java
deleted file mode 100644
index b47b91d680d8..000000000000
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/AnalysisOfEndpointConnections.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package de.tum.cit.endpointanalysis;
-
-import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
-import java.util.Set;
-
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PatchMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import com.thoughtworks.qdox.JavaProjectBuilder;
-import com.thoughtworks.qdox.model.JavaAnnotation;
-import com.thoughtworks.qdox.model.JavaClass;
-import com.thoughtworks.qdox.model.JavaMethod;
-
-public class AnalysisOfEndpointConnections {
-
-    /**
-     * This is the entry point of the analysis of server sided endpoints.
-     *
-     * @param args List of files that should be analyzed regarding endpoints.
-     */
-    public static void main(String[] args) {
-        if (args.length == 0) {
-            System.out.println("No files to analyze.");
-            return;
-        }
-        String[] filePaths = args[0].split("\n");
-        String[] serverFiles = Arrays.stream(filePaths).map(filePath -> Paths.get("..", "..", filePath).toString())
-                .filter(filePath -> Files.exists(Paths.get(filePath)) && filePath.endsWith(".java")).toArray(String[]::new);
-        analyzeServerEndpoints(serverFiles);
-    }
-
-    private static void analyzeServerEndpoints(String[] filePaths) {
-        final Set<String> httpMethodClasses = Set.of(GetMapping.class.getName(), PostMapping.class.getName(), PutMapping.class.getName(), DeleteMapping.class.getName(),
-                PatchMapping.class.getName(), RequestMapping.class.getName());
-
-        JavaProjectBuilder builder = new JavaProjectBuilder();
-        for (String filePath : filePaths) {
-            builder.addSourceTree(new File(filePath));
-        }
-
-        Collection<JavaClass> classes = builder.getClasses();
-        for (JavaClass javaClass : classes) {
-            Optional<JavaAnnotation> requestMappingOptional = javaClass.getAnnotations().stream()
-                    .filter(annotation -> annotation.getType().getFullyQualifiedName().equals(RequestMapping.class.getName())).findFirst();
-
-            boolean hasEndpoint = javaClass.getMethods().stream().flatMap(method -> method.getAnnotations().stream())
-                    .anyMatch(annotation -> httpMethodClasses.contains(annotation.getType().getFullyQualifiedName()));
-
-            if (hasEndpoint) {
-                System.out.println("==================================================");
-                System.out.println("Class: " + javaClass.getFullyQualifiedName());
-                requestMappingOptional.ifPresent(annotation -> System.out.println("Class Request Mapping: " + annotation.getProperty("value")));
-                System.out.println("==================================================");
-            }
-
-            for (JavaMethod method : javaClass.getMethods()) {
-                for (JavaAnnotation annotation : method.getAnnotations()) {
-                    if (httpMethodClasses.contains(annotation.getType().getFullyQualifiedName())) {
-                        System.out.println("Endpoint: " + method.getName());
-                        System.out.println(
-                                annotation.getType().getFullyQualifiedName().equals(RequestMapping.class.getName()) ? "RequestMapping·method: " + annotation.getProperty("method")
-                                        : "HTTP method annotation: " + annotation.getType().getName());
-                        System.out.println("Path: " + annotation.getProperty("value"));
-                        System.out.println("Line: " + method.getLineNumber());
-                        List<String> annotations = method.getAnnotations().stream().filter(a -> !a.equals(annotation)).map(a -> a.getType().getName()).toList();
-                        System.out.println("Other annotations: " + annotations);
-                        System.out.println("---------------------------------------------------");
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalysis.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalysis.java
new file mode 100644
index 000000000000..4c38f7e826e8
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalysis.java
@@ -0,0 +1,6 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+public record EndpointAnalysis(List<UsedEndpoints> usedEndpoints, List<EndpointInformation> unusedEndpoints) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java
new file mode 100644
index 000000000000..b096ba1201c6
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointAnalyzer.java
@@ -0,0 +1,147 @@
+package de.tum.cit.endpointanalysis;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class EndpointAnalyzer {
+
+    private static String ENDPOINT_ANALYSIS_RESULT_PATH = "endpointAnalysisResult.json";
+
+    private static final Logger log = LoggerFactory.getLogger(EndpointAnalyzer.class);
+
+    public static void main(String[] args) {
+        analyzeEndpoints();
+        printEndpointAnalysisResult();
+    }
+
+    /**
+     * Analyzes server side endpoints and matches them with client side REST calls.
+     *
+     * This method reads endpoint and REST call information from JSON files,
+     * compares them to find matching REST calls for each endpoint, and writes
+     * the analysis result to a JSON file. Endpoints without matching REST calls
+     * are also recorded.
+     */
+    private static void analyzeEndpoints() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            List<EndpointClassInformation> endpointClasses = mapper.readValue(new File(EndpointParser.ENDPOINT_PARSING_RESULT_PATH),
+                    new TypeReference<List<EndpointClassInformation>>() {
+                    });
+            List<RestCallFileInformation> restCallFiles = mapper.readValue(new File(EndpointParser.REST_CALL_PARSING_RESULT_PATH),
+                    new TypeReference<List<RestCallFileInformation>>() {
+                    });
+
+            List<UsedEndpoints> endpointsAndMatchingRestCalls = new ArrayList<>();
+            List<EndpointInformation> unusedEndpoints = new ArrayList<>();
+
+            Map<String, List<RestCallInformation>> restCallMap = new HashMap<>();
+
+            // Populate the map with rest calls
+            for (RestCallFileInformation restCallFile : restCallFiles) {
+                for (RestCallInformation restCall : restCallFile.restCalls()) {
+                    String restCallURI = restCall.buildComparableRestCallUri();
+                    restCallMap.computeIfAbsent(restCallURI, uri -> new ArrayList<>()).add(restCall);
+                }
+            }
+
+            for (EndpointClassInformation endpointClass : endpointClasses) {
+                for (EndpointInformation endpoint : endpointClass.endpoints()) {
+
+                    String endpointURI = endpoint.buildComparableEndpointUri();
+                    List<RestCallInformation> restCallsWithMatchingURI = restCallMap.getOrDefault(endpointURI, new ArrayList<>());
+
+                    // Check for wildcard endpoints if no exact match is found
+                    checkForWildcardEndpoints(endpoint, restCallsWithMatchingURI, endpointURI, restCallMap);
+
+                    List<RestCallInformation> matchingRestCalls = restCallsWithMatchingURI.stream()
+                            .filter(restCall -> restCall.method().toLowerCase().equals(endpoint.getHttpMethod().toLowerCase())).toList();
+
+                    if (matchingRestCalls.isEmpty()) {
+                        unusedEndpoints.add(endpoint);
+                    }
+                    else {
+                        endpointsAndMatchingRestCalls.add(new UsedEndpoints(endpoint, matchingRestCalls, endpointClass.filePath()));
+                    }
+                }
+            }
+
+            EndpointAnalysis endpointAnalysis = new EndpointAnalysis(endpointsAndMatchingRestCalls, unusedEndpoints);
+            mapper.writeValue(new File(ENDPOINT_ANALYSIS_RESULT_PATH), endpointAnalysis);
+        }
+        catch (IOException e) {
+            log.error("Failed to analyze endpoints", e);
+        }
+    }
+
+    /**
+     * Checks for wildcard endpoints and adds matching REST calls to the list.
+     *
+     * This method is used to find matching REST calls for endpoints that use wildcard URIs.
+     * If no exact match is found for an endpoint, it checks if the endpoint URI ends with a wildcard ('*').
+     * It then iterates through the rest call map to find URIs that start with the same prefix as the endpoint URI
+     * (excluding the wildcard) and have the same HTTP method. If such URIs are found, they are added to the list of matching REST calls.
+     *
+     * @param endpoint          The endpoint information to check for wildcard matches.
+     * @param matchingRestCalls The list of matching REST calls to be populated.
+     * @param endpointURI       The URI of the endpoint being checked.
+     * @param restCallMap       The map of rest call URIs to their corresponding information.
+     */
+    private static void checkForWildcardEndpoints(EndpointInformation endpoint, List<RestCallInformation> matchingRestCalls, String endpointURI,
+            Map<String, List<RestCallInformation>> restCallMap) {
+        if (matchingRestCalls.isEmpty() && endpointURI.endsWith("*")) {
+            for (String uri : restCallMap.keySet()) {
+                if (uri.startsWith(endpoint.buildComparableEndpointUri().substring(0, endpoint.buildComparableEndpointUri().length() - 1))
+                        && endpoint.getHttpMethod().toLowerCase().equals(restCallMap.get(uri).get(0).method().toLowerCase())) {
+                    matchingRestCalls.addAll(restCallMap.get(uri));
+                }
+            }
+        }
+    }
+
+    /**
+     * Prints the endpoint analysis result.
+     *
+     * This method reads the endpoint analysis result from a JSON file and prints
+     * the details of unused endpoints to the console. The details include the
+     * endpoint URI, HTTP method, file path, and line number. If no matching REST
+     * call is found for an endpoint, it prints a message indicating this.
+     */
+    private static void printEndpointAnalysisResult() {
+        ObjectMapper mapper = new ObjectMapper();
+        EndpointAnalysis endpointsAndMatchingRestCalls = null;
+        try {
+            endpointsAndMatchingRestCalls = mapper.readValue(new File(ENDPOINT_ANALYSIS_RESULT_PATH), new TypeReference<EndpointAnalysis>() {
+            });
+        }
+        catch (IOException e) {
+            log.error("Failed to deserialize endpoint analysis result", e);
+            return;
+        }
+
+        endpointsAndMatchingRestCalls.unusedEndpoints().stream().forEach(endpoint -> {
+            log.info("=============================================");
+            log.info("Endpoint URI: {}", endpoint.buildCompleteEndpointURI());
+            log.info("HTTP method: {}", endpoint.httpMethodAnnotation());
+            log.info("File path: {}", endpoint.className());
+            log.info("Line: {}", endpoint.line());
+            log.info("=============================================");
+            log.info("No matching REST call found for endpoint: {}", endpoint.buildCompleteEndpointURI());
+            log.info("---------------------------------------------");
+            log.info("");
+        });
+
+        log.info("Number of endpoints without matching REST calls: {}", endpointsAndMatchingRestCalls.unusedEndpoints().size());
+    }
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointClassInformation.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointClassInformation.java
new file mode 100644
index 000000000000..062a3671b1bf
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointClassInformation.java
@@ -0,0 +1,6 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+public record EndpointClassInformation(String filePath, String classRequestMapping, List<EndpointInformation> endpoints) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java
new file mode 100644
index 000000000000..52f33cef81e2
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointInformation.java
@@ -0,0 +1,36 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public record EndpointInformation(String requestMapping, String endpoint, String httpMethodAnnotation, String uri, String className, int line, List<String> otherAnnotations) {
+
+    String buildCompleteEndpointURI() {
+        StringBuilder result = new StringBuilder();
+        if (this.requestMapping != null && !this.requestMapping.isEmpty()) {
+            // Remove quotes from the requestMapping as they are used to define the String in the source code but are not part of the URI
+            result.append(this.requestMapping.replace("\"", ""));
+        }
+        // Remove quotes from the URI as they are used to define the String in the source code but are not part of the URI
+        result.append(this.uri.replace("\"", ""));
+        return result.toString();
+    }
+
+    String buildComparableEndpointUri() {
+        // Replace arguments with placeholder
+        return this.buildCompleteEndpointURI().replaceAll("\\{.*?\\}", ":param:");
+    }
+
+    @JsonIgnore
+    String getHttpMethod() {
+        return switch (this.httpMethodAnnotation) {
+            case "GetMapping" -> "get";
+            case "PostMapping" -> "post";
+            case "PutMapping" -> "put";
+            case "DeleteMapping" -> "delete";
+            case "PatchMapping" -> "patch";
+            default -> "No HTTP method annotation found";
+        };
+    }
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java
new file mode 100644
index 000000000000..9fb5a05b72da
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/EndpointParser.java
@@ -0,0 +1,217 @@
+package de.tum.cit.endpointanalysis;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.javaparser.ParserConfiguration;
+import com.github.javaparser.StaticJavaParser;
+import com.github.javaparser.ast.CompilationUnit;
+import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
+import com.github.javaparser.ast.expr.AnnotationExpr;
+import com.github.javaparser.ast.expr.ArrayInitializerExpr;
+import com.github.javaparser.ast.expr.Expression;
+import com.github.javaparser.ast.expr.NormalAnnotationExpr;
+import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
+
+public class EndpointParser {
+
+    static final String ENDPOINT_PARSING_RESULT_PATH = "endpoints.json";
+
+    static final String REST_CALL_PARSING_RESULT_PATH = "restCalls.json";
+
+    private static final Logger log = LoggerFactory.getLogger(EndpointParser.class);
+
+    public static void main(String[] args) {
+        final Path absoluteDirectoryPath = Path.of("../../src/main/java").toAbsolutePath().normalize();
+
+        StaticJavaParser.getParserConfiguration().setLanguageLevel(ParserConfiguration.LanguageLevel.JAVA_21);
+
+        String[] filesToParse = {};
+        try (Stream<Path> paths = Files.walk(absoluteDirectoryPath)) {
+            filesToParse = paths.filter(Files::isRegularFile).filter(path -> path.toString().endsWith(".java")).map(Path::toString).toArray(String[]::new);
+        }
+        catch (IOException e) {
+            log.error("Error reading files from directory: {}", absoluteDirectoryPath, e);
+        }
+
+        parseServerEndpoints(filesToParse);
+    }
+
+    /**
+     * Parses server endpoints from the given file paths.
+     *
+     * This method reads Java files from the specified file paths, extracts endpoint
+     * information annotated with HTTP method annotations, and writes the parsed
+     * endpoint information to a JSON file. It also logs any files that failed to parse.
+     *
+     * @param filePaths an array of file paths to parse for endpoint information
+     */
+    private static void parseServerEndpoints(String[] filePaths) {
+        List<EndpointClassInformation> endpointClasses = new ArrayList<>();
+        final Set<String> httpMethodClasses = Set.of(GetMapping.class.getSimpleName(), PostMapping.class.getSimpleName(), PutMapping.class.getSimpleName(),
+                DeleteMapping.class.getSimpleName(), PatchMapping.class.getSimpleName(), RequestMapping.class.getSimpleName());
+        List<String> filesFailedToParse = new ArrayList<>();
+
+        for (String filePath : filePaths) {
+            CompilationUnit compilationUnit;
+            try {
+                compilationUnit = StaticJavaParser.parse(new File(filePath));
+            }
+            catch (Exception e) {
+                filesFailedToParse.add(filePath);
+                continue;
+            }
+
+            List<ClassOrInterfaceDeclaration> classes = compilationUnit.findAll(ClassOrInterfaceDeclaration.class);
+            for (ClassOrInterfaceDeclaration javaClass : classes) {
+                List<EndpointInformation> endpoints = new ArrayList<>();
+                final String classRequestMappingString = extractClassRequestMapping(javaClass, httpMethodClasses);
+
+                endpoints.addAll(extractAnnotationPathValues(javaClass, httpMethodClasses, classRequestMappingString));
+
+                if (!endpoints.isEmpty()) {
+                    endpointClasses.add(new EndpointClassInformation(javaClass.getNameAsString(), classRequestMappingString, endpoints));
+                }
+            }
+        }
+
+        printFilesFailedToParse(filesFailedToParse);
+
+        writeEndpointsToFile(endpointClasses);
+    }
+
+    /**
+     * Extracts endpoint information from the methods of a given class declaration.
+     *
+     * This method iterates over the methods of the provided class and their annotations.
+     * If an annotation matches one of the specified HTTP method annotations, it extracts
+     * the path values from the annotation and creates EndpointInformation objects for each path.
+     *
+     * @param javaClass                 the class declaration to extract endpoint information from
+     * @param httpMethodClasses         a set of HTTP method annotation class names
+     * @param classRequestMappingString the class-level request mapping string
+     * @return a list of EndpointInformation objects representing the extracted endpoint information
+     */
+    private static List<EndpointInformation> extractAnnotationPathValues(ClassOrInterfaceDeclaration javaClass, Set<String> httpMethodClasses, String classRequestMappingString) {
+        return javaClass.getMethods().stream()
+                .flatMap(method -> method.getAnnotations().stream().filter(annotation -> httpMethodClasses.contains(annotation.getNameAsString()))
+                        .flatMap(annotation -> extractPathsFromAnnotation(annotation).stream()
+                                .map(path -> new EndpointInformation(classRequestMappingString, method.getNameAsString(), annotation.getNameAsString(), path,
+                                        javaClass.getNameAsString(), method.getBegin().get().line, method.getAnnotations().stream().map(AnnotationExpr::toString).toList()))))
+                .toList();
+    }
+
+    /**
+     * Extracts the paths from the given annotation.
+     *
+     * This method processes the provided annotation to extract path values.
+     * It handles both single-member and normal annotations, extracting the
+     * path values from the annotation's member values or pairs.
+     *
+     * @param annotation the annotation to extract paths from
+     * @return a list of extracted path values
+     */
+    private static List<String> extractPathsFromAnnotation(AnnotationExpr annotation) {
+        List<String> paths = new ArrayList<>();
+        if (annotation instanceof SingleMemberAnnotationExpr singleMemberAnnotationExpr) {
+            Expression memberValue = singleMemberAnnotationExpr.getMemberValue();
+            if (memberValue instanceof ArrayInitializerExpr arrayInitializerExpr) {
+                paths.addAll(arrayInitializerExpr.getValues().stream().map(Expression::toString).collect(Collectors.toList()));
+            }
+            else {
+                paths.add(memberValue.toString());
+            }
+        }
+        else if (annotation instanceof NormalAnnotationExpr normalAnnotationExpr) {
+            normalAnnotationExpr.getPairs().stream().filter(pair -> "value".equals(pair.getNameAsString())).forEach(pair -> paths.add(pair.getValue().toString()));
+        }
+        return paths;
+    }
+
+    /**
+     * Extracts the class-level request mapping from a given class declaration.
+     *
+     * This method scans the annotations of the provided class to find a `RequestMapping` annotation.
+     * It then checks if the class contains any methods annotated with HTTP method annotations.
+     * If such methods are found, it extracts the value of the `RequestMapping` annotation.
+     *
+     * @param javaClass         the class declaration to extract the request mapping from
+     * @param httpMethodClasses a set of HTTP method annotation class names
+     * @return the extracted request mapping value, or an empty string if no request mapping is found or the class has no HTTP method annotations
+     */
+    private static String extractClassRequestMapping(ClassOrInterfaceDeclaration javaClass, Set<String> httpMethodClasses) {
+        boolean hasEndpoint = javaClass.getMethods().stream().flatMap(method -> method.getAnnotations().stream())
+                .anyMatch(annotation -> httpMethodClasses.contains(annotation.getNameAsString()));
+
+        if (!hasEndpoint) {
+            return "";
+        }
+
+        String classRequestMapping = javaClass.getAnnotations().stream().filter(annotation -> annotation.getNameAsString().equals(RequestMapping.class.getSimpleName())).findFirst()
+                .map(annotation -> {
+                    if (annotation instanceof SingleMemberAnnotationExpr singleMemberAnnotationExpr) {
+                        return singleMemberAnnotationExpr.getMemberValue().toString();
+                    }
+                    else if (annotation instanceof NormalAnnotationExpr normalAnnotationExpr) {
+                        return normalAnnotationExpr.getPairs().stream().filter(pair -> "path".equals(pair.getNameAsString())).map(pair -> pair.getValue().toString()).findFirst()
+                                .orElse("");
+                    }
+                    return "";
+                }).orElse("");
+
+        return classRequestMapping;
+    }
+
+    /**
+     * Prints the list of files that failed to parse.
+     *
+     * This method checks if the provided list of file paths is not empty.
+     * If it is not empty, it prints a message indicating that some files failed to parse,
+     * followed by the paths of the files that failed.
+     *
+     * @param filesFailedToParse the list of file paths that failed to parse
+     */
+    private static void printFilesFailedToParse(List<String> filesFailedToParse) {
+        if (!filesFailedToParse.isEmpty()) {
+            log.warn("Files failed to parse:", filesFailedToParse);
+            for (String file : filesFailedToParse) {
+                log.warn(file);
+            }
+        }
+    }
+
+    /**
+     * Writes the list of endpoint class information to a JSON file.
+     *
+     * This method uses the Jackson ObjectMapper to serialize the list of
+     * EndpointClassInformation objects and write them to a file specified
+     * by the EndpointParsingResultPath constant.
+     *
+     * @param endpointClasses the list of EndpointClassInformation objects to write to the file
+     */
+    private static void writeEndpointsToFile(List<EndpointClassInformation> endpointClasses) {
+        try {
+            new ObjectMapper().writeValue(new File(ENDPOINT_PARSING_RESULT_PATH), endpointClasses);
+        }
+        catch (IOException e) {
+            log.error("Failed to write endpoint information to file", e);
+        }
+    }
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalysis.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalysis.java
new file mode 100644
index 000000000000..57b1d2dfc289
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalysis.java
@@ -0,0 +1,6 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+public record RestCallAnalysis(List<RestCallWithMatchingEndpoint> restCallsWithMatchingEndpoints, List<RestCallInformation> restCallsWithoutMatchingEndpoints) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java
new file mode 100644
index 000000000000..19f8cbc6c56f
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallAnalyzer.java
@@ -0,0 +1,148 @@
+package de.tum.cit.endpointanalysis;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class RestCallAnalyzer {
+
+    private static final String REST_CALL_ANALYSIS_RESULT_PATH = "restCallAnalysisResult.json";
+
+    private static final Logger log = LoggerFactory.getLogger(RestCallAnalyzer.class);
+
+    public static void main(String[] args) {
+        analyzeRestCalls();
+        printRestCallAnalysisResult();
+    }
+
+    /**
+     * The RestCallAnalyzer analyzes the client REST Calls and focuses on them having a matching Endpoint on the server
+     *
+     * This method reads endpoint and REST call information from JSON files.
+     * It then matches the REST calls with the endpoints they are calling and
+     * writes the analysis result to a JSON file.
+     * REST calls without matching endpoints are also recorded.
+     */
+    private static void analyzeRestCalls() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        try {
+            List<EndpointClassInformation> endpointClasses = mapper.readValue(new File(EndpointParser.ENDPOINT_PARSING_RESULT_PATH),
+                    new TypeReference<List<EndpointClassInformation>>() {
+                    });
+            List<RestCallFileInformation> restCalls = mapper.readValue(new File(EndpointParser.REST_CALL_PARSING_RESULT_PATH), new TypeReference<List<RestCallFileInformation>>() {
+            });
+
+            List<RestCallWithMatchingEndpoint> restCallsWithMatchingEndpoint = new ArrayList<>();
+            List<RestCallInformation> restCallsWithoutMatchingEndpoint = new ArrayList<>();
+
+            Map<String, List<EndpointInformation>> endpointMap = new HashMap<>();
+
+            // Populate the map with endpoints
+            for (EndpointClassInformation endpointClass : endpointClasses) {
+                for (EndpointInformation endpoint : endpointClass.endpoints()) {
+                    String endpointURI = endpoint.buildComparableEndpointUri();
+                    endpointMap.computeIfAbsent(endpointURI, uri -> new ArrayList<>()).add(endpoint);
+                }
+            }
+
+            for (RestCallFileInformation restCallFile : restCalls) {
+                for (RestCallInformation restCall : restCallFile.restCalls()) {
+                    String restCallURI = restCall.buildComparableRestCallUri();
+                    List<EndpointInformation> endpointsWithMatchingUri = endpointMap.getOrDefault(restCallURI, new ArrayList<>());
+
+                    checkForWildcardMatches(restCall, endpointsWithMatchingUri, restCallURI, endpointMap);
+
+                    List<EndpointInformation> endpointsWithMatchingHttpMethod = endpointsWithMatchingUri.stream()
+                            .filter(endpoint -> endpoint.getHttpMethod().toLowerCase().equals(restCall.method().toLowerCase())).toList();
+
+                    if (endpointsWithMatchingHttpMethod.isEmpty()) {
+                        restCallsWithoutMatchingEndpoint.add(restCall);
+                    }
+                    else {
+                        for (EndpointInformation endpoint : endpointsWithMatchingHttpMethod) {
+                            restCallsWithMatchingEndpoint.add(new RestCallWithMatchingEndpoint(endpoint, restCall, restCall.filePath()));
+                        }
+                    }
+                }
+            }
+
+            RestCallAnalysis restCallAnalysis = new RestCallAnalysis(restCallsWithMatchingEndpoint, restCallsWithoutMatchingEndpoint);
+            mapper.writeValue(new File(REST_CALL_ANALYSIS_RESULT_PATH), restCallAnalysis);
+        }
+        catch (IOException e) {
+            log.error("Failed to analyze REST calls", e);
+        }
+    }
+
+    /**
+     * Checks for wildcard matches and adds matching endpoints to the list.
+     *
+     * This method is used to find matching endpoints for REST calls that use wildcard URIs.
+     * If no exact match is found for a REST call, it checks if the REST call URI ends with a wildcard ('*').
+     * It then iterates through the endpoint map to find URIs that start with the same prefix as the REST call URI
+     * (excluding the wildcard) and have the same HTTP method. If such URIs are found, they are added to the list of matching endpoints.
+     *
+     * @param restCall          The REST call information to check for wildcard matches.
+     * @param matchingEndpoints The list of matching endpoints to be populated.
+     * @param restCallURI       The URI of the REST call being checked.
+     * @param endpointMap       The map of endpoint URIs to their corresponding information.
+     */
+    private static void checkForWildcardMatches(RestCallInformation restCall, List<EndpointInformation> matchingEndpoints, String restCallURI,
+            Map<String, List<EndpointInformation>> endpointMap) {
+        if (matchingEndpoints.isEmpty() && restCallURI.endsWith("*")) {
+            for (String uri : endpointMap.keySet()) {
+                if (uri.startsWith(restCallURI.substring(0, restCallURI.length() - 1))
+                        && endpointMap.get(uri).get(0).getHttpMethod().toLowerCase().equals(restCall.method().toLowerCase())) {
+                    matchingEndpoints.addAll(endpointMap.get(uri));
+                }
+            }
+        }
+    }
+
+    /**
+     * Prints the endpoint analysis result.
+     *
+     * This method reads the endpoint analysis result from a JSON file and prints
+     * the details of unused endpoints to the console. The details include the
+     * endpoint URI, HTTP method, file path, and line number. If no matching REST
+     * call is found for an endpoint, it prints a message indicating this.
+     */
+    private static void printRestCallAnalysisResult() {
+        ObjectMapper mapper = new ObjectMapper();
+
+        RestCallAnalysis restCallsAndMatchingEndpoints = null;
+
+        try {
+            restCallsAndMatchingEndpoints = mapper.readValue(new File(REST_CALL_ANALYSIS_RESULT_PATH), new TypeReference<RestCallAnalysis>() {
+            });
+        }
+        catch (IOException e) {
+            log.error("Failed to deserialize rest call analysis results", e);
+            return;
+        }
+
+        restCallsAndMatchingEndpoints.restCallsWithoutMatchingEndpoints().stream().forEach(endpoint -> {
+            log.info("=============================================");
+            log.info("REST call URI: {}", endpoint.buildCompleteRestCallURI());
+            log.info("HTTP method: {}", endpoint.method());
+            log.info("File path: {}", endpoint.filePath());
+            log.info("Line: {}", endpoint.line());
+            log.info("=============================================");
+            log.info("No matching endpoint found for REST call: {}", endpoint.buildCompleteRestCallURI());
+            log.info("---------------------------------------------");
+            log.info("");
+        });
+
+        log.info("Number of REST calls without matching endpoints: {}", restCallsAndMatchingEndpoints.restCallsWithoutMatchingEndpoints().size());
+    }
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallFileInformation.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallFileInformation.java
new file mode 100644
index 000000000000..2582f57443cc
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallFileInformation.java
@@ -0,0 +1,6 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+public record RestCallFileInformation(String filePath, List<RestCallInformation> restCalls) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallInformation.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallInformation.java
new file mode 100644
index 000000000000..b6567d707a47
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallInformation.java
@@ -0,0 +1,23 @@
+package de.tum.cit.endpointanalysis;
+
+public record RestCallInformation(String method, String url, String filePath, int line) {
+
+    String buildCompleteRestCallURI() {
+        return this.url.replace("`", "");
+    }
+
+    String buildComparableRestCallUri() {
+        // Replace arguments with placeholder
+        String result = this.buildCompleteRestCallURI().replaceAll("\\$\\{.*?\\}", ":param:");
+
+        // Remove query parameters
+        result = result.split("\\?")[0];
+
+        // Some URIs in the artemis client start with a redundant `/`. To be able to compare them to the endpoint URIs, we remove it.
+        if (result.startsWith("/")) {
+            result = result.substring(1);
+        }
+
+        return result;
+    }
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallWithMatchingEndpoint.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallWithMatchingEndpoint.java
new file mode 100644
index 000000000000..0b3ebed9d527
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/RestCallWithMatchingEndpoint.java
@@ -0,0 +1,4 @@
+package de.tum.cit.endpointanalysis;
+
+public record RestCallWithMatchingEndpoint(EndpointInformation matchingEndpoint, RestCallInformation restCallInformation, String filePath) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/UsedEndpoints.java b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/UsedEndpoints.java
new file mode 100644
index 000000000000..afdb8fa06846
--- /dev/null
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/java/de/tum/cit/endpointanalysis/UsedEndpoints.java
@@ -0,0 +1,6 @@
+package de.tum.cit.endpointanalysis;
+
+import java.util.List;
+
+public record UsedEndpoints(EndpointInformation endpointInformation, List<RestCallInformation> matchingRestCalls, String filePath) {
+}
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/AnalysisOfEndpointConnectionsClient.ts b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/AnalysisOfEndpointConnectionsClient.ts
index f774acfdc92b..ad4f19a9322e 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/AnalysisOfEndpointConnectionsClient.ts
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/AnalysisOfEndpointConnectionsClient.ts
@@ -1,8 +1,9 @@
-import { readdirSync } from 'node:fs';
+import { readdirSync, readFileSync } from 'node:fs';
 import { join, resolve } from 'node:path';
 import { Preprocessor } from './Preprocessor';
 import { Postprocessor } from './Postprocessor';
 import { writeFileSync } from 'node:fs';
+import { parse, TSESTree } from '@typescript-eslint/typescript-estree';
 
 /**
  * Recursively collects all TypeScript files in a directory.
@@ -26,20 +27,58 @@ function collectTypeScriptFiles(dir: string, files: string[] = []) : string[] {
     return files;
 }
 
+/**
+ * Parses a TypeScript file and returns its Abstract Syntax Tree (AST).
+ *
+ * @param filePath - The path to the TypeScript file to be parsed.
+ * @returns The TSESTree of the parsed TypeScript file.
+ */
+function parseTypeScriptFile(filePath: string): TSESTree.Program | null {
+    const code = readFileSync(filePath, 'utf8');
+    try {
+        return parse(code, {
+            loc: true,
+            comment: true,
+            tokens: true,
+            ecmaVersion: 2020,
+            sourceType: 'module',
+        });
+    } catch (error) {
+        console.error(`Failed to parse TypeScript file at ${filePath}:`, error);
+        console.error('Please make sure the file is valid TypeScript code.');
+        return null;
+    }
+}
+
 const clientDirPath = resolve('src/main/webapp/app');
 
 const tsFiles = collectTypeScriptFiles(clientDirPath);
 
-// preprocess each file
+// create and store Syntax Tree for each file
+const astMap = new Map<string, TSESTree.Program>;
 tsFiles.forEach((filePath) => {
-    const preProcessor = new Preprocessor(filePath);
-    preProcessor.preprocessFile();
+    const ast =  parseTypeScriptFile(filePath);
+    if (ast) {
+        astMap.set(filePath, ast);
+    }
+});
+
+// preprocess each file
+Array.from(astMap.keys()).forEach((filePath: string) => {
+    const ast = astMap.get(filePath);
+    if (ast) {
+        const preProcessor = new Preprocessor(ast);
+        preProcessor.preprocessFile();
+    }
 });
 
 // postprocess each file
-tsFiles.forEach((filePath) => {
-    const postProcessor = new Postprocessor(filePath);
-    postProcessor.extractRestCalls();
+Array.from(astMap.keys()).forEach((filePath) => {
+    const ast = astMap.get(filePath);
+    if (ast) {
+        const postProcessor = new Postprocessor(filePath, ast);
+        postProcessor.extractRestCallsFromProgram();
+    }
 });
 
 try {
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Postprocessor.ts b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Postprocessor.ts
index b90d216a9796..46b95a821a18 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Postprocessor.ts
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Postprocessor.ts
@@ -5,7 +5,7 @@ interface RestCall {
     method: string;
     url: string;
     line: number;
-    fileName: string;
+    filePath: string;
 }
 
 enum ParsingResultType {
@@ -43,13 +43,13 @@ export class Postprocessor {
     private readonly filePath: string;
     private readonly ast: TSESTree.Program;
 
-    constructor(filePath: string) {
+    /**
+     * @param filePath - The path of the file being processed.
+     * @param ast - The abstract syntax tree (AST) of the processed file.
+     */
+    constructor(filePath: string, ast: TSESTree.Program) {
         this.filePath = filePath;
-        this.ast = Preprocessor.parseTypeScriptFile(Preprocessor.pathPrefix + filePath)
-    }
-
-    extractRestCalls() {
-        this.extractRestCallsFromProgram();
+        this.ast = ast;
     }
 
     extractRestCallsFromProgram() {
@@ -61,7 +61,7 @@ export class Postprocessor {
             }
         });
         if (this.restCalls.length > 0) {
-            Postprocessor.filesWithRestCalls.push( {filePath: this.filePath, restCalls: this.restCalls} );
+            Postprocessor.filesWithRestCalls.push({ filePath: this.filePath, restCalls: this.restCalls });
         }
     }
 
@@ -108,10 +108,10 @@ export class Postprocessor {
                                         urlEvaluationResult = this.evaluateUrl(node.arguments[0], methodDefinition, node, classBody);
                                     }
 
-                                    const fileName = this.filePath;
+                                    const filePath = this.filePath;
                                     if (urlEvaluationResult.resultType === ParsingResultType.EVALUATE_URL_SUCCESS) {
-                                        for (let url of urlEvaluationResult.result) {
-                                            this.restCalls.push({ method, url, line, fileName });
+                                        for (const url of urlEvaluationResult.result) {
+                                            this.restCalls.push({ method, url, line, filePath });
                                         }
                                     }
                                 }
@@ -175,6 +175,7 @@ export class Postprocessor {
     }
 
     /**
+     * Evaluates a template literal AST node to determine its URL value.
      * Evaluates a template literal AST node to determine its URL value.
      *
      * This method evaluates the provided template literal node by calling `evaluateTemplateLiteralExpression`.
@@ -541,7 +542,7 @@ export class Postprocessor {
         simpleTraverse(methodDefinition, {
             enter: (node) => {
                 if (node.type === 'VariableDeclaration') {
-                    for (let decl of node.declarations) {
+                    for (const decl of node.declarations) {
                         if (decl.id.type === 'Identifier' && decl.id.name === name && decl.init) {
                             const tempResult = this.evaluateUrl(decl.init, methodDefinition, restCall, classBody);
                             if (tempResult.resultType === ParsingResultType.EVALUATE_URL_SUCCESS) {
@@ -587,7 +588,7 @@ export class Postprocessor {
      * @returns An array of AST nodes representing the parameters of the constructor.
      */
     getConstructorArgumentsFromClassBody(classBody: TSESTree.ClassBody): TSESTree.Parameter[] {
-        for (let node of classBody.body) {
+        for (const node of classBody.body) {
             if (node.type === 'MethodDefinition' && node.key.type === 'Identifier' && node.key.name === 'constructor') {
                 return node.value.params;
             }
@@ -615,11 +616,11 @@ export class Postprocessor {
         const superClass = Preprocessor.PREPROCESSING_RESULTS.get(this.getClassNameFromClassBody(classBody));
         if (superClass) {
             const constructorArguments = this.getConstructorArgumentsFromClassBody(classBody.body);
-            for (let superConstructorCallArguments of superClass.superConstructorCalls) {
+            for (const superConstructorCallArguments of superClass.superConstructorCalls) {
                 for (let i = 0; i < superConstructorCallArguments.arguments.length; i++) {
-                    let constructorArgument = constructorArguments[i];
+                    const constructorArgument = constructorArguments[i];
                     if (superConstructorCallArguments.arguments[i] !== '' && constructorArgument.type === 'TSParameterProperty'
-                    && constructorArgument.parameter.type === 'Identifier' && constructorArgument.parameter.name === memberExprKey) {
+                        && constructorArgument.parameter.type === 'Identifier' && constructorArgument.parameter.name === memberExprKey) {
                         memberExpressionResult.push(superConstructorCallArguments.arguments[i]);
                         resultType = ParsingResultType.EVALUATE_MEMBER_EXPRESSION_SUCCESS;
                     }
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Preprocessor.ts b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Preprocessor.ts
index a90f30fb7a5e..fcdebd828486 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Preprocessor.ts
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/Preprocessor.ts
@@ -11,16 +11,16 @@ interface SuperClass {
 interface ChildClass {
     superClass: string;
     name: string;
-    memberVariables: Map<string, MemberVariable>;
+    memberVariables: Map<string, Attribute>;
     parentMethodCalls: ParentMethodCalls[];
 }
 
 interface ParentMethodCalls {
     name: string;
-    parameters: MemberVariable[];
+    parameters: Attribute[];
 }
 
-interface MemberVariable {
+interface Attribute {
     name: string;
     type: string;
     value?: string;
@@ -28,16 +28,16 @@ interface MemberVariable {
 
 export class Preprocessor {
     public static PREPROCESSING_RESULTS = new Map<string, SuperClass>();
-    public static readonly pathPrefix = ''
     private readonly directoryPrefix = 'src/main/webapp/';
-    private readonly fileToPreprocess: string;
     private ast: TSESTree.Program;
 
-    private memberVariables: Map<string, MemberVariable> = new Map<string, MemberVariable>();
+    private memberVariables: Map<string, Attribute> = new Map<string, Attribute>();
 
-    constructor(fileToPreprocess: string) {
-        this.fileToPreprocess = fileToPreprocess;
-        this.ast = Preprocessor.parseTypeScriptFile(Preprocessor.pathPrefix + this.fileToPreprocess);
+    /**
+     * @param ast - The abstract syntax tree (AST) of the processed file.
+     */
+    constructor(ast: TSESTree.Program) {
+        this.ast = ast;
     }
 
     /**
@@ -48,10 +48,6 @@ export class Preprocessor {
      * It also handles named exports that are class declarations.
      */
     preprocessFile() {
-        if (this.ast.type !== 'Program') {
-            return;
-        }
-
         this.ast.body.forEach((node) => {
             if (node.type === 'ClassDeclaration') {
                 this.preprocessClass(node);
@@ -254,11 +250,11 @@ export class Preprocessor {
      * which scans the class body for a property matching the parameter name and returns its value.
      *
      * @param parameterName - The name of the parameter whose value is to be found.
-     * @param filePath - The path to the TypeScript file (relative to the base directory set in `pathPrefix` and `directoryPrefix`) where the parameter value is to be searched.
+     * @param filePath - The path to the TypeScript file (relative to the base directory set in `directoryPrefix`) where the parameter value is to be searched.
      * @returns The value of the parameter if found; otherwise, an empty string.
      */
     findParameterValueByParameterNameAndFilePath (parameterName: string, filePath: string): string {
-        const targetAST = Preprocessor.parseTypeScriptFile(`${Preprocessor.pathPrefix}${this.directoryPrefix}${filePath}.ts`);
+        const targetAST = Preprocessor.parseTypeScriptFile(`${this.directoryPrefix}${filePath}.ts`);
 
         for (const node of targetAST.body) {
             if (node.type === 'ExportNamedDeclaration' && node.declaration?.type === 'ClassDeclaration') {
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package-lock.json b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package-lock.json
index d55648326e00..3d697912c662 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package-lock.json
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package-lock.json
@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {
-        "@eslint/js": "^9.6.0",
-        "@types/eslint__js": "^8.42.3",
-        "@types/node": "20.14.08",
-        "eslint": "^8.57.0",
-        "typescript": "^5.5.3",
-        "typescript-eslint": "^7.15.0"
+        "@eslint/js": "9.9.0",
+        "@types/eslint__js": "8.42.3",
+        "@types/node": "22.4.2",
+        "eslint": "9.9",
+        "typescript": "5.5.4",
+        "typescript-eslint": "8.2.0"
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
@@ -41,44 +41,38 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
-    "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+    "node_modules/@eslint/config-array": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz",
+      "integrity": "sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "ajv": "^6.12.4",
-        "debug": "^4.3.2",
-        "espree": "^9.6.0",
-        "globals": "^13.19.0",
-        "ignore": "^5.2.0",
-        "import-fresh": "^3.2.1",
-        "js-yaml": "^4.1.0",
-        "minimatch": "^3.1.2",
-        "strip-json-comments": "^3.1.1"
+        "@eslint/object-schema": "^2.1.4",
+        "debug": "^4.3.1",
+        "minimatch": "^3.1.2"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
+    "node_modules/@eslint/config-array/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
+    "node_modules/@eslint/config-array/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -86,45 +80,47 @@
         "node": "*"
       }
     },
-    "node_modules/@eslint/js": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.6.0.tgz",
-      "integrity": "sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      }
-    },
-    "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.14",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
-      "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==",
-      "deprecated": "Use @eslint/config-array instead",
+    "node_modules/@eslint/eslintrc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.1.0.tgz",
+      "integrity": "sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.2",
-        "debug": "^4.3.1",
-        "minimatch": "^3.0.5"
+        "ajv": "^6.12.4",
+        "debug": "^4.3.2",
+        "espree": "^10.0.1",
+        "globals": "^14.0.0",
+        "ignore": "^5.2.0",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^4.1.0",
+        "minimatch": "^3.1.2",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">=10.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
+    "node_modules/@eslint/eslintrc/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
       }
     },
-    "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
+    "node_modules/@eslint/eslintrc/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -132,6 +128,26 @@
         "node": "*"
       }
     },
+    "node_modules/@eslint/js": {
+      "version": "9.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.9.0.tgz",
+      "integrity": "sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@eslint/object-schema": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.4.tgz",
+      "integrity": "sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -145,12 +161,19 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
-    "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-      "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-      "deprecated": "Use @eslint/object-schema instead",
-      "dev": true
+    "node_modules/@humanwhocodes/retry": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz",
+      "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=18.18"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/nzakas"
+      }
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -219,40 +242,42 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.14.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.8.tgz",
-      "integrity": "sha512-DO+2/jZinXfROG7j7WKFn/3C6nFwxy2lLpgLjEXJz+0XKphZlTLJ14mo8Vfg8X5BWN6XjyESXq+LcYdT7tR3bA==",
+      "version": "22.4.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.4.2.tgz",
+      "integrity": "sha512-nAvM3Ey230/XzxtyDcJ+VjvlzpzoHwLsF7JaDRfoI0ytO0mVheerNmM45CtA0yOILXwXXxOrcUWH3wltX+7PSw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.19.2"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.15.0.tgz",
-      "integrity": "sha512-uiNHpyjZtFrLwLDpHnzaDlP3Tt6sGMqTCiqmxaN4n4RP0EfYZDODJyddiFDF44Hjwxr5xAcaYxVKm9QKQFJFLA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.2.0.tgz",
+      "integrity": "sha512-02tJIs655em7fvt9gps/+4k4OsKULYGtLBPJfOsmOq1+3cdClYiF0+d6mHu6qDnTcg88wJBkcPLpQhq7FyDz0A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/type-utils": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "8.2.0",
+        "@typescript-eslint/type-utils": "8.2.0",
+        "@typescript-eslint/utils": "8.2.0",
+        "@typescript-eslint/visitor-keys": "8.2.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^7.0.0",
-        "eslint": "^8.56.0"
+        "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+        "eslint": "^8.57.0 || ^9.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -261,26 +286,27 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.15.0.tgz",
-      "integrity": "sha512-k9fYuQNnypLFcqORNClRykkGOMOj+pV6V91R4GO/l1FDGwpqmSwoOQrOHo3cGaH63e+D3ZiCAOsuS/D2c99j/A==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.2.0.tgz",
+      "integrity": "sha512-j3Di+o0lHgPrb7FxL3fdEy6LJ/j2NE8u+AP/5cQ9SKb+JLH6V6UHDqJ+e0hXBkHP1wn1YDFjYCS9LBQsZDlDEg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/scope-manager": "8.2.0",
+        "@typescript-eslint/types": "8.2.0",
+        "@typescript-eslint/typescript-estree": "8.2.0",
+        "@typescript-eslint/visitor-keys": "8.2.0",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0"
       },
       "peerDependenciesMeta": {
         "typescript": {
@@ -289,16 +315,17 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.15.0.tgz",
-      "integrity": "sha512-Q/1yrF/XbxOTvttNVPihxh1b9fxamjEoz2Os/Pe38OHwxC24CyCqXxGTOdpb4lt6HYtqw9HetA/Rf6gDGaMPlw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.2.0.tgz",
+      "integrity": "sha512-OFn80B38yD6WwpoHU2Tz/fTz7CgFqInllBoC3WP+/jLbTb4gGPTy9HBSTsbDWkMdN55XlVU0mMDYAtgvlUspGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0"
+        "@typescript-eslint/types": "8.2.0",
+        "@typescript-eslint/visitor-keys": "8.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -306,26 +333,24 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.15.0.tgz",
-      "integrity": "sha512-SkgriaeV6PDvpA6253PDVep0qCqgbO1IOBiycjnXsszNTVQe5flN5wR5jiczoEoDEnAqYFSFFc9al9BSGVltkg==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.2.0.tgz",
+      "integrity": "sha512-g1CfXGFMQdT5S+0PSO0fvGXUaiSkl73U1n9LTK5aRAFnPlJ8dLKkXr4AaLFvPedW8lVDoMgLLE3JN98ZZfsj0w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0",
+        "@typescript-eslint/typescript-estree": "8.2.0",
+        "@typescript-eslint/utils": "8.2.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
@@ -333,12 +358,13 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.15.0.tgz",
-      "integrity": "sha512-aV1+B1+ySXbQH0pLK0rx66I3IkiZNidYobyfn0WFsdGhSXw+P3YOqeTq5GED458SfB24tg+ux3S+9g118hjlTw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.2.0.tgz",
+      "integrity": "sha512-6a9QSK396YqmiBKPkJtxsgZZZVjYQ6wQ/TlI0C65z7vInaETuC6HAHD98AGLC8DyIPqHytvNuS8bBVvNLKyqvQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -346,13 +372,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.15.0.tgz",
-      "integrity": "sha512-gjyB/rHAopL/XxfmYThQbXbzRMGhZzGw6KpcMbfe8Q3nNQKStpxnUKeXb0KiN/fFDR42Z43szs6rY7eHk0zdGQ==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.2.0.tgz",
+      "integrity": "sha512-kiG4EDUT4dImplOsbh47B1QnNmXSoUqOjWDvCJw/o8LgfD0yr7k2uy54D5Wm0j4t71Ge1NkynGhpWdS0dEIAUA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/visitor-keys": "7.15.0",
+        "@typescript-eslint/types": "8.2.0",
+        "@typescript-eslint/visitor-keys": "8.2.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -361,7 +388,7 @@
         "ts-api-utils": "^1.3.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
@@ -374,55 +401,52 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.15.0.tgz",
-      "integrity": "sha512-hfDMDqaqOqsUVGiEPSMLR/AjTSCsmJwjpKkYQRo1FNbmW4tBwBspYDwO9eh7sKSTwMQgBw9/T4DHudPaqshRWA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.2.0.tgz",
+      "integrity": "sha512-O46eaYKDlV3TvAVDNcoDzd5N550ckSe8G4phko++OCSC1dYIb9LTc3HDGYdWqWIAT5qDUKphO6sd9RrpIJJPfg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.15.0",
-        "@typescript-eslint/types": "7.15.0",
-        "@typescript-eslint/typescript-estree": "7.15.0"
+        "@typescript-eslint/scope-manager": "8.2.0",
+        "@typescript-eslint/types": "8.2.0",
+        "@typescript-eslint/typescript-estree": "8.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "eslint": "^8.56.0"
+        "eslint": "^8.57.0 || ^9.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.15.0.tgz",
-      "integrity": "sha512-Hqgy/ETgpt2L5xueA/zHHIl4fJI2O4XUE9l4+OIfbJIRSnTJb/QscncdqqZzofQegIJugRIF57OJea1khw2SDw==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.2.0.tgz",
+      "integrity": "sha512-sbgsPMW9yLvS7IhCi8IpuK1oBmtbWUNP+hBdwl/I9nzqVsszGnNGti5r9dUtF5RLivHUFFIdRvLiTsPhzSyJ3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.15.0",
+        "@typescript-eslint/types": "8.2.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
     "node_modules/acorn": {
       "version": "8.12.1",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz",
       "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -435,6 +459,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -444,6 +469,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -483,13 +509,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
       "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -505,6 +533,7 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
       "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -514,6 +543,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
       },
@@ -526,6 +556,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -612,6 +643,7 @@
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -619,18 +651,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/escape-string-regexp": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -644,41 +664,38 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
-      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
+      "version": "9.9.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.9.0.tgz",
+      "integrity": "sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.57.0",
-        "@humanwhocodes/config-array": "^0.11.14",
+        "@eslint-community/regexpp": "^4.11.0",
+        "@eslint/config-array": "^0.17.1",
+        "@eslint/eslintrc": "^3.1.0",
+        "@eslint/js": "9.9.0",
         "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.3.0",
         "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.3.2",
-        "doctrine": "^3.0.0",
         "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^7.2.2",
-        "eslint-visitor-keys": "^3.4.3",
-        "espree": "^9.6.1",
-        "esquery": "^1.4.2",
+        "eslint-scope": "^8.0.2",
+        "eslint-visitor-keys": "^4.0.0",
+        "espree": "^10.1.0",
+        "esquery": "^1.5.0",
         "esutils": "^2.0.2",
         "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^6.0.1",
+        "file-entry-cache": "^8.0.0",
         "find-up": "^5.0.0",
         "glob-parent": "^6.0.2",
-        "globals": "^13.19.0",
-        "graphemer": "^1.4.0",
         "ignore": "^5.2.0",
         "imurmurhash": "^0.1.4",
         "is-glob": "^4.0.0",
         "is-path-inside": "^3.0.3",
-        "js-yaml": "^4.1.0",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
         "lodash.merge": "^4.6.2",
@@ -692,23 +709,32 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
     "node_modules/eslint-scope": {
-      "version": "7.2.2",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz",
+      "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -726,15 +752,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/eslint/node_modules/@eslint/js": {
-      "version": "8.57.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
-      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      }
-    },
     "node_modules/eslint/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -745,6 +762,19 @@
         "concat-map": "0.0.1"
       }
     },
+    "node_modules/eslint/node_modules/eslint-visitor-keys": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
+      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/eslint/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -758,17 +788,31 @@
       }
     },
     "node_modules/espree": {
-      "version": "9.6.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz",
+      "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.12.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^3.4.1"
+        "eslint-visitor-keys": "^4.0.0"
       },
       "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz",
+      "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "url": "https://opencollective.com/eslint"
@@ -791,6 +835,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -812,6 +857,7 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -820,13 +866,15 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
       "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -843,6 +891,7 @@
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -854,7 +903,8 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
@@ -872,15 +922,16 @@
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "flat-cache": "^3.0.4"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16.0.0"
       }
     },
     "node_modules/fill-range": {
@@ -888,6 +939,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -912,51 +964,25 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^10.12.0 || >=12.0.0"
+        "node": ">=16"
       }
     },
     "node_modules/flatted": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
       "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
+      "license": "ISC"
     },
     "node_modules/glob-parent": {
       "version": "6.0.2",
@@ -970,38 +996,14 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/globals": {
-      "version": "13.24.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-      "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+      "version": "14.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+      "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.20.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": ">=8"
+        "node": ">=18"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
@@ -1012,6 +1014,7 @@
       "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -1031,7 +1034,8 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
@@ -1056,6 +1060,7 @@
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -1076,23 +1081,6 @@
         "node": ">=0.8.19"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1119,6 +1107,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -1143,6 +1132,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -1154,13 +1144,15 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -1173,6 +1165,7 @@
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -1216,6 +1209,7 @@
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -1225,6 +1219,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz",
       "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -1238,6 +1233,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -1260,15 +1256,6 @@
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
       "dev": true
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
     "node_modules/optionator": {
       "version": "0.9.4",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -1321,6 +1308,7 @@
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -1337,15 +1325,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -1360,6 +1339,7 @@
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1369,6 +1349,7 @@
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -1390,6 +1371,7 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -1419,6 +1401,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -1433,22 +1416,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/run-parallel": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -1473,10 +1440,11 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -1510,6 +1478,7 @@
       "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1531,6 +1500,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -1561,6 +1531,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -1573,6 +1544,7 @@
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz",
       "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=16"
       },
@@ -1592,23 +1564,12 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-fest": {
-      "version": "0.20.2",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/typescript": {
-      "version": "5.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz",
-      "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -1618,25 +1579,23 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "7.15.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-7.15.0.tgz",
-      "integrity": "sha512-Ta40FhMXBCwHura4X4fncaCVkVcnJ9jnOq5+Lp4lN8F4DzHZtOwZdRvVBiNUGznUDHPwdGnrnwxmUOU2fFQqFA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.2.0.tgz",
+      "integrity": "sha512-DmnqaPcML0xYwUzgNbM1XaKXpEb7BShYf2P1tkUmmcl8hyeG7Pj08Er7R9bNy6AufabywzJcOybQAtnD/c9DGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "7.15.0",
-        "@typescript-eslint/parser": "7.15.0",
-        "@typescript-eslint/utils": "7.15.0"
+        "@typescript-eslint/eslint-plugin": "8.2.0",
+        "@typescript-eslint/parser": "8.2.0",
+        "@typescript-eslint/utils": "8.2.0"
       },
       "engines": {
-        "node": "^18.18.0 || >=20.0.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/typescript-eslint"
       },
-      "peerDependencies": {
-        "eslint": "^8.56.0"
-      },
       "peerDependenciesMeta": {
         "typescript": {
           "optional": true
@@ -1644,16 +1603,18 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.19.8",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
+      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -1682,12 +1643,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
diff --git a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package.json b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package.json
index 2cf9dd7ba054..aa79b4aa50ae 100644
--- a/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package.json
+++ b/supporting_scripts/analysis-of-endpoint-connections/src/main/typeScript/package.json
@@ -6,14 +6,15 @@
   "main": "AnalysisOfEndpointConnectionsClient.ts",
   "license": "MIT",
   "scripts": {
-    "start": "node -r esm AnalysisOfEndpointConnectionsClient.ts"
+    "start": "node -r esm AnalysisOfEndpointConnectionsClient.ts",
+    "update": "ncu -i --format group"
   },
   "devDependencies": {
-    "@eslint/js": "9.8.0",
+    "@eslint/js": "9.9.0",
     "@types/eslint__js": "8.42.3",
-    "@types/node": "22.1.0",
-    "eslint": "9.8",
+    "@types/node": "22.4.2",
+    "eslint": "9.9",
     "typescript": "5.5.4",
-    "typescript-eslint": "8.0.0"
+    "typescript-eslint": "8.2.0"
   }
 }
diff --git a/supporting_scripts/course-scripts/quick-course-setup/README.md b/supporting_scripts/course-scripts/quick-course-setup/README.md
new file mode 100644
index 000000000000..e1622e686272
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/README.md
@@ -0,0 +1,176 @@
+# Artemis Course Setup Scripts
+
+This project contains Python scripts that automate the setup and management of courses and users in an Artemis instance. The scripts help you create a course, generate users, enroll them into courses, and manage programming exercises, including participations and commits. The project is useful for setting up test environments or quickly initializing a course with a large number of students.
+
+# Setup
+
+### 1. Install Python and the Python Plugin for IntelliJ
+
+- Ensure that Python (preferably version 3.12) is installed on your system.
+```shell
+python3.12 --version
+```
+- Install the [Python Plugin for IntelliJ](https://plugins.jetbrains.com/plugin/631-python).
+- Enable Python support in IntelliJ:
+  - Go to `File > Project Structure > Facets > Add - Python`.
+  - Add a Python environment by configuring the Python interpreter. 
+
+    ![IntelliJ Python Facet Configuration](./images/facets-config.png)
+  - Add a module in IntelliJ by navigating to `File > Project Structure > Modules > Add - Python`.
+
+    ![IntelliJ Module Configuration](./images/module-config.png)
+
+### 2. **(Optional)**: Setting Up a Virtual Environment
+
+It is recommended to use a virtual environment to manage dependencies in isolation from the global Python environment. This approach can prevent version conflicts and keep your system environment clean.
+
+- Install `virtualenv` if it's not already installed:
+```shell
+python3.12 -m pip install virtualenv
+```
+
+- Create a virtual environment in your project folder:
+```shell
+python3.12 -m virtualenv venv
+```
+
+- Activate the virtual environment:
+
+- On **Windows**:
+```shell
+venv\Scripts\activate
+```
+
+- On **macOS/Linux**:
+```shell
+source venv/bin/activate
+```
+
+Once the virtual environment is activated, you will see the `(venv)` prefix in your terminal prompt. All dependencies will now be installed locally to this environment.
+
+To install any packages into this virtual environment, proceed with the same steps as described below.
+### 3. Configure the Environment
+
+- Start your local Artemis instance.
+- Configure the [config.ini](./config.ini) file according to your local or test server setup.
+- If packages are missing when running the script, install the necessary Python packages using the following command (replace `<packageName>` with the actual package name and the python version with your used python version):
+
+```shell
+python3.12 -m pip install <packageName>
+```
+# Usage
+
+## Section 1: Create Local Course and Users
+
+These scripts help you configure and set up your first Artemis course quickly.
+
+1. Start your local Artemis instance.
+
+2. Configure the values in [config.ini](./config.ini) according to your setup.
+
+3. Install the missing packages of the Python scripts that you want to execute (if not done already). You can check the [requirements.txt](./requirements.txt) file for the required packages.
+
+4. Run the main script using IntelliJ:
+
+    - Use the play button within IntelliJ (if Python is configured properly).
+    - Alternatively, you can run the script directly from the terminal using the commands provided in this README.
+
+### Creating a Course with Standard User Groups
+
+Creates a course for which the users are registered according to their user groups (students, tutors, editors, instructors).
+
+```shell
+python3 create_course.py
+```
+
+### Create Users
+
+Creates users 1-20 (students, tutors, editors, instructors - 5 for each group).
+    
+```shell
+python3 create_users.py
+```
+
+### Authenticate Users
+
+If the users have already been created, they still need to be logged in order to be added to a course (without a first login, Artemis does not know that the users exist).
+    
+```shell  
+python3 authenticate_all_users.py
+```
+
+## Test Servers
+
+### To configure the scripts for use with Artemis test servers:
+
+1.	Adjust server_url and client_url according to the test server.
+2.  Update admin_user and admin_password to valid values for the test server.
+3.  Set is_local_course in [config.ini](./config.ini) to False.
+
+Create a Course and Assign the Default Users
+
+1-5: students
+6-10: tutors
+11-15: instructors
+16-20: editors
+
+Define the name of your course in the config.ini as course_name.
+
+```shell  
+python3 create_course.py
+```
+
+### Add Users to Existing Course
+
+Define the course_id in the [config.ini](./config.ini).
+
+```shell  
+python3 add_users_to_course.py
+```
+
+## Notes
+
+1.  Ensure that the config.ini file is correctly configured before running any scripts.
+2.  Always test the scripts on a local setup before running them on a production or test server.
+
+## Section 2: Artemis Large Course with Submissions on Programming Exercise Automation
+
+This section details how to use the large_course_main script that orchestrates the entire process, from user creation to course setup, and finally user participation in programming exercises.
+
+### Running the large_course_main Script
+
+The large_course_main script performs all necessary steps to set up a large course with multiple students and submissions.
+
+### Steps to Run:
+
+1. Open the project in IntelliJ. 
+2. Locate the large_course_main.py file in the project directory.
+3. Update the [config.ini](./config.ini) to your needs
+   1. To change the number of students created, modify the students variable in the config.ini file.
+   2. To change the number of commits each student should perform in the example exercise, modify the commits variable in the config.ini file.
+   3. To change the number of programming exercises created, modify the exercises variable in the config.ini file.
+   4. To change the name of programming exercises created, modify the exercise_name variable in the config.ini file.
+   5. To use an existing course, modify the create_course variable to False and provide a valid course_id in the config.ini file.
+   6. To use an existing programming exercise, modify the create_exercises variable to False and provide a valid exercise_Ids in the config.ini file.
+4. You can use the play button within IntelliJ (if Python is configured properly) to run the script.
+```shell
+python3 large_course_main.py
+```
+
+The script will automatically perform all the necessary steps:
+
+1. Authenticate as admin. 
+2. Create students.
+3. Create a course or use an existing one.
+4. Add students to the course. 
+5. Create a programming exercise or use an existing one. 
+6. Add participation and commit for each student.
+
+### Optional: Deleting All Created Students
+
+If you want to delete all the students created by the script:
+
+1.	Run the main in delete_students.py.
+```shell
+python3 delete_students.py
+```
diff --git a/supporting_scripts/course-scripts/quick-course-setup/add_users_to_course.py b/supporting_scripts/course-scripts/quick-course-setup/add_users_to_course.py
new file mode 100644
index 000000000000..68319b23fa39
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/add_users_to_course.py
@@ -0,0 +1,42 @@
+import requests
+import configparser
+from logging_config import logging
+from requests import Session
+
+from utils import login_as_admin, get_user_details_by_index, add_user_to_course, get_student_details_by_index
+
+# Load configuration
+config = configparser.ConfigParser()
+config.read('config.ini')
+
+# Constants from config file
+COURSE_ID: str = config.get('CourseSettings', 'course_id')
+
+def add_users_to_groups_of_course(session: Session, course_id: str) -> None:
+    print(f"Adding users to course with id {course_id}")
+    for userIndex in range(1, 21):
+        user_details = get_user_details_by_index(userIndex)
+        add_user_to_course(session, course_id, user_details["groups"][0], user_details["login"])
+
+def add_students_to_groups_of_course(session: Session, course_id: str, server_url: str, students_to_create: int) -> None:
+    for user_index in range(1, students_to_create):
+        user_details = get_student_details_by_index(user_index)
+        add_students_to_course(session, course_id, user_details["groups"][0], user_details["login"], server_url)
+
+def add_students_to_course(session: Session, course_id: str, user_group: str, user_name: str, server_url: str) -> None:
+    url = f"{server_url}/courses/{course_id}/{user_group}/{user_name}"
+    response = session.post(url)
+    if response.status_code == 200:
+        logging.info(f"Added user {user_name} to group {user_group}")
+    else:
+        logging.error(f"Could not add user {user_name} to group {user_group}")
+
+def main() -> None:
+    session = requests.session()
+    login_as_admin(session)
+    add_users_to_groups_of_course(session, COURSE_ID)
+
+if __name__ == "__main__":
+    # DO ONLY USE FOR LOCAL COURSE SETUP!
+    # (Otherwise users will be created for whom the credentials are public in the repository!)
+    main()
diff --git a/supporting_scripts/course-setup-quickstart/authenticate_all_users.py b/supporting_scripts/course-scripts/quick-course-setup/authenticate_all_users.py
similarity index 61%
rename from supporting_scripts/course-setup-quickstart/authenticate_all_users.py
rename to supporting_scripts/course-scripts/quick-course-setup/authenticate_all_users.py
index 260a4224b4e2..c7aa3571d700 100644
--- a/supporting_scripts/course-setup-quickstart/authenticate_all_users.py
+++ b/supporting_scripts/course-scripts/quick-course-setup/authenticate_all_users.py
@@ -1,10 +1,8 @@
-from utils import authenticate_user
-from utils import get_user_details_by_index
+from utils import authenticate_user, get_user_details_by_index
 
-
-def authenticate_all_generated_users():
+def authenticate_all_generated_users() -> None:
     """
-    Users are only visible in the course once they have logged in for the first time
+    Users are only visible in the course once they have logged in for the first time.
 
     This method logs in the users that are generated in Jira with the script for the Atlassian Setup:
     See https://github.com/ls1intum/Artemis/blob/develop/docker/atlassian/atlassian-setup.sh
@@ -15,15 +13,8 @@ def authenticate_all_generated_users():
         user_details = get_user_details_by_index(user_index)
         authenticate_user(user_details['login'], user_details['password'])
 
-    # login cypress users
-    for user_index in range(100, 107):
-        user_details = get_user_details_by_index(user_index)
-        authenticate_user(user_details['login'], user_details['password'])
-
-
-def main():
+def main() -> None:
     authenticate_all_generated_users()
 
-
 if __name__ == "__main__":
     main()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/config.ini b/supporting_scripts/course-scripts/quick-course-setup/config.ini
new file mode 100644
index 000000000000..1cae1c6d43d8
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/config.ini
@@ -0,0 +1,38 @@
+[Settings]
+students = 2000
+commits = 2
+exercises = 1
+exercise_name = Example Programming Exercise
+
+# should be set to true if the script should create programming exercises otherwise set to false and provide exercise_ids on which the participations and commits should be created
+create_exercises = True
+exercise_Ids = 1,2
+
+server_url = http://localhost:8080/api
+client_url = http://localhost:9000/api
+
+# example urls for test server
+;server_url = https://artemis-test1.artemis.cit.tum.de/api
+;client_url = https://artemis-test1.artemis.cit.tum.de/api
+
+special_character_regex = r'[^a-zA-Z0-9_]'
+
+# make sure to adjust as well for the test server
+admin_user = artemis_admin
+admin_password = artemis_admin
+
+# set the amount of concurrent requests to the server for creating users or deleting them
+max_threads = 5
+
+[CourseSettings]
+# should be set to true if the script should create a course
+create_course = True
+# only needed when adding users to a course after the course was already created
+course_id = 1234
+
+# Modify if you want to change the name of the course created with create_course
+# (e.g. when creating a course on a test server)
+course_name = Local Course
+
+# set to false if creating course on a test server (has an effect on the user groups)
+is_local_course = True
diff --git a/supporting_scripts/course-setup-quickstart/create_course.py b/supporting_scripts/course-scripts/quick-course-setup/create_course.py
similarity index 55%
rename from supporting_scripts/course-setup-quickstart/create_course.py
rename to supporting_scripts/course-scripts/quick-course-setup/create_course.py
index edece49e9fa1..7ec0f270e5ad 100644
--- a/supporting_scripts/course-setup-quickstart/create_course.py
+++ b/supporting_scripts/course-scripts/quick-course-setup/create_course.py
@@ -1,43 +1,42 @@
+import sys
 import requests
 import configparser
 import json
 import urllib3
 import re
-import logging
-
+from logging_config import logging
+from requests import Session
 from utils import login_as_admin
 from add_users_to_course import add_users_to_groups_of_course
 
+# Load configuration
 config = configparser.ConfigParser()
 config.read('config.ini')
 
-server_url = config.get('Settings', 'server_url')
-is_local_course = config.get('CourseSettings', 'is_local_course')
-is_local_course = is_local_course.lower() == 'true'  # convert to boolean
-course_name = config.get('CourseSettings', 'course_name')
-
-special_characters_reg_ex = r'[^a-zA-Z0-9_]'
-
+# Constants from config file
+SERVER_URL: str = config.get('Settings', 'server_url')
+IS_LOCAL_COURSE: bool = config.get('CourseSettings', 'is_local_course').lower() == 'true'  # Convert to boolean
+COURSE_NAME: str = config.get('CourseSettings', 'course_name')
+SPECIAL_CHARACTERS_REGEX: str = config.get('Settings', 'special_character_regex')
 
-def parse_course_name_to_short_name(course_name):
-    short_name = course_name.strip()
-    short_name = short_name.replace(' ', '')
-    short_name = re.sub(special_characters_reg_ex, '', short_name)
+def parse_course_name_to_short_name() -> str:
+    """Parse course name to create a short name, removing special characters."""
+    short_name = COURSE_NAME.strip()
+    short_name = re.sub(SPECIAL_CHARACTERS_REGEX, '', short_name.replace(' ', ''))
 
-    short_name_does_not_start_with_letter = len(short_name) > 0 and not short_name[0].isalpha()
-    if short_name_does_not_start_with_letter:
+    if len(short_name) > 0 and not short_name[0].isalpha():
         short_name = 'a' + short_name
 
     return short_name
 
+def create_course(session: Session) -> requests.Response:
+    """Create a course using the given session."""
+    url = f"{SERVER_URL}/admin/courses"
+    course_short_name = parse_course_name_to_short_name()
 
-def create_course(session):
-    url = f"{server_url}/api/admin/courses"
-
-    course_short_name = parse_course_name_to_short_name(course_name)
     default_course = {
         "id": None,
-        "title": str(course_name),
+        "title": str(COURSE_NAME),
         "shortName": str(course_short_name),
         "customizeGroupNames": False,
         "studentGroupName": None,
@@ -68,9 +67,8 @@ def create_course(session):
         "enrollmentEnabled": False
     }
 
-    if is_local_course:
+    if IS_LOCAL_COURSE:
         default_course["customizeGroupNames"] = True
-        # If it's a local course, use the original group names without the prefix
         default_course["studentGroupName"] = "students"
         default_course["teachingAssistantGroupName"] = "tutors"
         default_course["editorGroupName"] = "editors"
@@ -88,25 +86,29 @@ def create_course(session):
     response = session.post(url, data=body, headers=headers)
 
     if response.status_code == 201:
-        logging.info(f"Created course {course_name} with shortName {course_short_name} \n {response.json()}")
+        logging.info(f"Created course {COURSE_NAME} with shortName {course_short_name} \n {response.json()}")
+    elif response.status_code == 400:
+        logging.info(f"Course with shortName {course_short_name} already exists. Please provide the course ID in the config file and set create_course to FALSE if you intend to add programming exercises to this course.")
+        sys.exit(0)
     else:
-        logging.error("Problem with the group 'students' and interacting with a test server? Is 'is_local_course' in "
-                      "'config.ini' set to 'False'?")
+        logging.error("Problem with the group 'students' and interacting with a test server? "
+                      "Is 'is_local_course' in 'config.ini' set to 'False'?")
         raise Exception(
-            f"Could not create course {course_name}; Status code: {response.status_code}\n Double check whether the courseShortName {course_short_name} is not already used for another course!\nResponse content: {response.text}")
-    return response
+            f"Could not create course {COURSE_NAME}; Status code: {response.status_code}\n"
+            f"Double check whether the courseShortName {course_short_name} is valid (e.g. no special characters such as '-')!\n"
+            f"Response content: {response.text}")
 
+    return response.json()
 
-def main():
+def main() -> None:
+    """Main function to create a course and add users."""
     session = requests.session()
     login_as_admin(session)
-    created_course_response = create_course(session)
 
-    response_data = created_course_response.json()  # This will parse the response content as JSON
+    response_data = create_course(session)
     course_id = response_data["id"]
 
     add_users_to_groups_of_course(session, course_id)
 
-
 if __name__ == "__main__":
     main()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/create_users.py b/supporting_scripts/course-scripts/quick-course-setup/create_users.py
new file mode 100644
index 000000000000..2e702db2e92a
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/create_users.py
@@ -0,0 +1,74 @@
+import requests
+import configparser
+from logging_config import logging
+from requests import Session
+from typing import List, Tuple
+from concurrent.futures import ThreadPoolExecutor
+
+from authenticate_all_users import authenticate_all_generated_users
+from utils import login_as_admin, get_user_details_by_index, get_student_details_by_index
+
+# Load configuration
+config = configparser.ConfigParser()
+config.read('config.ini')
+
+# Constants from config file
+CLIENT_URL: str = config.get('Settings', 'client_url')
+MAX_THREADS: int = int(config.get('Settings', 'max_threads'))
+
+# Store user credentials
+user_credentials: List[Tuple[str, str]] = []
+
+def make_create_user_post_request(session: Session, user_details: dict) -> None:
+    """Send a POST request to create a user."""
+    url = f"{CLIENT_URL}/admin/users"
+    headers = {"Content-Type": "application/json"}
+    response = session.post(url, json=user_details, headers=headers)
+
+    if response.status_code == 201:
+        logging.info(f"{user_details['login']} was created successfully")
+        user_credentials.append((user_details['login'], user_details['password']))
+    elif response.status_code == 400 and "userExists" in response.json().get("errorKey", ""):
+        logging.info(f"User {user_details['login']} already exists.")
+        user_credentials.append((user_details['login'], user_details['password']))
+    else:
+        raise Exception(
+            f"Creating {user_details['login']} failed. Status code: {response.status_code}\n"
+            f"Response content: {response.text}"
+        )
+
+def create_course_users(session: Session) -> None:
+    """Create a predefined set of course users using multithreading."""
+    with ThreadPoolExecutor(max_workers=MAX_THREADS) as executor:
+        for userIndex in range(1, 21):
+            user_details = get_user_details_by_index(userIndex)
+            executor.submit(make_create_user_post_request, session, user_details)
+
+def create_students(session: Session, students_to_create: int) -> None:
+    """Create multiple students using multithreading and store their credentials."""
+    with ThreadPoolExecutor(max_workers=MAX_THREADS) as executor:
+        for user_index in range(1, students_to_create):
+            user_details = get_student_details_by_index(user_index)
+            executor.submit(make_create_user_post_request, session, user_details)
+
+def main() -> None:
+    """Main function to create users and authenticate them."""
+    session = requests.session()
+    login_as_admin(session)
+
+    try:
+        create_course_users(session)
+    except Exception as exception:
+        error_message = str(exception)
+        if "Login name already used!" in error_message:
+            print("Users already created. Continuing ...")
+        else:
+            raise
+
+    create_course_users(session)
+    authenticate_all_generated_users()
+
+if __name__ == "__main__":
+    # DO ONLY USE FOR LOCAL COURSE SETUP!
+    # (Otherwise users will be created for whom the credentials are public in the repository!)
+    main()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/delete_students.py b/supporting_scripts/course-scripts/quick-course-setup/delete_students.py
new file mode 100644
index 000000000000..5b3c4c70b7c7
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/delete_students.py
@@ -0,0 +1,47 @@
+import configparser
+import requests
+from requests import Session
+from logging_config import logging
+from utils import authenticate_user, get_student_details_by_index
+from concurrent.futures import ThreadPoolExecutor  # Add multithreading support
+
+# Load configuration
+config = configparser.ConfigParser()
+config.read('config.ini')
+
+# Constants from config file
+CLIENT_URL: str = config.get('Settings', 'client_url')
+ADMIN_USER: str = config.get('Settings', 'admin_user')
+ADMIN_PASSWORD: str = config.get('Settings', 'admin_password')
+STUDENTS_TO_CREATE: int = int(config.get('Settings', 'students')) + 1
+MAX_THREADS: int = int(config.get('Settings', 'max_threads'))
+
+def delete_all_created_students(session: Session) -> None:
+    authenticate_user(ADMIN_USER, ADMIN_PASSWORD, session)
+    delete_students(session)
+    logging.info(f"Deleted all created students successfully")
+
+def delete_students(session: Session) -> None:
+    """Delete students using multithreading."""
+    with ThreadPoolExecutor(max_workers=MAX_THREADS) as executor:
+        for user_index in range(1, STUDENTS_TO_CREATE):
+            user_details = get_student_details_by_index(user_index)
+            executor.submit(delete_student, session, user_details['login'])
+
+def delete_student(session: Session, username: str) -> None:
+    url = f"{CLIENT_URL}/admin/users/{username}"
+    response = session.delete(url)
+
+    if response.status_code == 200:
+        logging.info(f"User {username} was deleted successfully")
+    elif response.status_code == 404:
+        logging.info(f"User {username} does not exist.")
+    else:
+        logging.error(f"Deleting {username} failed. Status code: {response.status_code}\nResponse content: {response.text}")
+
+def main() -> None:
+    session: Session = requests.session()
+    delete_all_created_students(session)
+
+if __name__ == "__main__":
+    main()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/images/facets-config.png b/supporting_scripts/course-scripts/quick-course-setup/images/facets-config.png
new file mode 100644
index 000000000000..a3708e778e45
Binary files /dev/null and b/supporting_scripts/course-scripts/quick-course-setup/images/facets-config.png differ
diff --git a/supporting_scripts/course-scripts/quick-course-setup/images/module-config.png b/supporting_scripts/course-scripts/quick-course-setup/images/module-config.png
new file mode 100644
index 000000000000..1efd5b70dd9b
Binary files /dev/null and b/supporting_scripts/course-scripts/quick-course-setup/images/module-config.png differ
diff --git a/supporting_scripts/course-scripts/quick-course-setup/large_course_main.py b/supporting_scripts/course-scripts/quick-course-setup/large_course_main.py
new file mode 100644
index 000000000000..37f419b95025
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/large_course_main.py
@@ -0,0 +1,72 @@
+import requests
+import configparser
+from logging_config import logging
+from requests import Session
+from utils import authenticate_user
+from create_course import create_course
+from create_users import create_students, user_credentials
+from add_users_to_course import add_students_to_groups_of_course
+from manage_programming_exercise import create_programming_exercise, add_participation, commit, exercise_Ids
+
+# Load configuration and constants
+config = configparser.ConfigParser()
+config.read('config.ini')
+
+# Constants
+STUDENTS_TO_CREATE: int = int(config.get('Settings', 'students')) + 1
+COMMITS_PER_STUDENT: int = int(config.get('Settings', 'commits'))
+EXERCISES_TO_CREATE: int = int(config.get('Settings', 'exercises'))
+EXERCISES_NAME: str = str(config.get('Settings', 'exercise_name'))
+CREATE_EXERCISES: bool = config.get('Settings', 'create_exercises').lower() == 'true'
+EXERCISE_IDS: list[int] = list(map(int, config.get('Settings', 'exercise_Ids').split(',')))
+
+CLIENT_URL: str = config.get('Settings', 'client_url')
+SERVER_URL: str = config.get('Settings', 'server_url')
+ADMIN_USER: str = config.get('Settings', 'admin_user')
+ADMIN_PASSWORD: str = config.get('Settings', 'admin_password')
+COURSE_NAME: str = config.get('CourseSettings', 'course_name')
+COURSE_ID: str = config.get('CourseSettings', 'course_id')
+CREATE_COURSE: bool = config.get('CourseSettings', 'create_course').lower() == 'true'
+IS_LOCAL_COURSE: bool = config.get('CourseSettings', 'is_local_course').lower() == 'true'
+
+def main() -> None:
+    # Step 1: Authenticate as admin
+    session: Session = requests.session()
+    authenticate_user(ADMIN_USER, ADMIN_PASSWORD, session)
+
+    # Step 2: Create users
+    create_students(session, STUDENTS_TO_CREATE)
+
+    # Step 3: Create a course or use an existing one
+    if CREATE_COURSE:
+        response_data = create_course(session)
+        course_id: str = response_data["id"]
+    else:
+        course_id: str = str(COURSE_ID)
+
+    # Step 4: Add users to the course
+    add_students_to_groups_of_course(session, course_id, SERVER_URL, STUDENTS_TO_CREATE)
+
+    # Step 5: Create programming exercises or use existing ones
+    if CREATE_EXERCISES:
+        create_programming_exercise(session, course_id, SERVER_URL, EXERCISES_TO_CREATE, EXERCISES_NAME)
+    else:
+        exercise_Ids.extend(EXERCISE_IDS)
+
+    # Step 6: Add participation and commit for each user
+    logging.info("Created users and their credentials:")
+
+    for username, password in user_credentials:
+        user_session: Session = requests.Session()
+        authenticate_user(username, password, user_session)
+
+        for exercise_Id in exercise_Ids:
+            participation_response = add_participation(user_session, exercise_Id, CLIENT_URL)
+            logging.info(f"Added participation for {username} in the programming exercise {exercise_Id} successfully")
+            participation_id: int = participation_response.get('id')
+
+            commit(user_session, participation_id, CLIENT_URL, COMMITS_PER_STUDENT)
+            logging.info(f"Added commit for {username} in the programming exercise {exercise_Id} successfully")
+
+if __name__ == "__main__":
+    main()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/logging_config.py b/supporting_scripts/course-scripts/quick-course-setup/logging_config.py
new file mode 100644
index 000000000000..10f8bd863ac6
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/logging_config.py
@@ -0,0 +1,4 @@
+import logging
+
+# Configure logging
+logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
diff --git a/supporting_scripts/course-scripts/quick-course-setup/manage_programming_exercise.py b/supporting_scripts/course-scripts/quick-course-setup/manage_programming_exercise.py
new file mode 100644
index 000000000000..49b722e8a4d0
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/manage_programming_exercise.py
@@ -0,0 +1,68 @@
+import sys
+from logging_config import logging
+from typing import Dict, Any
+from requests import Session
+
+exercise_Ids: list[int] = []
+
+def create_programming_exercise(session: Session, course_id: int, server_url: str, exercises_to_create: int, exercise_name: str) -> None:
+    """Create multiple programming exercises for the course."""
+    for i in range(exercises_to_create):
+        url: str = f"{server_url}/programming-exercises/setup"
+        headers: Dict[str, str] = {"Content-Type": "application/json"}
+        short_name_index: int = i + 1
+
+        default_programming_exercise: Dict[str, Any] = {
+            "type": "programming",
+            "title": f"{exercise_name} {short_name_index}",
+            "shortName": f"ExProgEx{short_name_index}",
+            "course": {"id": course_id},
+            "programmingLanguage": "JAVA",
+            "projectType": "PLAIN_GRADLE",
+            "allowOnlineEditor": True,
+            "allowOfflineIde": True,
+            "maxPoints": 100,
+            "assessmentType": "AUTOMATIC",
+            "packageName": "de.tum.in.www1.example",
+            "staticCodeAnalysisEnabled": False,
+            "buildConfig": {
+                "buildScript": "#!/usr/bin/env bash\nset -e\n\ngradle () {\n  echo '⚙️ executing gradle'\n  chmod +x ./gradlew\n  ./gradlew clean test\n}\n\nmain () {\n  gradle\n}\n\nmain \"${@}\"\n",
+                "checkoutSolutionRepository": False,
+                "testwiseCoverageEnabled": False
+            },
+        }
+
+        response = session.post(url, json=default_programming_exercise, headers=headers)
+
+        if response.status_code == 201:
+            logging.info(f"Created programming exercise {default_programming_exercise['title']} successfully")
+            exercise_Ids.append(response.json().get('id'))
+        elif response.status_code == 400:
+            logging.info(f"Programming exercise with shortName {default_programming_exercise['shortName']} already exists. Please provide the exercise IDs in the config file and set create_exercises to FALSE.")
+            sys.exit(0)
+        else:
+            raise Exception(f"Could not create programming exercise; Status code: {response.status_code}\nResponse content: {response.text}")
+
+def add_participation(session: Session, exercise_id: int, client_url: str) -> Dict[str, Any]:
+    """Add a participation for the exercise."""
+    url: str = f"{client_url}/exercises/{exercise_id}/participations"
+    headers: Dict[str, str] = {"Content-Type": "application/json"}
+
+    response = session.post(url, headers=headers)
+    if response.status_code == 201:
+        return response.json()
+    elif response.status_code == 403:
+        logging.info(f"Not allowed to push to following programming exercise with following id: {exercise_id}. Please double check if the exercise is part of the Course and update the exercise_Ids in the config file.")
+        sys.exit(0)
+    else:
+        response.raise_for_status()
+
+def commit(session: Session, participation_id: int, client_url: str, commits_per_student: int) -> None:
+    """Commit the participation to the repository multiple times."""
+    for _ in range(commits_per_student):
+        url: str = f"{client_url}/repository/{participation_id}/commit"
+        headers: Dict[str, str] = {"Content-Type": "application/json"}
+
+        response = session.post(url, headers=headers)
+        if response.status_code != 201:
+            response.raise_for_status()
diff --git a/supporting_scripts/course-scripts/quick-course-setup/requirements.txt b/supporting_scripts/course-scripts/quick-course-setup/requirements.txt
new file mode 100644
index 000000000000..b5ae1f7da8ca
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/requirements.txt
@@ -0,0 +1,11 @@
+certifi==2024.7.4
+charset-normalizer==3.3.2
+idna==3.8
+numpy==1.26.4
+pandas==2.2.1
+python-dateutil==2.9.0.post0
+pytz==2024.1
+requests==2.32.3
+six==1.16.0
+tzdata==2024.1
+urllib3==2.2.2
diff --git a/supporting_scripts/course-scripts/quick-course-setup/utils.py b/supporting_scripts/course-scripts/quick-course-setup/utils.py
new file mode 100644
index 000000000000..f6fd5f81d776
--- /dev/null
+++ b/supporting_scripts/course-scripts/quick-course-setup/utils.py
@@ -0,0 +1,103 @@
+import requests
+import configparser
+from logging_config import logging
+from typing import Dict, Any, List
+
+config = configparser.ConfigParser()
+config.read('config.ini')
+
+SERVER_URL: str = config.get('Settings', 'server_url')
+ADMIN_USER: str = config.get('Settings', 'admin_user')
+ADMIN_PASSWORD: str = config.get('Settings', 'admin_password')
+
+def login_as_admin(session: requests.Session) -> None:
+    """Authenticate as an admin using the provided session."""
+    authenticate_user(ADMIN_USER, ADMIN_PASSWORD, session)
+
+def add_user_to_course(session: requests.Session, course_id: int, user_group: str, user_name: str) -> None:
+    """Add a user to a specified course and group."""
+    url: str = f"{SERVER_URL}/courses/{course_id}/{user_group}/{user_name}"
+    response: requests.Response = session.post(url)
+    if response.status_code == 200:
+        logging.info(f"Added user {user_name} to group {user_group}")
+    else:
+        logging.error(f"Could not add user {user_name} to group {user_group}")
+
+def authenticate_user(username: str, password: str, session: requests.Session = requests.Session()) -> requests.Response:
+    """Authenticate a user and return the session response."""
+    url: str = f"{SERVER_URL}/public/authenticate"
+    headers: Dict[str, str] = {
+        "Content-Type": "application/json"
+    }
+
+    payload: Dict[str, Any] = {
+        "username": username,
+        "password": password,
+        "rememberMe": True
+    }
+
+    response: requests.Response = session.post(url, json=payload, headers=headers)
+
+    if response.status_code == 200:
+        logging.info(f"Authentication successful for user {username}")
+    else:
+        raise Exception(
+            f"Authentication failed for user {username}. Status code: {response.status_code}\n Response content: {response.text}")
+
+    return response
+
+def get_user_details_by_index(user_index: int) -> Dict[str, Any]:
+    """Generate user details based on the index for predefined users."""
+    username: str = f"artemis_test_user_{user_index}"
+    password: str = username
+    authorities: List[str] = []
+    groups: List[str] = []
+
+    user_role: str = "ROLE_USER"
+
+    if 1 <= user_index <= 5 or user_index in {100, 102, 104, 105, 106}:
+        authorities = [user_role]
+        groups = ["students"]
+    elif 6 <= user_index <= 10 or user_index == 101:
+        authorities = [user_role, "ROLE_TA"]
+        groups = ["tutors"]
+    elif 11 <= user_index <= 15:
+        authorities = [user_role, "ROLE_EDITOR"]
+        groups = ["editors"]
+    elif 16 <= user_index <= 20 or user_index == 103:
+        authorities = [user_role, "ROLE_INSTRUCTOR"]
+        groups = ["instructors"]
+
+    return {
+        "activated": True,
+        "authorities": authorities,
+        "login": username,
+        "email": f"{username}@artemis.local",
+        "firstName": username,
+        "lastName": username,
+        "langKey": "en",
+        "guidedTourSettings": [],
+        "groups": groups,
+        "password": password
+    }
+
+def get_student_details_by_index(user_index: int) -> Dict[str, Any]:
+    """Generate user details based on the index for students."""
+    username: str = f"student{user_index}"
+    password: str = "Password123!"
+    user_role: str = "ROLE_USER"
+    authorities: List[str] = [user_role]
+    groups: List[str] = ["students"]
+
+    return {
+        "activated": True,
+        "authorities": authorities,
+        "login": username,
+        "email": f"{username}@example.com",
+        "firstName": "Test",
+        "lastName": f"User{user_index}",
+        "langKey": "en",
+        "guidedTourSettings": [],
+        "groups": groups,
+        "password": password
+    }
diff --git a/supporting_scripts/course-setup-quickstart/README.md b/supporting_scripts/course-setup-quickstart/README.md
deleted file mode 100644
index e336de857d4a..000000000000
--- a/supporting_scripts/course-setup-quickstart/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# Create local course and users
-
-Scripts in this folder help to configure and setup your first Artemis course to get started quickly.
-
-## Setup
-
-1. Install the [Python Plugin for IntelliJ](https://plugins.jetbrains.com/plugin/631-python)
-
-2. Enable Python support in your IntelliJ
-
-   `File > Project Structure > Facets > Add - Python` (press the + and add a Python environment there,
-   make sure that you have configured the Python interpreter)
-
-   ![IntelliJ Python Facet Configuration](./images/facets-config.png)
-
-   If not added automatically by IntelliJ, add a module:
-   `File > Project Structure > Modules > Add - Python`
-
-   ![IntelliJ Module Configuration](./images/module-config.png)
-
-_Tested on Python 3.7 & 3.9, other versions might work as well._
-
-## Usage
-
-1. Start your local Artemis instance
-2. Configure the values in `config.ini` according to your setup
-3. Install the missing packages of the Python scripts that you want to execute
-
-   _Make sure to install it for the Python version that was configured in [Setup](#setup). 
-   Installing packages for a certain Python version can be done with_
-   ```shell
-   python3.9 -m pip install <packageName>
-   ```
-
-4. Either use the play button within IntelliJ _(which should be displayed if Python was configured properly within
-   IntelliJ)_ to run the scripts or follow the following descriptions
-
-### Local Setup
-
-#### Create a course with standard user groups
-
-Creates a course for which the users from the previous section [Create users](#create-users) are registered as they have
-the same user
-groups (students, tutors, editors, instructors)
-
-```shell
-python3 create_course.py
-```
-
-You can also execute the following scripts on their own (not needed if `create_course.py` was executed)
-
-##### Create users
-
-Creates users 1-20 (students, tutors, editors, instructors - 5 for each group) and users needed for Cypress E2E
-testing (100-106)
-
-```shell
-python3 create_users.py
-```
-
-##### Authenticate users
-
-If the users have already been created, they still need to be logged in order to be added to a
-course _(without a first login, Artemis does not know that the users exist)_
-
-```shell
-python3 authenticate_all_users.py
-```
-
-### Test Servers
-
-Re-Configure the `config.ini`
-
-1. Adjust `server_url` and `client_url` according to the test server
-2. Make sure to upate `admin_user` and `admin_password` to valid values for the test server
-3. As we are interacting with the test servers, set `is_local_course` in `config.ini` to `False`
-
-#### Create a course and assign the default users
-
-1-5: students
-6-10: tutors
-11-15: instructors
-16-20: editors
-
-Define the name of your course in the `config.ini` as `course_name`
-
-```shell
-python3 create_course.py
-```
-
-#### Add users to existing course
-
-Define the `course_id` in the `config.ini`
-
-```shell
-python3 add_users_to_course.py
-```
diff --git a/supporting_scripts/course-setup-quickstart/add_users_to_course.py b/supporting_scripts/course-setup-quickstart/add_users_to_course.py
deleted file mode 100644
index 8ad9f0544b41..000000000000
--- a/supporting_scripts/course-setup-quickstart/add_users_to_course.py
+++ /dev/null
@@ -1,30 +0,0 @@
-import requests
-import configparser
-
-from utils import login_as_admin
-from utils import get_user_details_by_index
-from utils import add_user_to_course
-
-config = configparser.ConfigParser()
-config.read('config.ini')
-
-course_id = config.get('CourseSettings', 'course_id')
-
-
-def add_users_to_groups_of_course(session, course_id):
-    print(f"Adding users to course with id {course_id}")
-    for userIndex in range(1, 21):
-        user_details = get_user_details_by_index(userIndex)
-        add_user_to_course(session, course_id, user_details["groups"][0], user_details["login"])
-
-
-def main():
-    session = requests.session()
-    login_as_admin(session)
-    add_users_to_groups_of_course(session, course_id)
-
-
-if __name__ == "__main__":
-    # DO ONLY USE FOR LOCAL COURSE SETUP!
-    # (Otherwise users will be created for whom the credentials are public in the repository!)
-    main()
diff --git a/supporting_scripts/course-setup-quickstart/config.ini b/supporting_scripts/course-setup-quickstart/config.ini
deleted file mode 100644
index d52abdfbef39..000000000000
--- a/supporting_scripts/course-setup-quickstart/config.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-[Settings]
-server_url = http://localhost:8080
-client_url = http://localhost:9000
-
-# example urls for test server
-;server_url = https://artemis-test1.artemis.cit.tum.de
-;client_url = https://artemis-test1.artemis.cit.tum.de
-
-# make sure to adjust aswell for the test server
-admin_user = artemis_admin
-admin_password = artemis_admin
-
-
-[CourseSettings]
-# only needed when adding users to a course after the course was already created
-course_id = 1234
-
-# Modify if you want to change the name of the course created with create_course
-# (e.g. when creating a course on a test server)
-course_name = Local Course
-
-# set to false if creating course on a test server (has an effect on the user groups)
-is_local_course = True
diff --git a/supporting_scripts/course-setup-quickstart/create_users.py b/supporting_scripts/course-setup-quickstart/create_users.py
deleted file mode 100644
index 42d909de7603..000000000000
--- a/supporting_scripts/course-setup-quickstart/create_users.py
+++ /dev/null
@@ -1,70 +0,0 @@
-import requests
-import configparser
-import logging
-
-from authenticate_all_users import authenticate_all_generated_users
-from utils import login_as_admin
-from utils import get_user_details_by_index
-
-config = configparser.ConfigParser()
-config.read('config.ini')
-
-client_url = config.get('Settings', 'client_url')
-
-
-def make_create_user_post_request(session, user_details):
-    url = f"{client_url}/api/admin/users"
-    headers = {
-        "Content-Type": "application/json"
-    }
-    payload = user_details
-    response = session.post(url, json=payload, headers=headers)
-
-    if response.status_code == 201:
-        logging.info(f"{user_details['login']} was created successfully")
-    elif response.status_code == 400 and "userExists" in response.json().get("errorKey", ""):
-        logging.info(f"User {user_details['login']} already exists.")
-    else:
-        raise Exception(
-            f"Creating {user_details['login']} failed. Status code: {response.status_code}\nResponse content: {response.text}")
-
-
-def create_course_users(session):
-    for userIndex in range(1, 21):
-        user_details = get_user_details_by_index(userIndex)
-        make_create_user_post_request(session, user_details)
-
-
-def create_cypress_users(session):
-    for userIndex in range(100, 107):
-        user_details = get_user_details_by_index(userIndex)
-        make_create_user_post_request(session, user_details)
-
-
-def create_users(session):
-    create_course_users(session)
-    create_cypress_users(session)
-
-
-def main():
-    session = requests.session()
-    login_as_admin(session)
-
-    try:
-        create_users(session)
-    except Exception as exception:
-        error_message = str(exception)
-
-        if "Login name already used!" in error_message:
-            print("Users already created. Continuing ...")
-        else:
-            raise
-
-    create_users(session)
-    authenticate_all_generated_users()
-
-
-if __name__ == "__main__":
-    # DO ONLY USE FOR LOCAL COURSE SETUP!
-    # (Otherwise users will be created for whom the credentials are public in the repository!)
-    main()
diff --git a/supporting_scripts/course-setup-quickstart/images/facets-config.png b/supporting_scripts/course-setup-quickstart/images/facets-config.png
deleted file mode 100644
index 5f5ffbd0bbc5..000000000000
Binary files a/supporting_scripts/course-setup-quickstart/images/facets-config.png and /dev/null differ
diff --git a/supporting_scripts/course-setup-quickstart/images/module-config.png b/supporting_scripts/course-setup-quickstart/images/module-config.png
deleted file mode 100644
index ed0bd3193938..000000000000
Binary files a/supporting_scripts/course-setup-quickstart/images/module-config.png and /dev/null differ
diff --git a/supporting_scripts/course-setup-quickstart/utils.py b/supporting_scripts/course-setup-quickstart/utils.py
deleted file mode 100644
index 88e8f6144d4b..000000000000
--- a/supporting_scripts/course-setup-quickstart/utils.py
+++ /dev/null
@@ -1,81 +0,0 @@
-import requests
-import configparser
-import logging
-
-config = configparser.ConfigParser()
-config.read('config.ini')
-
-server_url = config.get('Settings', 'server_url')
-admin_user = config.get('Settings', 'admin_user')
-admin_password = config.get('Settings', 'admin_password')
-
-
-def login_as_admin(session):
-    authenticate_user(admin_user, admin_password, session)
-
-
-def add_user_to_course(session, course_id, user_group, user_name):
-    url = f"{server_url}/api/courses/{course_id}/{user_group}/{user_name}"
-    response = session.post(url)
-    if response.status_code == 200:
-        logging.info(f"Added user {user_name} to group {user_group}")
-    else:
-        logging.error(f"Could not add user {user_name} to group {user_group}")
-
-
-def authenticate_user(username, password, session=requests.Session()):
-    url = f"{server_url}/api/public/authenticate"
-    headers = {
-        "Content-Type": "application/json"
-    }
-
-    payload = {
-        "username": username,
-        "password": password,
-        "rememberMe": True
-    }
-
-    response = session.post(url, json=payload, headers=headers)
-
-    if response.status_code == 200:
-        logging.info(f"Authentication successful for user {username}")
-    else:
-        raise Exception(
-            f"Authentication failed for user {username}. Status code: {response.status_code}\n Response content: {response.text}")
-
-    return response
-
-
-def get_user_details_by_index(user_index):
-    username = f"artemis_test_user_{user_index}"
-    password = username
-    authorities = []
-    groups = []
-
-    user_role = "ROLE_USER"
-
-    if 1 <= user_index <= 5 or user_index in {100, 102, 104, 105, 106}:
-        authorities = [user_role]
-        groups = ["students"]
-    elif 6 <= user_index <= 10 or user_index == 101:
-        authorities = [user_role, "ROLE_TA"]
-        groups = ["tutors"]
-    elif 11 <= user_index <= 15:
-        authorities = [user_role, "ROLE_EDITOR"]
-        groups = ["editors"]
-    elif 16 <= user_index <= 20 or user_index == 103:
-        authorities = [user_role, "ROLE_INSTRUCTOR"]
-        groups = ["instructors"]
-
-    return {
-        "activated": True,
-        "authorities": authorities,
-        "login": username,
-        "email": username + "@artemis.local",
-        "firstName": username,
-        "lastName": username,
-        "langKey": "en",
-        "guidedTourSettings": [],
-        "groups": groups,
-        "password": password
-    }
diff --git a/supporting_scripts/generate_code_cov_table/README.md b/supporting_scripts/generate_code_cov_table/README.md
index 925e16d3d61c..1953c39aef5a 100644
--- a/supporting_scripts/generate_code_cov_table/README.md
+++ b/supporting_scripts/generate_code_cov_table/README.md
@@ -7,7 +7,7 @@ The generated report is copied to the clipboard and pasted into a pull request o
 
 ### Prerequisites
 
-- Python 3.6 or higher
+- Python 3.12 or higher
 - pip
 - git
 
diff --git a/supporting_scripts/generate_code_cov_table/requirements.txt b/supporting_scripts/generate_code_cov_table/requirements.txt
index 7472e56611de..78379bda1531 100644
--- a/supporting_scripts/generate_code_cov_table/requirements.txt
+++ b/supporting_scripts/generate_code_cov_table/requirements.txt
@@ -1,6 +1,6 @@
-requests==2.31.0
-gitpython==3.1.41
-beautifulsoup4==4.12.2
-pyperclip==1.8.2
-python-dotenv==1.0.0
-tqdm==4.65.0
+requests==2.32.3
+gitpython==3.1.43
+beautifulsoup4==4.12.3
+pyperclip==1.9.0
+python-dotenv==1.0.1
+tqdm==4.66.5