diff --git a/.ci/E2E-tests/execute.sh b/.ci/E2E-tests/execute.sh
index 971d05dea8a6..a75ebfb382e2 100755
--- a/.ci/E2E-tests/execute.sh
+++ b/.ci/E2E-tests/execute.sh
@@ -23,12 +23,3 @@ cd docker
 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
-exitCode=$?
-cd ..
-echo "Cypress container exit code: $exitCode"
-if [ $exitCode -eq 0 ]
-then
-    touch .successful
-else
-    echo "Not creating success file because the tests failed"
-fi
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8d07af38982d..5e0eb0a988fd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -120,14 +120,14 @@ jobs:
       uses: docker/setup-buildx-action@v3
     # Build and Push to GitHub Container Registry
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       if: ${{ steps.compute-tag.outputs.result != 'FALSE' }}
       with:
         registry: ghcr.io
         username: ${{ github.repository_owner }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and Push to GitHub Container Registry
-      uses: docker/build-push-action@v4
+      uses: docker/build-push-action@v5
       if: ${{ steps.compute-tag.outputs.result != 'FALSE' }}
       with:
         # beware that the linux/arm64 build from the registry is using an amd64 compiled .war file as
diff --git a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__IRIS_.xml b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__IRIS_.xml
index 9e1aa86981de..00e4e1f2b43d 100644
--- a/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__IRIS_.xml
+++ b/.idea/runConfigurations/Artemis__Server__LocalVC___LocalCI__IRIS_.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="Artemis (Server, LocalVC &amp; LocalCI, IRIS)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
     <option name="ACTIVE_PROFILES" value="dev,localci,localvc,artemis,scheduling,local,iris" />
     <option name="ALTERNATIVE_JRE_PATH" value="17" />
-    <module name="de.tum.in.www1.artemis.Artemis.main" />
+    <module name="Artemis.main" />
     <option name="SHORTEN_COMMAND_LINE" value="MANIFEST" />
     <option name="SPRING_BOOT_MAIN_CLASS" value="de.tum.in.www1.artemis.ArtemisApp" />
     <option name="VM_PARAMETERS" value="-Duser.country=US -Duser.language=en" />
diff --git a/README.md b/README.md
index 73b97ae88f5e..69f118e11e07 100644
--- a/README.md
+++ b/README.md
@@ -41,10 +41,11 @@
 15. **[Learning analytics](https://ls1intum.github.io/Artemis/user/learning-analytics/)**: Artemis integrated different statistics for students to compare themselves to the course average. It allows instructors to evaluate the average student performance based on exercises and competencies.
 16. **[Adaptive Learning](https://ls1intum.github.io/Artemis/user/adaptive-learning/)**: Artemis allows instructors and students to define and track competencies. Students can monitor their progress towards these goals, while instructors can provide tailored feedback. This approach integrates lectures and exercises under overarching learning objectives.
 17. **[Tutorial Groups](https://ls1intum.github.io/Artemis/user/tutorialgroups/)**: Artemis support the management of tutorial groups of a course. This includes planning the sessions, assigning responsible tutors, registering students and tracking the attendance.
-18. **[Scalable](https://ls1intum.github.io/Artemis/user/scaling/)**: Artemis scales to multiple courses with thousands of students. In fact, the largest course had 2,400 students. Administrators can easily scale Artemis with additional build agents in the continuous integration environment.
-19. **[High user satisfaction](https://ls1intum.github.io/Artemis/user/user-experience/)**: Artemis is easy to use, provides guided tutorials. Developers focus on usability, user experience, and performance.
-20. **Customizable**: It supports multiple instructors, editors, and tutors per course and allows instructors to customize many course settings
-21. **[Open-source](https://ls1intum.github.io/Artemis/dev/open-source/)**: Free to use with a large community and many active maintainers.
+18. **[Iris](https://artemis.cit.tum.de/about-iris)**: Artemis integrates Iris, a chatbot that supports students and instructors with common questions and tasks.
+19. **[Scalable](https://ls1intum.github.io/Artemis/user/scaling/)**: Artemis scales to multiple courses with thousands of students. In fact, the largest course had 2,400 students. Administrators can easily scale Artemis with additional build agents in the continuous integration environment.
+20. **[High user satisfaction](https://ls1intum.github.io/Artemis/user/user-experience/)**: Artemis is easy to use, provides guided tutorials. Developers focus on usability, user experience, and performance.
+21. **Customizable**: It supports multiple instructors, editors, and tutors per course and allows instructors to customize many course settings
+22. **[Open-source](https://ls1intum.github.io/Artemis/dev/open-source/)**: Free to use with a large community and many active maintainers.
 
 ## Roadmap
 
diff --git a/build.gradle b/build.gradle
index bd20786608f9..3bdc2417e108 100644
--- a/build.gradle
+++ b/build.gradle
@@ -246,10 +246,10 @@ dependencies {
     implementation "org.imsglobal:basiclti-util:1.2.0"
     implementation "org.jasypt:jasypt:1.9.3"
     implementation "me.xdrop:fuzzywuzzy:1.4.0"
-    implementation "com.atlassian.bamboo:bamboo-specs:9.2.1"
+    implementation "com.atlassian.bamboo:bamboo-specs:9.3.3"
     implementation ("org.yaml:snakeyaml") {
         version {
-            strictly "1.33" // needed for Bamboo-specs and to reduce the number of vulnerabilities, also see https://mvnrepository.com/artifact/org.yaml/snakeyaml
+            strictly "2.0" // needed for Bamboo-specs and to reduce the number of vulnerabilities, also see https://mvnrepository.com/artifact/org.yaml/snakeyaml
         }
     }
 
@@ -346,6 +346,7 @@ dependencies {
     implementation "org.commonmark:commonmark:0.21.0"
     implementation "commons-fileupload:commons-fileupload:1.5"
     implementation "net.lingala.zip4j:zip4j:2.11.5"
+    implementation "org.jgrapht:jgrapht-core:1.5.2"
 
 
     annotationProcessor "org.hibernate:hibernate-jpamodelgen:${hibernate_version}"
diff --git a/docker/atlassian.yml b/docker/atlassian.yml
index 592f282eb790..6b8e33418747 100644
--- a/docker/atlassian.yml
+++ b/docker/atlassian.yml
@@ -11,7 +11,7 @@ services:
         image: ghcr.io/ls1intum/artemis-jira:9.4.3
         pull_policy: always
         volumes:
-          - artemis-jira-data:/var/atlassian/application-data/jira
+            - artemis-jira-data:/var/atlassian/application-data/jira
         ports:
             - "8081:8080"
         # expose the port to make it reachable docker internally even if the external port mapping changes
@@ -24,7 +24,7 @@ services:
         hostname: bitbucket
         extra_hosts:
             - "host.docker.internal:host-gateway"
-        image: ghcr.io/ls1intum/artemis-bitbucket:8.8.2
+        image: ghcr.io/ls1intum/artemis-bitbucket:8.13.1
         pull_policy: always
         volumes:
             - artemis-bitbucket-data:/var/atlassian/application-data/bitbucket
@@ -44,7 +44,7 @@ services:
         hostname: bamboo
         extra_hosts:
             - "host.docker.internal:host-gateway"
-        image: ghcr.io/ls1intum/artemis-bamboo:9.2.1
+        image: ghcr.io/ls1intum/artemis-bamboo:9.3.3
         pull_policy: always
         volumes:
             - artemis-bamboo-data:/var/atlassian/application-data/bamboo
@@ -57,6 +57,12 @@ services:
             - "8085"
         networks:
             - artemis
+        healthcheck:
+            test: curl -f http://localhost:8085/rest/api/latest/server | grep "<state>RUNNING</state>"
+            interval: 10s
+            timeout: 5s
+            start_period: 40s
+            retries: 120 # = 20 minutes startup time during setup
 
     bamboo-build-agent:
         container_name: artemis-bamboo-build-agent
@@ -74,6 +80,9 @@ services:
             BAMBOO_SERVER: "http://bamboo:8085"
         networks:
             - artemis
+        depends_on:
+            bamboo:
+                condition: service_healthy
 
 networks:
     artemis:
diff --git a/docs/dev/development-process.rst b/docs/dev/development-process.rst
index 4206185d1849..b5e073fb9da4 100644
--- a/docs/dev/development-process.rst
+++ b/docs/dev/development-process.rst
@@ -12,7 +12,8 @@ Naming Conventions for GitHub Pull Requests
 1. The first term is a main feature of Artemis and is using code highlighting, e.g.  “``Programming exercises``:”.
 
     1. Possible feature tags are: ``Programming exercises``, ``Quiz exercises``, ``Modeling exercises``, ``Text exercises``, ``File upload exercises``, ``Exam mode``,
-       ``Grading``, ``Assessment``, ``Communication``, ``Notifications``, ``Team exercises``, ``Lectures``, ``Plagiarism checks``, ``Learning analytics``, ``Adaptive learning``, ``Tutorial groups``.
+       ``Grading``, ``Assessment``, ``Communication``, ``Notifications``, ``Team exercises``, ``Lectures``, ``Plagiarism checks``, ``Learning analytics``,
+       ``Adaptive learning``, ``Tutorial groups``, ``Iris``.
     2. If the change is not visible to end users, or it is a pure development or test improvement, we use the term “``Development``:”.
     3. Everything else belongs to the ``General`` category.
 
diff --git a/docs/dev/setup/bamboo-bitbucket-jira.rst b/docs/dev/setup/bamboo-bitbucket-jira.rst
index d198da3c60c7..11e7bbb7605d 100644
--- a/docs/dev/setup/bamboo-bitbucket-jira.rst
+++ b/docs/dev/setup/bamboo-bitbucket-jira.rst
@@ -369,8 +369,8 @@ Configure Artemis
       server:
           port: 8080                                         # The port of artemis
           url: http://172.20.0.1:8080                        # needs to be an ip
-          // url: http://docker.for.mac.host.internal:8080   # If the above one does not work for mac try this one
-          // url: http://host.docker.internal:8080           # If the above one does not work for windows try this one
+          # url: http://docker.for.mac.host.internal:8080   # If the above one does not work for mac try this one
+          # url: http://host.docker.internal:8080           # If the above one does not work for windows try this one
 
 In addition, you have to start Artemis with the profiles ``bamboo``,
 ``bitbucket`` and ``jira`` so that the correct adapters will be used,
diff --git a/docs/dev/setup/jenkins-gitlab.rst b/docs/dev/setup/jenkins-gitlab.rst
index 9c9e7f395c85..1390aec98bbb 100644
--- a/docs/dev/setup/jenkins-gitlab.rst
+++ b/docs/dev/setup/jenkins-gitlab.rst
@@ -125,11 +125,16 @@ both are set up correctly and follow these steps:
         INSERT INTO `artemis`.`jhi_user_authority` (`user_id`, `authority_name`) VALUES (1,"ROLE_ADMIN");
         INSERT INTO `artemis`.`jhi_user_authority` (`user_id`, `authority_name`) VALUES (1,"ROLE_USER");
 
-4. Create a user in Gitlab (``http://your-gitlab-domain/admin/users/new``) and make sure that the username,
-email, and password are the same as the user from the database:
+4. Create a user in Gitlab (``http://your-gitlab-domain/admin/users/new``) and make sure that the username and
+email are the same as the user from the database:
 
 .. figure:: setup/jenkins-gitlab/gitlab_admin_user.png
 
+5. Edit the new admin user (``http://your-gitlab-domain/admin/users/artemis_admin/edit``) to set the password to the
+same value as in the database:
+
+.. figure:: setup/jenkins-gitlab/gitlab_admin_user_password.png
+
 Starting the Artemis server should now succeed.
 
 GitLab
@@ -188,9 +193,9 @@ tokens instead of the predefined ones.
 
    ::
 
-        docker compose -f docker/<Jenkins setup to be launched>.yml exec gitlab gitlab-rails runner "token = User.find_by_username('root').personal_access_tokens.create(scopes: [:api, :read_user, :read_api, :read_repository, :write_repository, :sudo], name: 'Artemis Admin Token'); token.set_token('artemis-gitlab-token'); token.save!"
+        docker compose -f docker/<Jenkins setup to be launched>.yml exec gitlab gitlab-rails runner "token = User.find_by_username('root').personal_access_tokens.create(scopes: ['api', 'read_api', 'read_user', 'read_repository', 'write_repository', 'sudo'], name: 'Artemis Admin Token', expires_at: 365.days.from_now); token.set_token('artemis-gitlab-token'); token.save!"
 
-   | You can also manually create in by navigating to ``http://localhost:8081/-/profile/personal_access_tokens`` and
+   | You can also manually create in by navigating to ``http://localhost:8081/-/profile/personal_access_tokens?name=Artemis+Admin+token&scopes=api,read_api,read_user,read_repository,write_repository,sudo`` and
      generate a token with all scopes.
    | Copy this token into the ``ADMIN_PERSONAL_ACCESS_TOKEN`` field in the
      ``docker/gitlab/gitlab-local-setup.sh`` file.
@@ -325,7 +330,7 @@ GitLab Access Token
    .. figure:: setup/jenkins-gitlab/gitlab_access_tokens_button.png
       :align: center
 
-10. Create a new token named “Artemis” and give it **all** rights.
+10. Create a new token named “Artemis” and give it rights ``api``, ``read_api``, ``read_user``, ``read_repository``, ``write_repository``, and ``sudo``.
 
    .. figure:: setup/jenkins-gitlab/artemis_gitlab_access_token.png
       :align: center
@@ -469,7 +474,7 @@ do either do it manually or using the following command:
 
     ::
 
-        docker compose -f docker/<Jenkins setup to be launched>.yml exec gitlab gitlab-rails runner "token = User.find_by_username('root').personal_access_tokens.create(scopes: [:api, :read_repository], name: 'Jenkins'); token.set_token('jenkins-gitlab-token'); token.save!"
+        docker compose -f docker/<Jenkins setup to be launched>.yml exec gitlab gitlab-rails runner "token = User.find_by_username('root').personal_access_tokens.create(scopes: ['api', 'read_repository'], name: 'Jenkins', expires_at: 365.days.from_now); token.set_token('jenkins-gitlab-token'); token.save!"
 
 
 
@@ -746,7 +751,7 @@ Choose “Download now and install after restart” and checking the
 Timestamper Configuration
 """""""""""""""""""""""""
 
-Go to *Manage Jenkins → Configure System*. There you will find the
+Go to *Manage Jenkins → System Configuration → Configure*. There you will find the
 Timestamper configuration, use the following value for both formats:
 
 ::
@@ -767,8 +772,8 @@ JUnit formatted results to any URL.
 You can download the current release of the plugin
 `here <https://github.com/ls1intum/jenkins-server-notification-plugin/releases>`__
 (Download the **.hpi** file). Go to the Jenkins plugin page (*Manage
-Jenkins → Manage Plugins*) and install the downloaded file under the
-*Advanced* tab under *Upload Plugin*
+Jenkins → System Configuration → Plugins*) and install the downloaded file under the
+*Advanced settings* tab under *Deploy Plugin*
 
 .. figure:: setup/jenkins-gitlab/jenkins_custom_plugin.png
    :align: center
@@ -776,7 +781,7 @@ Jenkins → Manage Plugins*) and install the downloaded file under the
 Jenkins Credentials
 """""""""""""""""""
 
-Go to *Manage Jenkins -> Security -> Manage Credentials → Jenkins → Global credentials* and create the
+Go to *Manage Jenkins → Security → Credentials → Jenkins → Global credentials* and create the
 following credentials
 
 GitLab API Token
@@ -798,7 +803,7 @@ GitLab API Token
    4. Leave the ID field blank
    5. The description is up to you
 
-3. Go to the Jenkins settings *Manage Jenkins → Configure System*. There
+3. Go to the Jenkins settings *Manage Jenkins → System*. There
    you will find the GitLab settings. Fill in the URL of your GitLab
    instance and select the just created API token in the credentials
    dropdown. After you click on “Test Connection”, everything should
@@ -1013,7 +1018,8 @@ You can either run the builds locally (that means on the machine that hosts Jenk
 Configuring local build agents
 """"""""""""""""""""""""""""""
 
-Go to `Manage Jenkins` > `Manage Nodes and Clouds` > `master`
+Go to `Manage Jenkins` → `Nodes` → `Built-In Node` → `Configure`
+
 Configure your master node like this  (adjust the number of executors, if needed). Make sure to add the docker label.
 
    .. figure:: setup/jenkins-gitlab/jenkins_local_node.png
@@ -1071,26 +1077,28 @@ Add agent in Jenkins:
 
 1. Open Jenkins in your browser (e.g. localhost:8082)
 
-2. Go to Manage Jenkins -> Manage Credentials -> (global) -> Add Credentials
+2. Go to Manage Jenkins → Credentials → System → Global credentials (unrestricted) → Add Credentials
 
     - Kind: SSH Username with private key
 
+    - Scope: Global (Jenkins, nodes, items, all child items, etc)
+
     - ID: leave blank
 
     - Description: Up to you
 
     - Username: jenkins
 
-    - Private Key: <content of the previous generated private key> (e.g /root/.ssh/id_rsa)
+    - Private Key: <content of the previously generated private key> (e.g /root/.ssh/id_rsa)
 
-    - Passphrase: <the previous entered passphrase> (you can leave it blank if none has been specified)
+    - Passphrase: <the previously entered passphrase> (you can leave it blank if none has been specified)
 
    .. figure:: setup/jenkins-gitlab/alternative_jenkins_node_credentials.png
       :align: center
 
-3. Go to Manage Jenkins -> Manage Nodes and Clouds -> New Node
+3. Go to Manage Jenkins → Nodes → New Node
 
-    - Node name: Up to you (e.g. Docker)
+    - Node name: Up to you (e.g. Docker agent node)
 
     - Check 'Permanent Agent'
 
@@ -1223,10 +1231,10 @@ access control in Jenkins.
 This enables specific Artemis users to access build plans and execute actions such as triggering a build.
 This section explains the changes required in Jenkins in order to set up build plan access control:
 
-1. Navigate to Manage Jenkins -> Manage Plugins -> Installed and make sure that you have the
+1. Navigate to Manage Jenkins → Plugins → Installed plugins and make sure that you have the
    `Matrix Authorization Strategy <https://plugins.jenkins.io/matrix-auth/>`__ plugin installed
 
-2. Navigate to Manage Jenkins -> Configure Global Security and navigate to the "Authorization" section
+2. Navigate to Manage Jenkins → Security and navigate to the "Authorization" section
 
 3. Select the "Project-based Matrix Authorization Strategy" option
 
diff --git a/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_credentials.png b/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_credentials.png
index 4901e0cd2cce..133b81583b92 100644
Binary files a/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_credentials.png and b/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_credentials.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_setup.png b/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_setup.png
index 29f5738eafb5..7eca324029fe 100644
Binary files a/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_setup.png and b/docs/dev/setup/jenkins-gitlab/alternative_jenkins_node_setup.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/artemis_gitlab_access_token.png b/docs/dev/setup/jenkins-gitlab/artemis_gitlab_access_token.png
index 87c382c449e9..f99c0a490422 100644
Binary files a/docs/dev/setup/jenkins-gitlab/artemis_gitlab_access_token.png and b/docs/dev/setup/jenkins-gitlab/artemis_gitlab_access_token.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/gitlab_access_tokens_button.png b/docs/dev/setup/jenkins-gitlab/gitlab_access_tokens_button.png
index e0ccc8e9ffaa..bdd5741b632d 100644
Binary files a/docs/dev/setup/jenkins-gitlab/gitlab_access_tokens_button.png and b/docs/dev/setup/jenkins-gitlab/gitlab_access_tokens_button.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/gitlab_admin_user.png b/docs/dev/setup/jenkins-gitlab/gitlab_admin_user.png
index 7ea3865f73e5..f884f92a04d7 100644
Binary files a/docs/dev/setup/jenkins-gitlab/gitlab_admin_user.png and b/docs/dev/setup/jenkins-gitlab/gitlab_admin_user.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/gitlab_admin_user_password.png b/docs/dev/setup/jenkins-gitlab/gitlab_admin_user_password.png
new file mode 100644
index 000000000000..7a9003dd9584
Binary files /dev/null and b/docs/dev/setup/jenkins-gitlab/gitlab_admin_user_password.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/gitlab_jenkins_token_rights.png b/docs/dev/setup/jenkins-gitlab/gitlab_jenkins_token_rights.png
index 737b827b5880..2e3707db0503 100644
Binary files a/docs/dev/setup/jenkins-gitlab/gitlab_jenkins_token_rights.png and b/docs/dev/setup/jenkins-gitlab/gitlab_jenkins_token_rights.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/gitlab_preferences_button.png b/docs/dev/setup/jenkins-gitlab/gitlab_preferences_button.png
index ba0bae2cf859..f106698f5557 100644
Binary files a/docs/dev/setup/jenkins-gitlab/gitlab_preferences_button.png and b/docs/dev/setup/jenkins-gitlab/gitlab_preferences_button.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_authorization_permissions.png b/docs/dev/setup/jenkins-gitlab/jenkins_authorization_permissions.png
index 1dfcd3dfa26d..47b8e19a5be4 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_authorization_permissions.png and b/docs/dev/setup/jenkins-gitlab/jenkins_authorization_permissions.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_custom_plugin.png b/docs/dev/setup/jenkins-gitlab/jenkins_custom_plugin.png
index 6223b74fdc40..aa8cb370489a 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_custom_plugin.png and b/docs/dev/setup/jenkins-gitlab/jenkins_custom_plugin.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_gitlab_configuration.png b/docs/dev/setup/jenkins-gitlab/jenkins_gitlab_configuration.png
index 669cf01eb3f0..ac349efee7b7 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_gitlab_configuration.png and b/docs/dev/setup/jenkins-gitlab/jenkins_gitlab_configuration.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_local_node.png b/docs/dev/setup/jenkins-gitlab/jenkins_local_node.png
index 4c6ceba8831b..8c1a9c20f55a 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_local_node.png and b/docs/dev/setup/jenkins-gitlab/jenkins_local_node.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_master_node.png b/docs/dev/setup/jenkins-gitlab/jenkins_master_node.png
index e39e292e1784..48fe8c638a29 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_master_node.png and b/docs/dev/setup/jenkins-gitlab/jenkins_master_node.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_node.png b/docs/dev/setup/jenkins-gitlab/jenkins_node.png
index 28fabdb3d9c9..77a89ef0b9ce 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_node.png and b/docs/dev/setup/jenkins-gitlab/jenkins_node.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_ssh_credentials.png b/docs/dev/setup/jenkins-gitlab/jenkins_ssh_credentials.png
index f4b27958d527..9e127e1e193e 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_ssh_credentials.png and b/docs/dev/setup/jenkins-gitlab/jenkins_ssh_credentials.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/jenkins_test_project.png b/docs/dev/setup/jenkins-gitlab/jenkins_test_project.png
index 724e79cd909a..f37c0dd6ff6f 100644
Binary files a/docs/dev/setup/jenkins-gitlab/jenkins_test_project.png and b/docs/dev/setup/jenkins-gitlab/jenkins_test_project.png differ
diff --git a/docs/dev/setup/jenkins-gitlab/timestamper_config.png b/docs/dev/setup/jenkins-gitlab/timestamper_config.png
index 69a3a39e9da4..7fc88479c419 100644
Binary files a/docs/dev/setup/jenkins-gitlab/timestamper_config.png and b/docs/dev/setup/jenkins-gitlab/timestamper_config.png differ
diff --git a/docs/user/exams/instructor/buttons/exam_timeline.png b/docs/user/exams/instructor/buttons/exam_timeline.png
new file mode 100644
index 000000000000..9d1e127b3ce9
Binary files /dev/null and b/docs/user/exams/instructor/buttons/exam_timeline.png differ
diff --git a/docs/user/exams/instructor/exam_timeline_example.png b/docs/user/exams/instructor/exam_timeline_example.png
new file mode 100644
index 000000000000..c356e7c6a1ca
Binary files /dev/null and b/docs/user/exams/instructor/exam_timeline_example.png differ
diff --git a/docs/user/exams/instructors_guide.rst b/docs/user/exams/instructors_guide.rst
index 49666841cee5..f82856586a94 100644
--- a/docs/user/exams/instructors_guide.rst
+++ b/docs/user/exams/instructors_guide.rst
@@ -451,10 +451,23 @@ If you want you can also enable the :ref:`second correction <Before the exam's a
 
 - At the bottom of the page you will find the option |check_plagiarism|.
 
+3.4 Exam Timeline
+^^^^^^^^^^^^^^^^^
+- Artemis stores the current state of a submission for text, modeling, and quiz exercises every 30s or whenever the student clicks the save button.
+- As instructor, you have the possibility to view all those states as well as the submissions for file-upload or programming exercises using the exam timeline.
+- The exam timeline is available on the details page of a student exam when the student exam has been submitted by clicking on the button |exam_timeline|. If the exam has not been submitted yet, the exam timeline button is disabled and shows an explanatory tooltip.
+- The exam timeline shows all submissions of the student in chronological order. You can navigate between the different timestamps on the slider or navigate between different exercises using the navigation bar below the timeline
+- For programming exercises, you can view a git diff between the currently selected submission and the previous submission or the template of this exercise.
+
+.. figure:: instructor/exam_timeline_example.png
+     :alt: Exam timeline
+     :align: center
+
+
 
 .. _exam_grading_key:
 
-3.4 Grading Key
+3.5 Grading Key
 ^^^^^^^^^^^^^^^
 - Optionally, you can create a grading key for your exam by clicking |grade_key| at the top of the exam's detail page.
 - Defining a grading key allows the exam score to be converted to a grade automatically by Artemis, students are then able to see their own grades after the specified `Release Date of Results`.
@@ -567,6 +580,7 @@ Artemis collects the complaints submitted by the students during the :ref:`stude
 .. |assess_test_runs| image:: instructor/buttons/assess_test_runs.png
 .. |assess_unsubmitted_student_exams| image:: instructor/buttons/assess_unsubmitted_student_exams.png
 .. |check_plagiarism| image:: instructor/buttons/check_plagiarism.png
+.. |exam_timeline| image:: instructor/buttons/exam_timeline.png
 .. |configure_grading| image:: instructor/buttons/configure_grading.png
 .. |course_management| image:: instructor/buttons/course_management.png
 .. |create_new_exam| image:: instructor/buttons/create_new_exam.png
diff --git a/package-lock.json b/package-lock.json
index f5c64d20b838..c166a8aabf1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5960,11 +5960,6 @@
                 "d3-time-format": "2 - 3"
             }
         },
-        "node_modules/@swimlane/ngx-graph/node_modules/d3-selection": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
-            "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
-        },
         "node_modules/@swimlane/ngx-graph/node_modules/d3-shape": {
             "version": "1.3.7",
             "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
@@ -21023,11 +21018,6 @@
             "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
             "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
         },
-        "node_modules/webcola/node_modules/d3-selection": {
-            "version": "1.4.2",
-            "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.2.tgz",
-            "integrity": "sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg=="
-        },
         "node_modules/webcola/node_modules/d3-shape": {
             "version": "1.3.7",
             "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
diff --git a/package.json b/package.json
index 10985c77984e..b83528845771 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,9 @@
         "@swimlane/ngx-graph": {
             "d3-color": "^3.1.0",
             "d3-interpolate": "^3.0.1",
-            "d3-brush": "^3.0.0"
+            "d3-transition": "^3.0.0",
+            "d3-brush": "^3.0.0",
+            "d3-selection": "^3.0.0"
         },
         "critters": "0.0.20",
         "semver": "7.5.4",
diff --git a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java b/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
index 1629799b1de5..219808bb495b 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/CacheConfiguration.java
@@ -1,5 +1,6 @@
 package de.tum.in.www1.artemis.config;
 
+import java.nio.file.Path;
 import java.util.Collections;
 
 import javax.annotation.PreDestroy;
@@ -26,6 +27,7 @@
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.spring.context.SpringManagedContext;
 
+import de.tum.in.www1.artemis.service.HazelcastPathSerializer;
 import de.tum.in.www1.artemis.service.scheduled.cache.quiz.QuizScheduleService;
 import tech.jhipster.config.JHipsterProperties;
 import tech.jhipster.config.cache.PrefixedKeyGenerator;
@@ -110,6 +112,9 @@ public HazelcastInstance hazelcastInstance(JHipsterProperties jHipsterProperties
         // Allows using @SpringAware and therefore Spring Services in distributed tasks
         config.setManagedContext(new SpringManagedContext(applicationContext));
         config.setClassLoader(applicationContext.getClassLoader());
+
+        config.getSerializationConfig().addSerializerConfig(createPathSerializerConfig());
+
         if (registration == null) {
             log.warn("No discovery service is set up, Hazelcast cannot create a cluster.");
             hazelcastBindOnlyOnInterface("127.0.0.1", config);
@@ -174,6 +179,13 @@ private void hazelcastBindOnlyOnInterface(String hazelcastInterface, Config conf
         config.setProperty("hazelcast.socket.client.bind.any", "false");
     }
 
+    private SerializerConfig createPathSerializerConfig() {
+        SerializerConfig serializerConfig = new SerializerConfig();
+        serializerConfig.setTypeClass(Path.class);
+        serializerConfig.setImplementation(new HazelcastPathSerializer());
+        return serializerConfig;
+    }
+
     @Autowired(required = false) // ok
     public void setGitProperties(GitProperties gitProperties) {
         this.gitProperties = gitProperties;
diff --git a/src/main/java/de/tum/in/www1/artemis/config/Constants.java b/src/main/java/de/tum/in/www1/artemis/config/Constants.java
index cc4cc689e911..38af0f2f21f7 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/Constants.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/Constants.java
@@ -263,6 +263,8 @@ public final class Constants {
 
     public static final int HAZELCAST_QUIZ_EXERCISE_CACHE_SERIALIZER_ID = 1;
 
+    public static final int HAZELCAST_PATH_SERIALIZER_ID = 2;
+
     public static final String HAZELCAST_PLAGIARISM_PREFIX = "plagiarism-";
 
     public static final String HAZELCAST_ACTIVE_PLAGIARISM_CHECKS_PER_COURSE_CACHE = HAZELCAST_PLAGIARISM_PREFIX + "active-plagiarism-checks-per-course-cache";
diff --git a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java b/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
index 878d043d2d93..47e02b7a6233 100644
--- a/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
+++ b/src/main/java/de/tum/in/www1/artemis/config/MetricsBean.java
@@ -437,36 +437,32 @@ public void updatePublicArtemisMetrics() {
         if (!scheduledMetricsEnabled) {
             return;
         }
-        var startDate = System.currentTimeMillis();
+
+        final long startDate = System.currentTimeMillis();
 
         // The authorization object has to be set because this method is not called by a user but by the scheduler
         SecurityUtils.setAuthorizationObject();
 
-        ZonedDateTime now = ZonedDateTime.now();
+        final ZonedDateTime now = ZonedDateTime.now();
 
-        var courses = courseRepository.findAll();
+        final List<Course> courses = courseRepository.findAllActiveWithoutTestCourses(now);
         // We set the number of students once to prevent multiple queries for the same date
         courses.forEach(course -> course.setNumberOfStudents(userRepository.countByGroupsIsContaining(course.getStudentGroupName())));
-
         ensureCourseInformationIsSet(courses);
 
-        var activeCourses = courses.stream()
-                .filter(course -> (course.getStartDate() == null || course.getStartDate().isBefore(now)) && (course.getEndDate() == null || course.getEndDate().isAfter(now)))
-                .toList();
-
-        List<Exam> examsInActiveCourses = new ArrayList<>();
-        activeCourses.forEach(course -> examsInActiveCourses.addAll(examRepository.findByCourseId(course.getId())));
+        final List<Long> courseIds = courses.stream().mapToLong(Course::getId).boxed().toList();
+        final List<Exam> examsInActiveCourses = examRepository.findExamsInCourses(courseIds);
 
         // Update multi gauges
-        updateStudentsCourseMultiGauge(activeCourses);
+        updateStudentsCourseMultiGauge(courses);
         updateStudentsExamMultiGauge(examsInActiveCourses, courses);
         updateActiveUserMultiGauge(now);
         updateActiveExerciseMultiGauge();
         updateExerciseMultiGauge();
 
         // Update normal Gauges
-        activeCoursesGauge.set(activeCourses.size());
-        coursesGauge.set(courses.size());
+        activeCoursesGauge.set(courses.size());
+        coursesGauge.set((int) courseRepository.count());
 
         activeExamsGauge.set(examRepository.countAllActiveExams(now));
         examsGauge.set((int) examRepository.count());
@@ -491,14 +487,18 @@ private void updateStudentsCourseMultiGauge(List<Course> activeCourses) {
     }
 
     private void updateStudentsExamMultiGauge(List<Exam> examsInActiveCourses, List<Course> courses) {
-        studentsExamGauge.register(examsInActiveCourses.stream().map(exam -> MultiGauge.Row.of(Tags.of("examName", exam.getTitle(),
-                // The course semester.getCourse() is not populated (the semester property is not set) -> Use course from the courses list, which contains the semester
-                "semester", courses.stream().filter(course -> Objects.equals(course.getId(), exam.getCourse().getId())).findAny().map(Course::getSemester).orElse("No semester")),
-                studentExamRepository.findByExamId(exam.getId()).size()))
+        studentsExamGauge.register(examsInActiveCourses.stream()
+                .map(exam -> MultiGauge.Row.of(Tags.of("examName", exam.getTitle(), "semester", getExamSemester(courses, exam)),
+                        studentExamRepository.findByExamId(exam.getId()).size()))
                 // A mutable list is required here because otherwise the values can not be updated correctly
                 .collect(Collectors.toCollection(ArrayList::new)), true);
     }
 
+    private String getExamSemester(final List<Course> courses, final Exam exam) {
+        // The exam.getCourse() is not populated (the semester property is not set) -> Use course from the courses list, which contains the semester
+        return courses.stream().filter(course -> Objects.equals(course.getId(), exam.getCourse().getId())).findAny().map(Course::getSemester).orElse("No semester");
+    }
+
     private void updateActiveExerciseMultiGauge() {
         var results = new ArrayList<MultiGauge.Row<?>>();
         var result = exerciseRepository.countActiveExercisesGroupByExerciseType(ZonedDateTime.now());
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java b/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java
index 705b61ccd009..153b9d7b2fd7 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Attachment.java
@@ -15,6 +15,7 @@
 import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.enumeration.AttachmentType;
 import de.tum.in.www1.artemis.domain.lecture.AttachmentUnit;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -27,9 +28,15 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Attachment extends DomainObject implements Serializable {
 
+    @Transient
+    private final transient FilePathService filePathService = new FilePathService();
+
     @Transient
     private final transient FileService fileService = new FileService();
 
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
+
     @Transient
     private String prevLink;
 
@@ -97,7 +104,17 @@ else if (attachmentType == AttachmentType.FILE && getAttachmentUnit() != null &&
      */
     @PrePersist
     public void beforeCreate() {
-        handleFileChange();
+        if (link == null) {
+            return;
+        }
+        if (attachmentType == AttachmentType.FILE && getLecture() != null) {
+            Path targetFolder = FilePathService.getLectureAttachmentFilePath().resolve(getLecture().getId().toString());
+            link = entityFileService.moveFileBeforeEntityPersistenceWithIdIfIsTemp(link, targetFolder, true, getLecture().getId());
+        }
+        else if (attachmentType == AttachmentType.FILE && getAttachmentUnit() != null) {
+            Path targetFolder = FilePathService.getAttachmentUnitFilePath().resolve(getAttachmentUnit().getId().toString());
+            link = entityFileService.moveFileBeforeEntityPersistenceWithIdIfIsTemp(link, targetFolder, true, getAttachmentUnit().getId());
+        }
     }
 
     /**
@@ -121,19 +138,13 @@ else if (attachmentType == AttachmentType.FILE && link != null && link.contains(
      */
     @PreUpdate
     public void onUpdate() {
-        handleFileChange();
-    }
-
-    private void handleFileChange() {
         if (attachmentType == AttachmentType.FILE && getLecture() != null) {
-            // move file and delete old file if necessary
-            var targetFolder = Path.of(FilePathService.getLectureAttachmentFilePath(), getLecture().getId().toString()).toString();
-            link = fileService.manageFilesForUpdatedFilePath(prevLink, link, targetFolder, getLecture().getId(), true);
+            Path targetFolder = FilePathService.getLectureAttachmentFilePath().resolve(getLecture().getId().toString());
+            link = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getLecture().getId(), prevLink, link, targetFolder, true);
         }
         else if (attachmentType == AttachmentType.FILE && getAttachmentUnit() != null) {
-            // move file and delete old file if necessary
-            var targetFolder = Path.of(FilePathService.getAttachmentUnitFilePath(), getAttachmentUnit().getId().toString()).toString();
-            link = fileService.manageFilesForUpdatedFilePath(prevLink, link, targetFolder, getAttachmentUnit().getId(), true);
+            Path targetFolder = FilePathService.getAttachmentUnitFilePath().resolve(getAttachmentUnit().getId().toString());
+            link = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getAttachmentUnit().getId(), prevLink, link, targetFolder, true);
         }
     }
 
@@ -143,15 +154,8 @@ else if (attachmentType == AttachmentType.FILE && getAttachmentUnit() != null) {
      */
     @PostRemove
     public void onDelete() {
-        if (attachmentType == AttachmentType.FILE && getLecture() != null) {
-            // delete old file if necessary
-            var targetFolder = Path.of(FilePathService.getLectureAttachmentFilePath(), getLecture().getId().toString()).toString();
-            fileService.manageFilesForUpdatedFilePath(prevLink, null, targetFolder, getLecture().getId(), true);
-        }
-        else if (attachmentType == AttachmentType.FILE && getAttachmentUnit() != null) {
-            // delete old file if necessary
-            var targetFolder = Path.of(FilePathService.getAttachmentUnitFilePath(), getAttachmentUnit().getId().toString()).toString();
-            fileService.manageFilesForUpdatedFilePath(prevLink, null, targetFolder, getAttachmentUnit().getId(), true);
+        if (prevLink != null && attachmentType == AttachmentType.FILE) {
+            fileService.schedulePathForDeletion(Path.of(prevLink), 0);
         }
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/Course.java b/src/main/java/de/tum/in/www1/artemis/domain/Course.java
index ed728a567fa1..be230de89c1b 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/Course.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/Course.java
@@ -2,6 +2,7 @@
 
 import static de.tum.in.www1.artemis.config.Constants.*;
 
+import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.HashSet;
 import java.util.Set;
@@ -30,6 +31,7 @@
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroup;
 import de.tum.in.www1.artemis.domain.tutorialgroups.TutorialGroupsConfiguration;
 import de.tum.in.www1.artemis.domain.view.QuizView;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
@@ -48,7 +50,13 @@ public class Course extends DomainObject {
     private static final int DEFAULT_COMPLAINT_TEXT_LIMIT = 2000;
 
     @Transient
-    private transient FileService fileService = new FileService();
+    private final transient FilePathService filePathService = new FilePathService();
+
+    @Transient
+    private final transient FileService fileService = new FileService();
+
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
 
     @Transient
     private String prevCourseIcon;
@@ -679,8 +687,9 @@ public void onLoad() {
 
     @PrePersist
     public void beforeCreate() {
-        // move file if necessary (id at this point will be null, so placeholder will be inserted)
-        courseIcon = fileService.manageFilesForUpdatedFilePath(prevCourseIcon, courseIcon, FilePathService.getCourseIconFilePath(), getId());
+        if (courseIcon != null) {
+            courseIcon = entityFileService.moveTempFileBeforeEntityPersistence(courseIcon, FilePathService.getCourseIconFilePath(), false);
+        }
     }
 
     @PostPersist
@@ -694,13 +703,14 @@ public void afterCreate() {
     @PreUpdate
     public void onUpdate() {
         // move file and delete old file if necessary
-        courseIcon = fileService.manageFilesForUpdatedFilePath(prevCourseIcon, courseIcon, FilePathService.getCourseIconFilePath(), getId());
+        courseIcon = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getId(), prevCourseIcon, courseIcon, FilePathService.getCourseIconFilePath(), false);
     }
 
     @PostRemove
     public void onDelete() {
-        // delete old file if necessary
-        fileService.manageFilesForUpdatedFilePath(prevCourseIcon, null, FilePathService.getCourseIconFilePath(), getId());
+        if (prevCourseIcon != null) {
+            fileService.schedulePathForDeletion(Path.of(prevCourseIcon), 0);
+        }
     }
 
     @Override
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java b/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java
index 2fee2ecf8998..29bafff4bcb4 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/FileUploadSubmission.java
@@ -4,11 +4,8 @@
 
 import javax.persistence.*;
 
-import org.apache.commons.lang3.math.NumberUtils;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import de.tum.in.www1.artemis.exception.FilePathParsingException;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -26,7 +23,7 @@ public String getSubmissionExerciseType() {
     }
 
     @Transient
-    private transient FileService fileService = new FileService();
+    private final transient FileService fileService = new FileService();
 
     @Column(name = "file_path")
     private String filePath;
@@ -37,14 +34,7 @@ public String getSubmissionExerciseType() {
     @PostRemove
     public void onDelete() {
         if (filePath != null) {
-            // delete old file if necessary
-            final var splittedPath = filePath.split("/");
-            final var shouldBeExerciseId = splittedPath.length >= 5 ? splittedPath[4] : null;
-            if (!NumberUtils.isCreatable(shouldBeExerciseId)) {
-                throw new FilePathParsingException("Unexpected String in upload file path. Should contain the exercise ID: " + shouldBeExerciseId);
-            }
-            final var exerciseId = Long.parseLong(shouldBeExerciseId);
-            fileService.manageFilesForUpdatedFilePath(filePath, null, FileUploadSubmission.buildFilePath(exerciseId, getId()), getId(), true);
+            fileService.schedulePathForDeletion(Path.of(filePath), 0);
         }
     }
 
@@ -59,8 +49,8 @@ public String getFilePath() {
      * @param submissionId the id of the submission
      * @return path where submission for file upload exercise is stored
      */
-    public static String buildFilePath(Long exerciseId, Long submissionId) {
-        return Path.of(FilePathService.getFileUploadExercisesFilePath(), String.valueOf(exerciseId), String.valueOf(submissionId)).toString();
+    public static Path buildFilePath(Long exerciseId, Long submissionId) {
+        return FilePathService.getFileUploadExercisesFilePath().resolve(exerciseId.toString()).resolve(submissionId.toString());
     }
 
     public void setFilePath(String filePath) {
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java b/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java
index ee80e01e05c6..e0a18932ed91 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/exam/ExamUser.java
@@ -1,5 +1,7 @@
 package de.tum.in.www1.artemis.domain.exam;
 
+import java.nio.file.Path;
+
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.JoinColumn;
@@ -18,6 +20,7 @@
 import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.AbstractAuditingEntity;
 import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -26,9 +29,15 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class ExamUser extends AbstractAuditingEntity {
 
+    @Transient
+    private final transient FilePathService filePathService = new FilePathService();
+
     @Transient
     private final transient FileService fileService = new FileService();
 
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
+
     @Transient
     private String prevSigningImagePath;
 
@@ -189,11 +198,18 @@ public void onLoad() {
         prevStudentImagePath = studentImagePath; // save current path as old path (needed to know old path in onUpdate() and onDelete())
     }
 
+    /**
+     * Will be called before the entity is persisted (saved).
+     * Manages files by taking care of file system changes for this entity.
+     */
     @PrePersist
     public void beforeCreate() {
-        // move file if necessary (id at this point will be null, so placeholder will be inserted)
-        signingImagePath = fileService.manageFilesForUpdatedFilePath(prevSigningImagePath, signingImagePath, FilePathService.getExamUserSignatureFilePath(), getId());
-        studentImagePath = fileService.manageFilesForUpdatedFilePath(prevStudentImagePath, studentImagePath, FilePathService.getStudentImageFilePath(), getId());
+        if (signingImagePath != null) {
+            signingImagePath = entityFileService.moveTempFileBeforeEntityPersistence(signingImagePath, FilePathService.getExamUserSignatureFilePath(), false);
+        }
+        if (studentImagePath != null) {
+            studentImagePath = entityFileService.moveTempFileBeforeEntityPersistence(studentImagePath, FilePathService.getStudentImageFilePath(), false);
+        }
     }
 
     /**
@@ -212,17 +228,29 @@ public void afterCreate() {
         }
     }
 
+    /**
+     * Will be called before the entity is flushed.
+     * Manages files by taking care of file system changes for this entity.
+     */
     @PreUpdate
     public void onUpdate() {
-        // move file and delete old file if necessary
-        signingImagePath = fileService.manageFilesForUpdatedFilePath(prevSigningImagePath, signingImagePath, FilePathService.getExamUserSignatureFilePath(), getId());
-        studentImagePath = fileService.manageFilesForUpdatedFilePath(prevStudentImagePath, studentImagePath, FilePathService.getStudentImageFilePath(), getId());
+        signingImagePath = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getId(), prevSigningImagePath, signingImagePath,
+                FilePathService.getExamUserSignatureFilePath(), false);
+        studentImagePath = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getId(), prevStudentImagePath, studentImagePath,
+                FilePathService.getStudentImageFilePath(), false);
     }
 
+    /**
+     * Will be called after the entity is removed (deleted).
+     * Manages files by taking care of file system changes for this entity.
+     */
     @PostRemove
     public void onDelete() {
-        // delete old file if necessary
-        fileService.manageFilesForUpdatedFilePath(prevSigningImagePath, null, FilePathService.getExamUserSignatureFilePath(), getId());
-        fileService.manageFilesForUpdatedFilePath(prevStudentImagePath, null, FilePathService.getStudentImageFilePath(), getId());
+        if (signingImagePath != null) {
+            fileService.schedulePathForDeletion(Path.of(prevSigningImagePath), 0);
+        }
+        if (studentImagePath != null) {
+            fileService.schedulePathForDeletion(Path.of(prevStudentImagePath), 0);
+        }
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java
index 15f80c06ed0a..be2835971dac 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/AttachmentUnit.java
@@ -81,4 +81,10 @@ public ZonedDateTime getReleaseDate() {
     public void setReleaseDate(ZonedDateTime releaseDate) {
         // Should be set in associated attachment
     }
+
+    // IMPORTANT NOTICE: The following string has to be consistent with the one defined in LectureUnit.java
+    @Override
+    public String getType() {
+        return "attachment";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java
index cf25599d9e54..5520cbd8c260 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/ExerciseUnit.java
@@ -80,4 +80,10 @@ public void prePersistOrUpdate() {
         this.releaseDate = null;
         this.competencies = new HashSet<>();
     }
+
+    // IMPORTANT NOTICE: The following string has to be consistent with the one defined in LectureUnit.java
+    @Override
+    public String getType() {
+        return "exercise";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java
index d9afc184abcf..d53653d4f53f 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/LectureUnit.java
@@ -121,4 +121,7 @@ public boolean isCompletedFor(User user) {
     public Optional<ZonedDateTime> getCompletionDate(User user) {
         return getCompletedUsers().stream().filter(completion -> completion.getUser().getId().equals(user.getId())).map(LectureUnitCompletion::getCompletedAt).findFirst();
     }
+
+    // Used to distinguish the type when used in a DTO, e.g., LectureUnitForLearningPathNodeDetailsDTO.
+    public abstract String getType();
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java
index dd401b3e2da4..07bc6022159a 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/OnlineUnit.java
@@ -32,4 +32,10 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    // IMPORTANT NOTICE: The following string has to be consistent with the one defined in LectureUnit.java
+    @Override
+    public String getType() {
+        return "online";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java
index 5b3f91c68de5..02835ba8797d 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/Slide.java
@@ -7,7 +7,6 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.PostLoad;
-import javax.persistence.PostPersist;
 import javax.persistence.PostRemove;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
@@ -19,6 +18,7 @@
 
 import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.DomainObject;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -27,9 +27,15 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class Slide extends DomainObject {
 
+    @Transient
+    private final transient FilePathService filePathService = new FilePathService();
+
     @Transient
     private final transient FileService fileService = new FileService();
 
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
+
     @Transient
     private String prevSlideImagePath;
 
@@ -80,35 +86,30 @@ public void onLoad() {
         prevSlideImagePath = slideImagePath; // save current path as old path (needed to know old path in onUpdate() and onDelete())
     }
 
-    @PrePersist
-    public void beforeCreate() {
-        var targetFolder = Path.of(FilePathService.getAttachmentUnitFilePath(), getAttachmentUnit().getId().toString(), "slide", String.valueOf(getSlideNumber())).toString();
-        slideImagePath = fileService.manageFilesForUpdatedFilePath(prevSlideImagePath, slideImagePath, targetFolder, (long) getSlideNumber(), false);
-    }
-
     /**
-     * Will be called after the entity is persisted (saved).
-     * Manages files by taking care of file system changes for this entity.
+     * Before persisting the slide, we need to move the file from the temp folder to the actual folder
      */
-    @PostPersist
-    public void afterCreate() {
-        // replace placeholder with actual id if necessary (id is no longer null at this point)
-        if (slideImagePath != null && slideImagePath.contains(Constants.FILEPATH_ID_PLACEHOLDER)) {
-            slideImagePath = slideImagePath.replace(Constants.FILEPATH_ID_PLACEHOLDER, getAttachmentUnit().getId().toString());
+    @PrePersist
+    public void beforeCreate() {
+        if (slideImagePath == null) {
+            return;
         }
+        slideImagePath = entityFileService.moveFileBeforeEntityPersistenceWithIdIfIsTemp(slideImagePath, getTargetFolder(), false, (long) getSlideNumber());
     }
 
     @PreUpdate
     public void onUpdate() {
-        // move file and delete old file if necessary
-        var targetFolder = Path.of(FilePathService.getAttachmentUnitFilePath(), getAttachmentUnit().getId().toString(), "slide", String.valueOf(getSlideNumber())).toString();
-        slideImagePath = fileService.manageFilesForUpdatedFilePath(prevSlideImagePath, slideImagePath, targetFolder, (long) getSlideNumber(), false);
+        slideImagePath = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence((long) getSlideNumber(), prevSlideImagePath, slideImagePath, getTargetFolder(), false);
     }
 
     @PostRemove
     public void onDelete() {
-        // delete old file if necessary
-        var targetFolder = Path.of(FilePathService.getAttachmentUnitFilePath(), getAttachmentUnit().getId().toString(), "slide", String.valueOf(getSlideNumber())).toString();
-        fileService.manageFilesForUpdatedFilePath(prevSlideImagePath, null, targetFolder, (long) getSlideNumber(), false);
+        if (prevSlideImagePath != null) {
+            fileService.schedulePathForDeletion(Path.of(prevSlideImagePath), 0);
+        }
+    }
+
+    private Path getTargetFolder() {
+        return FilePathService.getAttachmentUnitFilePath().resolve(Path.of(getAttachmentUnit().getId().toString(), "slide", String.valueOf(getSlideNumber())));
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java
index 30b13b76af42..205a1ff7cf12 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/TextUnit.java
@@ -19,4 +19,10 @@ public String getContent() {
     public void setContent(String content) {
         this.content = content;
     }
+
+    // IMPORTANT NOTICE: The following string has to be consistent with the one defined in LectureUnit.java
+    @Override
+    public String getType() {
+        return "text";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java b/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java
index ea5386ca1654..7b38762198ca 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/lecture/VideoUnit.java
@@ -30,4 +30,10 @@ public String getDescription() {
     public void setDescription(String description) {
         this.description = description;
     }
+
+    // IMPORTANT NOTICE: The following string has to be consistent with the one defined in LectureUnit.java
+    @Override
+    public String getType() {
+        return "video";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java b/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java
index cafba8b0bf5e..acd0e7ce53fc 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragAndDropQuestion.java
@@ -1,5 +1,6 @@
 package de.tum.in.www1.artemis.domain.quiz;
 
+import java.nio.file.Path;
 import java.util.*;
 
 import javax.persistence.*;
@@ -14,6 +15,7 @@
 import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.quiz.scoring.*;
 import de.tum.in.www1.artemis.domain.view.QuizView;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -26,7 +28,13 @@
 public class DragAndDropQuestion extends QuizQuestion {
 
     @Transient
-    private transient FileService fileService = new FileService();
+    private final transient FilePathService filePathService = new FilePathService();
+
+    @Transient
+    private final transient FileService fileService = new FileService();
+
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
 
     @Transient
     private String prevBackgroundFilePath;
@@ -162,8 +170,9 @@ public void onLoad() {
 
     @PrePersist
     public void beforeCreate() {
-        // move file if necessary (id at this point will be null, so placeholder will be inserted)
-        backgroundFilePath = fileService.manageFilesForUpdatedFilePath(prevBackgroundFilePath, backgroundFilePath, FilePathService.getDragAndDropBackgroundFilePath(), getId());
+        if (backgroundFilePath != null) {
+            backgroundFilePath = entityFileService.moveTempFileBeforeEntityPersistence(backgroundFilePath, FilePathService.getDragAndDropBackgroundFilePath(), false);
+        }
     }
 
     @PostPersist
@@ -176,14 +185,15 @@ public void afterCreate() {
 
     @PreUpdate
     public void onUpdate() {
-        // move file and delete old file if necessary
-        backgroundFilePath = fileService.manageFilesForUpdatedFilePath(prevBackgroundFilePath, backgroundFilePath, FilePathService.getDragAndDropBackgroundFilePath(), getId());
+        backgroundFilePath = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getId(), prevBackgroundFilePath, backgroundFilePath,
+                FilePathService.getDragAndDropBackgroundFilePath(), false);
     }
 
     @PostRemove
     public void onDelete() {
-        // delete old file if necessary
-        fileService.manageFilesForUpdatedFilePath(prevBackgroundFilePath, null, FilePathService.getDragAndDropBackgroundFilePath(), getId());
+        if (prevBackgroundFilePath != null) {
+            fileService.schedulePathForDeletion(Path.of(prevBackgroundFilePath), 0);
+        }
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java b/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java
index cd0559973441..a328ee1704f5 100644
--- a/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java
+++ b/src/main/java/de/tum/in/www1/artemis/domain/quiz/DragItem.java
@@ -1,5 +1,6 @@
 package de.tum.in.www1.artemis.domain.quiz;
 
+import java.nio.file.Path;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -15,6 +16,7 @@
 import de.tum.in.www1.artemis.config.Constants;
 import de.tum.in.www1.artemis.domain.TempIdObject;
 import de.tum.in.www1.artemis.domain.view.QuizView;
+import de.tum.in.www1.artemis.service.EntityFileService;
 import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 
@@ -28,7 +30,13 @@
 public class DragItem extends TempIdObject implements QuizQuestionComponent<DragAndDropQuestion> {
 
     @Transient
-    private transient FileService fileService = new FileService();
+    private final transient FilePathService filePathService = new FilePathService();
+
+    @Transient
+    private final transient FileService fileService = new FileService();
+
+    @Transient
+    private final transient EntityFileService entityFileService = new EntityFileService(fileService, filePathService);
 
     @Transient
     private String prevPictureFilePath;
@@ -138,8 +146,9 @@ public void onLoad() {
 
     @PrePersist
     public void beforeCreate() {
-        // move file if necessary (id at this point will be null, so placeholder will be inserted)
-        pictureFilePath = fileService.manageFilesForUpdatedFilePath(prevPictureFilePath, pictureFilePath, FilePathService.getDragItemFilePath(), getId());
+        if (pictureFilePath != null) {
+            pictureFilePath = entityFileService.moveTempFileBeforeEntityPersistence(pictureFilePath, FilePathService.getDragItemFilePath(), false);
+        }
     }
 
     @PostPersist
@@ -152,14 +161,15 @@ public void afterCreate() {
 
     @PreUpdate
     public void onUpdate() {
-        // move file and delete old file if necessary
-        pictureFilePath = fileService.manageFilesForUpdatedFilePath(prevPictureFilePath, pictureFilePath, FilePathService.getDragItemFilePath(), getId());
+        pictureFilePath = entityFileService.handlePotentialFileUpdateBeforeEntityPersistence(getId(), prevPictureFilePath, pictureFilePath, FilePathService.getDragItemFilePath(),
+                false);
     }
 
     @PostRemove
     public void onDelete() {
-        // delete old file if necessary
-        fileService.manageFilesForUpdatedFilePath(prevPictureFilePath, null, FilePathService.getDragItemFilePath(), getId());
+        if (prevPictureFilePath != null) {
+            fileService.schedulePathForDeletion(Path.of(prevPictureFilePath), 0);
+        }
     }
 
     @Override
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 301f88ef300d..c7b97619da85 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
@@ -81,12 +81,22 @@ SELECT CASE WHEN (count(c) > 0) THEN true ELSE false END
     boolean informationSharingConfigurationIsOneOf(@Param("courseId") long courseId, @Param("values") Set<CourseInformationSharingConfiguration> values);
 
     @Query("""
-            SELECT DISTINCT c FROM Course c
+            SELECT DISTINCT c
+            FROM Course c
             WHERE (c.startDate <= :now OR c.startDate IS NULL)
                 AND (c.endDate >= :now OR c.endDate IS NULL)
             """)
     List<Course> findAllActive(@Param("now") ZonedDateTime now);
 
+    @Query("""
+            SELECT DISTINCT c
+            FROM Course c
+            WHERE (c.startDate <= :now OR c.startDate IS NULL)
+                AND (c.endDate >= :now OR c.endDate IS NULL)
+                AND c.testCourse = false
+            """)
+    List<Course> findAllActiveWithoutTestCourses(@Param("now") ZonedDateTime now);
+
     /**
      * Note: you should not add exercises or exercises+categories here, because this would make the query too complex and would take significantly longer
      *
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 5d6ff8d80255..bb02b590b690 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
@@ -31,6 +31,13 @@ public interface ExamRepository extends JpaRepository<Exam, Long> {
 
     List<Exam> findByCourseId(long courseId);
 
+    @Query("""
+            SELECT DISTINCT exam
+            FROM Exam exam
+            WHERE exam.course.id IN :courses
+            """)
+    List<Exam> findExamsInCourses(@Param("courses") Iterable<Long> courseId);
+
     @Query("""
             SELECT DISTINCT ex
             FROM Exam ex
diff --git a/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java b/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java
index f48c5ee6b36c..5f5745217413 100644
--- a/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java
+++ b/src/main/java/de/tum/in/www1/artemis/repository/LearningPathRepository.java
@@ -4,6 +4,8 @@
 
 import java.util.Optional;
 
+import javax.validation.constraints.NotNull;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.EntityGraph;
@@ -20,6 +22,10 @@ public interface LearningPathRepository extends JpaRepository<LearningPath, Long
 
     Optional<LearningPath> findByCourseIdAndUserId(long courseId, long userId);
 
+    default LearningPath findByCourseIdAndUserIdElseThrow(long courseId, long userId) {
+        return findByCourseIdAndUserId(courseId, userId).orElseThrow(() -> new EntityNotFoundException("LearningPath"));
+    }
+
     @EntityGraph(type = LOAD, attributePaths = { "competencies" })
     Optional<LearningPath> findWithEagerCompetenciesByCourseIdAndUserId(long courseId, long userId);
 
@@ -40,4 +46,13 @@ SELECT COUNT (learningPath)
             WHERE learningPath.course.id = :courseId AND learningPath.user.isDeleted = false AND learningPath.course.studentGroupName MEMBER OF learningPath.user.groups
             """)
     long countLearningPathsOfEnrolledStudentsInCourse(@Param("courseId") long courseId);
+
+    @EntityGraph(type = LOAD, attributePaths = { "competencies", "competencies.lectureUnits", "competencies.lectureUnits.completedUsers", "competencies.exercises",
+            "competencies.exercises.studentParticipations" })
+    Optional<LearningPath> findWithEagerCompetenciesAndLearningObjectsAndCompletedUsersById(long learningPathId);
+
+    @NotNull
+    default LearningPath findWithEagerCompetenciesAndLearningObjectsAndCompletedUsersByIdElseThrow(long learningPathId) {
+        return findWithEagerCompetenciesAndLearningObjectsAndCompletedUsersById(learningPathId).orElseThrow(() -> new EntityNotFoundException("LearningPath", learningPathId));
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/AttachmentUnitService.java b/src/main/java/de/tum/in/www1/artemis/service/AttachmentUnitService.java
index d4a8023c2f55..103045c8daef 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/AttachmentUnitService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/AttachmentUnitService.java
@@ -1,5 +1,6 @@
 package de.tum.in.www1.artemis.service;
 
+import java.net.URI;
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
@@ -25,6 +26,8 @@ public class AttachmentUnitService {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final CacheManager cacheManager;
 
     private final SlideSplitterService slideSplitterService;
@@ -32,10 +35,11 @@ public class AttachmentUnitService {
     private final SlideRepository slideRepository;
 
     public AttachmentUnitService(SlideRepository slideRepository, SlideSplitterService slideSplitterService, AttachmentUnitRepository attachmentUnitRepository,
-            AttachmentRepository attachmentRepository, FileService fileService, CacheManager cacheManager) {
+            AttachmentRepository attachmentRepository, FileService fileService, FilePathService filePathService, CacheManager cacheManager) {
         this.attachmentUnitRepository = attachmentUnitRepository;
         this.attachmentRepository = attachmentRepository;
         this.fileService = fileService;
+        this.filePathService = filePathService;
         this.cacheManager = cacheManager;
         this.slideSplitterService = slideSplitterService;
         this.slideRepository = slideRepository;
@@ -140,7 +144,7 @@ private void updateAttachment(Attachment existingAttachment, Attachment updateAt
      */
     private void handleFile(MultipartFile file, Attachment attachment, boolean keepFilename) {
         if (file != null && !file.isEmpty()) {
-            String filePath = fileService.handleSaveFile(file, keepFilename, false);
+            String filePath = fileService.handleSaveFile(file, keepFilename, false).toString();
             attachment.setLink(filePath);
             attachment.setUploadDate(ZonedDateTime.now());
         }
@@ -154,7 +158,7 @@ private void handleFile(MultipartFile file, Attachment attachment, boolean keepF
      */
     private void evictCache(MultipartFile file, AttachmentUnit attachmentUnit) {
         if (file != null && !file.isEmpty()) {
-            this.cacheManager.getCache("files").evict(fileService.actualPathForPublicPath(attachmentUnit.getAttachment().getLink()));
+            this.cacheManager.getCache("files").evict(filePathService.actualPathForPublicPath(URI.create(attachmentUnit.getAttachment().getLink())).toString());
         }
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/DragAndDropQuizAnswerConversionService.java b/src/main/java/de/tum/in/www1/artemis/service/DragAndDropQuizAnswerConversionService.java
index dddd4a12dfca..b78e6f457feb 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/DragAndDropQuizAnswerConversionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/DragAndDropQuizAnswerConversionService.java
@@ -3,8 +3,8 @@
 import java.awt.*;
 import java.awt.geom.Line2D;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Set;
@@ -30,14 +30,14 @@
 @Service
 public class DragAndDropQuizAnswerConversionService {
 
-    private final FileService fileService;
+    private final FilePathService filePathService;
 
     // Drop locations in quiz exercises are relatively positioned and sized using integers in the interval [0, 200]
     // this value needs to be consistent with MAX_SIZE_UNIT in quiz-exercise-generator.ts
     private static final int MAX_SIZE_UNIT = 200;
 
-    public DragAndDropQuizAnswerConversionService(FileService fileService) {
-        this.fileService = fileService;
+    public DragAndDropQuizAnswerConversionService(FilePathService filePathService) {
+        this.filePathService = filePathService;
     }
 
     /**
@@ -50,7 +50,7 @@ public DragAndDropQuizAnswerConversionService(FileService fileService) {
     public void convertDragAndDropQuizAnswerAndStoreAsPdf(DragAndDropSubmittedAnswer dragAndDropSubmittedAnswer, Path outputDir, boolean showResult) throws IOException {
         DragAndDropQuestion question = (DragAndDropQuestion) dragAndDropSubmittedAnswer.getQuizQuestion();
         String backgroundFilePath = question.getBackgroundFilePath();
-        BufferedImage backgroundImage = ImageIO.read(new File(fileService.actualPathForPublicPath(backgroundFilePath)));
+        BufferedImage backgroundImage = ImageIO.read(filePathService.actualPathForPublicPath(URI.create(backgroundFilePath)).toFile());
 
         generateDragAndDropSubmittedAnswerImage(backgroundImage, dragAndDropSubmittedAnswer, showResult);
         Path dndSubmissionPathPdf = outputDir.resolve(
@@ -121,7 +121,7 @@ private void drawTextDragItem(Graphics2D graphics, DropLocationCoordinates dropL
     }
 
     private void drawPictureDragItem(Graphics2D graphics, DropLocationCoordinates dropLocationCoordinates, DragAndDropMapping mapping) throws IOException {
-        BufferedImage dragItem = ImageIO.read(new File(fileService.actualPathForPublicPath(mapping.getDragItem().getPictureFilePath())));
+        BufferedImage dragItem = ImageIO.read(filePathService.actualPathForPublicPath(URI.create(mapping.getDragItem().getPictureFilePath())).toFile());
         Dimension scaledDimForDragItem = getScaledDimension(new Dimension(dragItem.getWidth(), dragItem.getHeight()),
                 new Dimension(dropLocationCoordinates.width, dropLocationCoordinates.height));
         graphics.drawImage(dragItem, dropLocationCoordinates.x, dropLocationCoordinates.y, (int) scaledDimForDragItem.getWidth(), (int) scaledDimForDragItem.getHeight(), null);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/EntityFileService.java b/src/main/java/de/tum/in/www1/artemis/service/EntityFileService.java
new file mode 100644
index 000000000000..49c6a4ff6452
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/EntityFileService.java
@@ -0,0 +1,113 @@
+package de.tum.in.www1.artemis.service;
+
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Path;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
+import org.jvnet.hk2.annotations.Service;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Service for handling file operations for entities.
+ */
+@Service
+public class EntityFileService {
+
+    private final Logger log = LoggerFactory.getLogger(EntityFileService.class);
+
+    private final FileService fileService;
+
+    private final FilePathService filePathService;
+
+    public EntityFileService(FileService fileService, FilePathService filePathService) {
+        this.fileService = fileService;
+        this.filePathService = filePathService;
+    }
+
+    /**
+     * Moves a temporary file to the target folder and returns the new path. A placeholder is used as id.
+     * Use {@link #moveFileBeforeEntityPersistenceWithIdIfIsTemp(String, Path, boolean, Long)} to provide an existing id.
+     *
+     * @param entityFilePath the path of the temporary file
+     * @param targetFolder   the target folder to move the file to
+     * @param keepFilename   whether to keep the filename or generate a new one
+     * @return the new file path as string
+     */
+    @Nonnull
+    public String moveTempFileBeforeEntityPersistence(@Nonnull String entityFilePath, @Nonnull Path targetFolder, boolean keepFilename) {
+        return moveFileBeforeEntityPersistenceWithIdIfIsTemp(entityFilePath, targetFolder, keepFilename, null);
+    }
+
+    /**
+     * Moves a temporary file to the target folder and returns the new path. If the file is not a temporary file, the original path is returned without any changes.
+     *
+     * @param entityFilePath the path of the temporary file
+     * @param targetFolder   the target folder to move the file to
+     * @param keepFilename   whether to keep the filename or generate a new one
+     * @param entityId       the id of the entity that is being persisted, if null, a placeholder gets used
+     * @return the new file path as string
+     */
+    @Nonnull
+    public String moveFileBeforeEntityPersistenceWithIdIfIsTemp(@Nonnull String entityFilePath, @Nonnull Path targetFolder, boolean keepFilename, @Nullable Long entityId) {
+        URI filePath = URI.create(entityFilePath);
+        String filename = Path.of(entityFilePath).getFileName().toString();
+        String extension = FilenameUtils.getExtension(filename);
+        try {
+            Path source = filePathService.actualPathForPublicPathOrThrow(filePath);
+            if (!source.startsWith(FilePathService.getTempFilePath())) {
+                return entityFilePath;
+            }
+            Path target;
+            if (keepFilename) {
+                target = targetFolder.resolve(filename);
+            }
+            else {
+                target = fileService.generateFilePath(fileService.generateTargetFilenameBase(targetFolder), extension, targetFolder);
+            }
+            FileUtils.moveFile(source.toFile(), target.toFile(), REPLACE_EXISTING);
+            URI newPath = filePathService.publicPathForActualPathOrThrow(target, entityId);
+            log.debug("Moved File from {} to {}", source, target);
+            return newPath.toString();
+        }
+        catch (IOException e) {
+            log.error("Error moving file: {}", filePath, e);
+            // fallback return original path
+            return filePath.toString();
+        }
+    }
+
+    /**
+     * Handles a potential file update before entity persistence. It thus does nothing if the optional file doesn't change and otherwise moves a temporary file to the target and/or
+     * deletes the old file.
+     *
+     * @param entityId          the id of the entity that is being persisted
+     * @param oldEntityFilePath the old file path of the file that is being updated
+     * @param newEntityFilePath the new file path of the file that is being updated
+     * @param targetFolder      the target folder to move the file to
+     * @param keepFilename      whether to keep the filename or generate a new one
+     * @return the new file path as string, null if no file exists
+     */
+    @Nullable
+    public String handlePotentialFileUpdateBeforeEntityPersistence(@Nonnull Long entityId, @Nullable String oldEntityFilePath, @Nullable String newEntityFilePath,
+            @Nonnull Path targetFolder, boolean keepFilename) {
+        String resultingPath = newEntityFilePath;
+        if (newEntityFilePath != null) {
+            resultingPath = moveFileBeforeEntityPersistenceWithIdIfIsTemp(newEntityFilePath, targetFolder, keepFilename, entityId);
+        }
+        if (oldEntityFilePath != null && !oldEntityFilePath.equals(newEntityFilePath)) {
+            Path oldFilePath = filePathService.actualPathForPublicPathOrThrow(URI.create(oldEntityFilePath));
+            if (oldFilePath.toFile().exists()) {
+                fileService.schedulePathForDeletion(oldFilePath, 0);
+            }
+        }
+        return resultingPath;
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java b/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java
index 83b64342d9c4..8281338bb1ee 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/FilePathService.java
@@ -1,10 +1,17 @@
 package de.tum.in.www1.artemis.service;
 
+import java.net.URI;
 import java.nio.file.Path;
 
+import javax.annotation.Nullable;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import de.tum.in.www1.artemis.config.Constants;
+import de.tum.in.www1.artemis.domain.FileUploadSubmission;
+import de.tum.in.www1.artemis.exception.FilePathParsingException;
+
 @Service
 public class FilePathService {
 
@@ -20,43 +27,229 @@ public void setFileUploadPathStatic(String fileUploadPath) {
         FilePathService.fileUploadPath = fileUploadPath;
     }
 
-    public static String getTempFilePath() {
-        return Path.of(fileUploadPath, "images", "temp").toString();
+    public static Path getTempFilePath() {
+        return Path.of(fileUploadPath, "images", "temp");
+    }
+
+    public static Path getDragAndDropBackgroundFilePath() {
+        return Path.of(fileUploadPath, "images", "drag-and-drop", "backgrounds");
+    }
+
+    public static Path getDragItemFilePath() {
+        return Path.of(fileUploadPath, "images", "drag-and-drop", "drag-items");
+    }
+
+    public static Path getCourseIconFilePath() {
+        return Path.of(fileUploadPath, "images", "course", "icons");
+    }
+
+    public static Path getExamUserSignatureFilePath() {
+        return Path.of(fileUploadPath, "images", "exam-user", "signatures");
+    }
+
+    public static Path getStudentImageFilePath() {
+        return Path.of(fileUploadPath, "images", "exam-user");
     }
 
-    public static String getDragAndDropBackgroundFilePath() {
-        return Path.of(fileUploadPath, "images", "drag-and-drop", "backgrounds").toString();
+    public static Path getLectureAttachmentFilePath() {
+        return Path.of(fileUploadPath, "attachments", "lecture");
     }
 
-    public static String getDragItemFilePath() {
-        return Path.of(fileUploadPath, "images", "drag-and-drop", "drag-items").toString();
+    public static Path getAttachmentUnitFilePath() {
+        return Path.of(fileUploadPath, "attachments", "attachment-unit");
     }
 
-    public static String getCourseIconFilePath() {
-        return Path.of(fileUploadPath, "images", "course", "icons").toString();
+    public static Path getFileUploadExercisesFilePath() {
+        return Path.of(fileUploadPath, "file-upload-exercises");
     }
 
-    public static String getExamUserSignatureFilePath() {
-        return Path.of(fileUploadPath, "images", "exam-user", "signatures").toString();
+    public static Path getMarkdownFilePath() {
+        return Path.of(fileUploadPath, "markdown");
     }
 
-    public static String getStudentImageFilePath() {
-        return Path.of(fileUploadPath, "images", "exam-user").toString();
+    /**
+     * Convert the given public file url to its corresponding local path
+     *
+     * @param publicPath the public file url to convert
+     * @throws FilePathParsingException if the path is unknown
+     * @return the actual path to that file in the local filesystem
+     */
+    public Path actualPathForPublicPathOrThrow(URI publicPath) {
+        Path actualPath = actualPathForPublicPath(publicPath);
+        if (actualPath == null) {
+            // path is unknown => cannot convert
+            throw new FilePathParsingException("Unknown Filepath: " + publicPath);
+        }
+
+        return actualPath;
+    }
+
+    /**
+     * Convert the given public file url to its corresponding local path
+     *
+     * @param publicPath the public file url to convert
+     * @return the actual path to that file in the local filesystem
+     */
+    public Path actualPathForPublicPath(URI publicPath) {
+        // first extract the filename from the url
+        String uriPath = publicPath.getPath();
+        Path path = Path.of(uriPath);
+        String filename = path.getFileName().toString();
+
+        // check for known path to convert
+        if (uriPath.startsWith("/api/files/temp")) {
+            return FilePathService.getTempFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/drag-and-drop/backgrounds")) {
+            return FilePathService.getDragAndDropBackgroundFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/drag-and-drop/drag-items")) {
+            return FilePathService.getDragItemFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/course/icons")) {
+            return FilePathService.getCourseIconFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/exam-user/signatures")) {
+            return FilePathService.getExamUserSignatureFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/exam-user")) {
+            return FilePathService.getStudentImageFilePath().resolve(filename);
+        }
+        if (uriPath.startsWith("/api/files/attachments/lecture")) {
+            String lectureId = path.getName(4).toString();
+            return FilePathService.getLectureAttachmentFilePath().resolve(Path.of(lectureId, filename));
+        }
+        if (uriPath.startsWith("/api/files/attachments/attachment-unit")) {
+            return actualPathForPublicAttachmentUnitFilePath(publicPath, filename);
+        }
+        if (uriPath.startsWith("/api/files/file-upload-exercises")) {
+            return actualPathForPublicFileUploadExercisesFilePath(publicPath, filename);
+        }
+
+        return null;
+    }
+
+    private Path actualPathForPublicAttachmentUnitFilePath(URI publicPath, String filename) {
+        Path path = Path.of(publicPath.getPath());
+        if (!publicPath.toString().contains("/slide")) {
+            String attachmentUnitId = path.getName(4).toString();
+            return FilePathService.getAttachmentUnitFilePath().resolve(Path.of(attachmentUnitId, filename));
+        }
+        try {
+            String attachmentUnitId = path.getName(4).toString();
+            String slideId = path.getName(6).toString();
+            // check if the ids are valid long values
+            Long.parseLong(attachmentUnitId);
+            Long.parseLong(slideId);
+            return FilePathService.getAttachmentUnitFilePath().resolve(Path.of(attachmentUnitId, "slide", slideId, filename));
+        }
+        catch (IllegalArgumentException e) {
+            throw new FilePathParsingException("Public path does not contain correct attachmentUnitId or slideId: " + publicPath, e);
+        }
+    }
+
+    private Path actualPathForPublicFileUploadExercisesFilePath(URI publicPath, String filename) {
+        Path path = Path.of(publicPath.getPath());
+        try {
+            String expectedExerciseId = path.getName(3).toString();
+            String expectedSubmissionId = path.getName(5).toString();
+            Long exerciseId = Long.parseLong(expectedExerciseId);
+            Long submissionId = Long.parseLong(expectedSubmissionId);
+            return FileUploadSubmission.buildFilePath(exerciseId, submissionId).resolve(filename);
+        }
+        catch (IllegalArgumentException e) {
+            throw new FilePathParsingException("Public path does not contain correct exerciseId or submissionId: " + publicPath, e);
+        }
     }
 
-    public static String getLectureAttachmentFilePath() {
-        return Path.of(fileUploadPath, "attachments", "lecture").toString();
+    /**
+     * Generate the public path for the file at the given path
+     *
+     * @param actualPathString the path to the file in the local filesystem
+     * @param entityId         the id of the entity associated with the file
+     * @throws FilePathParsingException if the path is unknown
+     * @return the public file url that can be used by users to access the file from outside
+     */
+    public URI publicPathForActualPathOrThrow(Path actualPathString, @Nullable Long entityId) {
+        URI publicPath = publicPathForActualPath(actualPathString, entityId);
+        if (publicPath == null) {
+            // path is unknown => cannot convert
+            throw new FilePathParsingException("Unknown Filepath: " + actualPathString);
+        }
+
+        return publicPath;
     }
 
-    public static String getAttachmentUnitFilePath() {
-        return Path.of(fileUploadPath, "attachments", "attachment-unit").toString();
+    /**
+     * Generate the public path for the file at the given path
+     *
+     * @param path     the path to the file in the local filesystem
+     * @param entityId the id of the entity associated with the file
+     * @return the public file url that can be used by users to access the file from outside
+     */
+    public URI publicPathForActualPath(Path path, @Nullable Long entityId) {
+        // first extract filename
+        String filename = path.getFileName().toString();
+
+        // generate part for id
+        String id = entityId == null ? Constants.FILEPATH_ID_PLACEHOLDER : entityId.toString();
+        // check for known path to convert
+        if (path.startsWith(FilePathService.getTempFilePath())) {
+            return URI.create(FileService.DEFAULT_FILE_SUBPATH + filename);
+        }
+        if (path.startsWith(FilePathService.getDragAndDropBackgroundFilePath())) {
+            return URI.create("/api/files/drag-and-drop/backgrounds/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getDragItemFilePath())) {
+            return URI.create("/api/files/drag-and-drop/drag-items/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getCourseIconFilePath())) {
+            return URI.create("/api/files/course/icons/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getExamUserSignatureFilePath())) {
+            return URI.create("/api/files/exam-user/signatures/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getStudentImageFilePath())) {
+            return URI.create("/api/files/exam-user/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getLectureAttachmentFilePath())) {
+            return URI.create("/api/files/attachments/lecture/" + id + "/" + filename);
+        }
+        if (path.startsWith(FilePathService.getAttachmentUnitFilePath())) {
+            return publicPathForActualAttachmentUnitFilePath(path, filename, id);
+        }
+        if (path.startsWith(FilePathService.getFileUploadExercisesFilePath())) {
+            return publicPathForActualFileUploadExercisesFilePath(path, filename, id);
+        }
+
+        return null;
     }
 
-    public static String getFileUploadExercisesFilePath() {
-        return Path.of(fileUploadPath, "file-upload-exercises").toString();
+    private URI publicPathForActualAttachmentUnitFilePath(Path path, String filename, String id) {
+        if (!path.toString().contains("/slide")) {
+            return URI.create("/api/files/attachments/attachment-unit/" + id + "/" + filename);
+        }
+        try {
+            // The last name is the file name, the one before that is the slide number and the one before that is the attachmentUnitId, in which we are interested
+            // (e.g. uploads/attachments/attachment-unit/941/slide/1/State_pattern_941_Slide_1.png)
+            final String expectedAttachmentUnitId = path.getName(path.getNameCount() - 4).toString();
+            final long attachmentUnitId = Long.parseLong(expectedAttachmentUnitId);
+            return URI.create("/api/files/attachments/attachment-unit/" + attachmentUnitId + "/slide/" + id + "/" + filename);
+        }
+        catch (IllegalArgumentException e) {
+            throw new FilePathParsingException("Unexpected String in upload file path. AttachmentUnit ID should be present here: " + path, e);
+        }
     }
 
-    public static String getMarkdownFilePath() {
-        return Path.of(fileUploadPath, "markdown").toString();
+    private URI publicPathForActualFileUploadExercisesFilePath(Path path, String filename, String id) {
+        try {
+            // The last name is the file name, the one before that is the submissionId and the one before that is the exerciseId, in which we are interested
+            final var expectedExerciseId = path.getName(path.getNameCount() - 3).toString();
+            final long exerciseId = Long.parseLong(expectedExerciseId);
+            return URI.create("/api/files/file-upload-exercises/" + exerciseId + "/submissions/" + id + "/" + filename);
+        }
+        catch (IllegalArgumentException e) {
+            throw new FilePathParsingException("Unexpected String in upload file path. Exercise ID should be present here: " + path, e);
+        }
     }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileService.java b/src/main/java/de/tum/in/www1/artemis/service/FileService.java
index 629708ecbfbc..ac239e2b645d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/FileService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/FileService.java
@@ -1,14 +1,13 @@
 package de.tum.in.www1.artemis.service;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
 
 import java.io.*;
+import java.net.URI;
 import java.net.URLDecoder;
 import java.nio.charset.Charset;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.concurrent.*;
@@ -25,7 +24,6 @@
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.filefilter.FileFilterUtils;
 import org.apache.commons.io.filefilter.IOFileFilter;
-import org.apache.commons.lang3.math.NumberUtils;
 import org.apache.pdfbox.multipdf.PDFMergerUtility;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
@@ -36,15 +34,12 @@
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
-import org.springframework.util.FileSystemUtils;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.ibm.icu.text.CharsetDetector;
 
-import de.tum.in.www1.artemis.config.Constants;
-import de.tum.in.www1.artemis.domain.FileUploadSubmission;
 import de.tum.in.www1.artemis.exception.FilePathParsingException;
 import de.tum.in.www1.artemis.web.rest.errors.BadRequestAlertException;
 import de.tum.in.www1.artemis.web.rest.errors.InternalServerErrorException;
@@ -62,8 +57,8 @@ public class FileService implements DisposableBean {
      * A list of common binary file extensions.
      * Extensions must be lower-case without leading dots.
      */
-    private static final Set<String> binaryFileExtensions = Set.of("png", "jpg", "jpeg", "heic", "gif", "tiff", "psd", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "pages",
-            "numbers", "key", "odt", "zip", "rar", "7z", "tar", "iso", "mdb", "sqlite", "exe", "jar", "bin", "so", "dll");
+    private static final Set<String> BINARY_FILE_EXTENSIONS = Set.of("png", "jpg", "jpeg", "heic", "gif", "tiff", "psd", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx",
+            "pages", "numbers", "key", "odt", "zip", "rar", "7z", "tar", "iso", "mdb", "sqlite", "exe", "jar", "bin", "so", "dll");
 
     /**
      * The list of file extensions that are allowed to be uploaded in a Markdown editor.
@@ -118,18 +113,20 @@ public void destroy() {
      * @throws IOException if the file can't be accessed.
      */
     @Cacheable(value = "files", unless = "#result == null")
-    public byte[] getFileForPath(String path) throws IOException {
-        File file = new File(path);
-        if (file.exists()) {
-            return Files.readAllBytes(file.toPath());
-        }
-        else {
-            return null;
+    public byte[] getFileForPath(Path path) throws IOException {
+        if (Files.exists(path)) {
+            return Files.readAllBytes(path);
         }
+        return null;
     }
 
+    /**
+     * Evict the cache for the given path
+     *
+     * @param path the path for the file to evict from cache
+     */
     @CacheEvict(value = "files", key = "#path")
-    public void evictCacheForPath(String path) {
+    public void evictCacheForPath(Path path) {
         log.info("Invalidate files cache for {}", path);
         // Intentionally blank
     }
@@ -152,19 +149,14 @@ public static String sanitizeFilename(String filename) {
      * Helper method which handles the file creation for both normal file uploads and for markdown
      *
      * @param file         The file to be uploaded with a maximum file size set in resources/config/application.yml
-     * @param keepFileName specifies if original file name should be kept
+     * @param keepFilename specifies if original file name should be kept
      * @param markdown     boolean which is set to true, when we are uploading a file within the markdown editor
-     * @return The path of the file
+     * @return The API path of the file
      */
     @NotNull
-    public String handleSaveFile(MultipartFile file, boolean keepFileName, boolean markdown) {
+    public URI handleSaveFile(MultipartFile file, boolean keepFilename, boolean markdown) {
         // check for file type
-        String filename = file.getOriginalFilename();
-        if (filename == null) {
-            throw new IllegalArgumentException("Filename cannot be null");
-        }
-
-        filename = sanitizeFilename(filename);
+        String filename = checkAndSanitizeFilename(file.getOriginalFilename());
 
         // Check the allowed file extensions
         final String fileExtension = FilenameUtils.getExtension(filename);
@@ -174,35 +166,20 @@ public String handleSaveFile(MultipartFile file, boolean keepFileName, boolean m
             throw new BadRequestAlertException("Unsupported file type! Allowed file types: " + String.join(", ", allowedExtensions), "file", null, true);
         }
 
-        final String filePath = markdown ? FilePathService.getMarkdownFilePath() : FilePathService.getTempFilePath();
-        final String fileNameAddition = markdown ? "Markdown_" : "Temp_";
-        final StringBuilder responsePath = new StringBuilder(markdown ? MARKDOWN_FILE_SUBPATH : DEFAULT_FILE_SUBPATH);
-
-        String savedFileName = saveFile(filePath, filename, fileNameAddition, fileExtension, keepFileName, file);
-        responsePath.append(savedFileName);
-
-        return responsePath.toString();
-    }
+        final String filenamePrefix = markdown ? "Markdown_" : "Temp_";
+        final Path path = markdown ? FilePathService.getMarkdownFilePath() : FilePathService.getTempFilePath();
 
-    /**
-     * Saves a file to the given path
-     *
-     * @param filePath         the path to save the file to excluding the filename
-     * @param filename         the filename of the file to save including the extension
-     * @param fileNameAddition the addition to the filename to make sure it is unique
-     * @param fileExtension    the extension of the file to save
-     * @param keepFileName     specifies if original file name should be kept
-     * @param file             the file to save
-     * @return the name of the saved file
-     */
-    public String saveFile(String filePath, String filename, String fileNameAddition, String fileExtension, boolean keepFileName, MultipartFile file) {
+        Path filePath;
+        if (keepFilename) {
+            filePath = path.resolve(filename);
+        }
+        else {
+            filePath = generateFilePath(filenamePrefix, fileExtension, path);
+        }
         try {
-            File newFile = createNewFile(filePath, filename, fileNameAddition, fileExtension, keepFileName);
-
-            // copy contents of uploaded file into newly created file
-            Files.copy(file.getInputStream(), newFile.toPath(), REPLACE_EXISTING);
+            FileUtils.copyToFile(file.getInputStream(), filePath.toFile());
 
-            return newFile.toPath().getFileName().toString();
+            return generateResponsePath(filePath, markdown);
         }
         catch (IOException e) {
             log.error("Could not save file {}", filename, e);
@@ -210,381 +187,103 @@ public String saveFile(String filePath, String filename, String fileNameAddition
         }
     }
 
-    /**
-     * Creates a new file from given contents
-     *
-     * @param filePath         the path to save the file to excluding the filename
-     * @param filename         the filename of the file to save
-     * @param fileNameAddition the addition to the filename to make sure it is unique
-     * @param fileExtension    the extension of the file to save
-     * @param keepFileName     specifies if original file name should be kept
-     * @return the created file
-     */
-    private File createNewFile(String filePath, String filename, String fileNameAddition, String fileExtension, boolean keepFileName) throws IOException {
-        try {
-            Files.createDirectories(Paths.get(filePath));
-        }
-        catch (IOException e) {
-            log.error("Could not create directory: {}", filePath);
-            throw e;
-        }
-        boolean fileCreated;
-        File newFile;
-        String newFilename = filename;
-        do {
-            if (!keepFileName) {
-                // append a timestamp and some randomness to the filename to avoid conflicts
-                newFilename = fileNameAddition + ZonedDateTime.now().toString().substring(0, 23).replaceAll("[:.]", "-") + "_" + UUID.randomUUID().toString().substring(0, 8) + "."
-                        + fileExtension;
-            }
-
-            newFile = Path.of(filePath, newFilename).toFile();
-            if (keepFileName && newFile.exists()) {
-                Files.delete(newFile.toPath());
-            }
-            fileCreated = newFile.createNewFile();
+    private String checkAndSanitizeFilename(String filename) {
+        if (filename == null) {
+            throw new IllegalArgumentException("Filename cannot be null");
         }
-        while (!fileCreated);
 
-        return newFile;
+        return sanitizeFilename(filename);
     }
 
     /**
-     * Copies an existing file (if not a temporary file) to a target location. Returns the public path for the resulting file.
+     * Generates the API path getting returned to the client
      *
-     * @param oldFilePath  the old file path
-     * @param targetFolder the folder that a file should be copied to
-     * @param entityId     id of the entity this file belongs to (needed to generate public path). If this is null, a placeholder will be inserted where the id would be
-     * @return the resulting public path
+     * @param filePath the file system path of the file
+     * @param markdown boolean which is set to true, when we are uploading a file in the Markdown format
+     * @return the API path of the file
      */
-    public String copyExistingFileToTarget(String oldFilePath, String targetFolder, Long entityId) {
-        if (oldFilePath != null && !oldFilePath.contains("files/temp")) {
-            try {
-                Path source = Path.of(actualPathForPublicPathOrThrow(oldFilePath));
-                File targetFile = generateTargetFile(oldFilePath, targetFolder, false);
-                Path target = targetFile.toPath();
-                Files.copy(source, target, REPLACE_EXISTING);
-                String newFilePath = publicPathForActualPathOrThrow(target.toString(), entityId);
-                log.debug("Moved File from {} to {}", source, target);
-                return newFilePath;
-            }
-            catch (IOException e) {
-                log.error("Error moving file: {}", oldFilePath);
-            }
+    private URI generateResponsePath(Path filePath, boolean markdown) {
+        String filename = filePath.getFileName().toString();
+        if (markdown) {
+            return URI.create(MARKDOWN_FILE_SUBPATH).resolve(filename);
         }
-        return oldFilePath;
+        return URI.create(DEFAULT_FILE_SUBPATH).resolve(filename);
     }
 
     /**
-     * Takes care of any changes that have to be made to the filesystem (deleting old files, moving temporary files into their proper location) and returns the public path for the
-     * resulting file (as it might have been moved from newFilePath to another path)
+     * Generates the path for the file to be saved to with a random file name based on the parameters.
      *
-     * @param oldFilePath  the old file path (this file will be deleted if not null and different from newFilePath)
-     * @param newFilePath  the new file path (this file will be moved into its proper location, if it was a temporary file)
-     * @param targetFolder the folder that a temporary file should be moved to
-     * @param entityId     id of the entity this file belongs to (needed to generate
-     *                         public path). If this is null, a placeholder will be inserted where the id would be
-     * @return the resulting public path (is identical to newFilePath, if file didn't need to be moved)
+     * @param filenamePrefix the prefix of the filename
+     * @param fileExtension  the extension of the file
+     * @param folder         the folder to save the file to
+     * @return the path to save the file to
      */
-    public String manageFilesForUpdatedFilePath(String oldFilePath, String newFilePath, String targetFolder, Long entityId) {
-        return manageFilesForUpdatedFilePath(oldFilePath, newFilePath, targetFolder, entityId, false);
+    public Path generateFilePath(String filenamePrefix, String fileExtension, Path folder) {
+        // append a timestamp and some randomness to the filename to avoid conflicts
+        String generatedFilename = filenamePrefix + ZonedDateTime.now().toString().substring(0, 23).replaceAll("[:.]", "-") + "_" + UUID.randomUUID().toString().substring(0, 8)
+                + "." + fileExtension;
+        return folder.resolve(generatedFilename);
     }
 
     /**
-     * Takes care of any changes that have to be made to the filesystem (deleting old files, moving temporary files into their proper location) and returns the public path for the
-     * resulting file (as it might have been moved from newFilePath to another path)
+     * Copies an existing non-temporary file to a target location.
      *
-     * @param oldFilePath  the old file path (this file will be deleted if not null and different from newFilePath)
-     * @param newFilePath  the new file path (this file will be moved into its proper location, if it was a temporary file)
-     * @param targetFolder the folder that a temporary file should be moved to
-     * @param entityId     id of the entity this file belongs to (needed to generate public path). If this is null, a placeholder will be inserted where the id would be
-     * @param keepFileName flag for determining if the current filename should be kept.
-     * @return the resulting public path (is identical to newFilePath, if file didn't need to be moved)
+     * @param oldFilePath  the old file path
+     * @param targetFolder the folder that a file should be copied to
+     * @return the resulting file path or null on error
      */
-    public String manageFilesForUpdatedFilePath(String oldFilePath, String newFilePath, String targetFolder, Long entityId, Boolean keepFileName) {
-        if (oldFilePath != null) {
-            if (oldFilePath.equals(newFilePath)) {
-                // Do nothing
-                return newFilePath;
-            }
-            else {
-                // delete old file
-                log.debug("Delete old file {}", oldFilePath);
-                try {
-                    File oldFile = new File(actualPathForPublicPathOrThrow(oldFilePath));
-
-                    if (!FileSystemUtils.deleteRecursively(oldFile)) {
-                        log.warn("FileService.manageFilesForUpdatedFilePath: Could not delete old file: {}", oldFile);
-                    }
-                    else {
-                        log.debug("Deleted Orphaned File: {}", oldFile);
-                    }
-                }
-                catch (Exception ex) {
-                    log.warn("FileService.manageFilesForUpdatedFilePath: Could not delete old file '{}' due to exception {}", oldFilePath, ex.getMessage());
-                }
-            }
-        }
-
-        return moveFileIfTemporaryAndReturnPath(newFilePath, targetFolder, entityId, keepFileName);
-    }
-
-    private String moveFileIfTemporaryAndReturnPath(String path, String targetFolder, Long entityId, Boolean keepFileName) {
-        if (path != null && path.contains("files/temp")) {
-            // rename and move file
+    public Path copyExistingFileToTarget(Path oldFilePath, Path targetFolder) {
+        if (oldFilePath != null && !pathContains(oldFilePath, Path.of(("files/temp")))) {
+            String filename = oldFilePath.getFileName().toString();
             try {
-                Path source = Path.of(actualPathForPublicPathOrThrow(path));
-                File targetFile = generateTargetFile(path, targetFolder, keepFileName);
-                Path target = targetFile.toPath();
-                Files.move(source, target, REPLACE_EXISTING);
-                log.debug("Moved File from {} to {}", source, target);
-                return publicPathForActualPathOrThrow(target.toString(), entityId);
+                Path target = generateFilePath(generateTargetFilenameBase(targetFolder), FilenameUtils.getExtension(filename), targetFolder);
+                FileUtils.copyFile(oldFilePath.toFile(), target.toFile());
+                log.debug("Moved File from {} to {}", oldFilePath, target);
+                return target;
             }
             catch (IOException e) {
-                log.error("Error moving file: {}", path);
+                log.error("Error moving file: {}", oldFilePath, e);
             }
         }
-        return path;
-    }
-
-    /**
-     * Convert the given public file url to its corresponding local path
-     *
-     * @param publicPath the public file url to convert
-     * @return the actual path to that file in the local filesystem
-     */
-    public String actualPathForPublicPathOrThrow(String publicPath) {
-        String actualPath = actualPathForPublicPath(publicPath);
-        if (actualPath == null) {
-            // path is unknown => cannot convert
-            throw new FilePathParsingException("Unknown Filepath: " + publicPath);
-        }
-
-        return actualPath;
-    }
-
-    /**
-     * Convert the given public file url to its corresponding local path
-     *
-     * @param publicPath the public file url to convert
-     * @return the actual path to that file in the local filesystem
-     */
-    public String actualPathForPublicPath(String publicPath) {
-        // first extract the filename from the url
-        String filename = publicPath.substring(publicPath.lastIndexOf("/") + 1);
-
-        // check for known path to convert
-        if (publicPath.contains("files/temp")) {
-            return Path.of(FilePathService.getTempFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/drag-and-drop/backgrounds")) {
-            return Path.of(FilePathService.getDragAndDropBackgroundFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/drag-and-drop/drag-items")) {
-            return Path.of(FilePathService.getDragItemFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/course/icons")) {
-            return Path.of(FilePathService.getCourseIconFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/exam-user")) {
-            return Path.of(FilePathService.getStudentImageFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/exam-user/signatures")) {
-            return Path.of(FilePathService.getExamUserSignatureFilePath(), filename).toString();
-        }
-        if (publicPath.contains("files/attachments/lecture")) {
-            String lectureId = publicPath.replace(filename, "").replace("/api/files/attachments/lecture/", "");
-            return Path.of(FilePathService.getLectureAttachmentFilePath(), lectureId, filename).toString();
-        }
-        if (publicPath.contains("files/attachments/attachment-unit")) {
-            if (!publicPath.contains("/slide")) {
-                String attachmentUnitId = publicPath.replace(filename, "").replace("/api/files/attachments/attachment-unit/", "");
-                return Path.of(FilePathService.getAttachmentUnitFilePath(), attachmentUnitId, filename).toString();
-            }
-            final var slideSubPath = publicPath.replace(filename, "").replace("/api/files/attachments/attachment-unit/", "").split("/");
-            final var shouldBeAttachmentUnitId = slideSubPath[0];
-            final var shouldBeSlideId = slideSubPath.length >= 3 ? slideSubPath[2] : null;
-            if (!NumberUtils.isCreatable(shouldBeAttachmentUnitId) || !NumberUtils.isCreatable(shouldBeSlideId)) {
-                throw new FilePathParsingException("Public path does not contain correct shouldBeAttachmentUnitId or shouldBeSlideId: " + publicPath);
-            }
-            final var attachmentUnitId = Long.parseLong(shouldBeAttachmentUnitId);
-            final var slideId = Long.parseLong(shouldBeSlideId);
-            return Path.of(FilePathService.getAttachmentUnitFilePath(), String.valueOf(attachmentUnitId), "slide", String.valueOf(slideId), filename).toString();
-        }
-        if (publicPath.contains("files/file-upload-exercises")) {
-            final var uploadSubPath = publicPath.replace(filename, "").replace("/api/files/file-upload-exercises/", "").split("/");
-            final var shouldBeExerciseId = uploadSubPath[0];
-            final var shouldBeSubmissionId = uploadSubPath.length >= 3 ? uploadSubPath[2] : null;
-            if (!NumberUtils.isCreatable(shouldBeExerciseId) || !NumberUtils.isCreatable(shouldBeSubmissionId)) {
-                throw new FilePathParsingException("Public path does not contain correct exerciseId or submissionId: " + publicPath);
-            }
-            final var exerciseId = Long.parseLong(shouldBeExerciseId);
-            final var submissionId = Long.parseLong(shouldBeSubmissionId);
-            return Path.of(FileUploadSubmission.buildFilePath(exerciseId, submissionId), filename).toString();
-        }
-
-        return null;
-    }
-
-    /**
-     * Generate the public path for the file at the given path
-     *
-     * @param actualPathString the path to the file in the local filesystem
-     * @param entityId         the id of the entity associated with the file
-     * @return the public file url that can be used by users to access the file from outside
-     * @throws FilePathParsingException if the path is unknown
-     */
-    public String publicPathForActualPathOrThrow(String actualPathString, @Nullable Long entityId) {
-        String publicPath = publicPathForActualPath(actualPathString, entityId);
-        if (publicPath == null) {
-            // path is unknown => cannot convert
-            throw new FilePathParsingException("Unknown Filepath: " + actualPathString);
-        }
-
-        return publicPath;
-    }
-
-    /**
-     * Generate the public path for the file at the given path
-     *
-     * @param actualPathString the path to the file in the local filesystem
-     * @param entityId         the id of the entity associated with the file
-     * @return the public file url that can be used by users to access the file from outside
-     */
-    public String publicPathForActualPath(String actualPathString, @Nullable Long entityId) {
-        // first extract filename
-        Path actualPath = Path.of(actualPathString);
-        String filename = actualPath.getFileName().toString();
-
-        // generate part for id
-        String id = entityId == null ? Constants.FILEPATH_ID_PLACEHOLDER : entityId.toString();
-        // check for known path to convert
-        if (actualPathString.contains(FilePathService.getTempFilePath())) {
-            return DEFAULT_FILE_SUBPATH + filename;
-        }
-        if (actualPathString.contains(FilePathService.getDragAndDropBackgroundFilePath())) {
-            return "/api/files/drag-and-drop/backgrounds/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getDragItemFilePath())) {
-            return "/api/files/drag-and-drop/drag-items/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getCourseIconFilePath())) {
-            return "/api/files/course/icons/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getExamUserSignatureFilePath())) {
-            return "/api/files/exam-user/signatures/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getStudentImageFilePath())) {
-            return "/api/files/exam-user/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getLectureAttachmentFilePath())) {
-            return "/api/files/attachments/lecture/" + id + "/" + filename;
-        }
-        if (actualPathString.contains(FilePathService.getAttachmentUnitFilePath())) {
-            if (!actualPathString.contains("/slide")) {
-                return "/api/files/attachments/attachment-unit/" + id + "/" + filename;
-            }
-            try {
-                // The last name is the file name, the one before that is the slide number and the one before that is the attachmentUnitId, in which we are interested
-                // (e.g. uploads/attachments/attachment-unit/941/slide/1/State_pattern_941_Slide_1.png)
-                final var shouldBeAttachmentUnitId = actualPath.getName(actualPath.getNameCount() - 4).toString();
-                final long attachmentUnitId = Long.parseLong(shouldBeAttachmentUnitId);
-                return "/api/files/attachments/attachment-unit/" + attachmentUnitId + "/slide/" + id + "/" + filename;
-            }
-            catch (IllegalArgumentException e) {
-                throw new FilePathParsingException("Unexpected String in upload file path. AttachmentUnit ID should be present here: " + actualPathString);
-            }
-        }
-        if (actualPathString.contains(FilePathService.getFileUploadExercisesFilePath())) {
-            final long exerciseId;
-            try {
-                // The last name is the file name, the one before that is the submissionId and the one before that is the exerciseId, in which we are interested
-                final var shouldBeExerciseId = actualPath.getName(actualPath.getNameCount() - 3).toString();
-                exerciseId = Long.parseLong(shouldBeExerciseId);
-            }
-            catch (IllegalArgumentException e) {
-                throw new FilePathParsingException("Unexpected String in upload file path. Exercise ID should be present here: " + actualPathString);
-            }
-            return "/api/files/file-upload-exercises/" + exerciseId + "/submissions/" + id + "/" + filename;
-        }
-
         return null;
     }
 
     /**
-     * Creates a new file at the given location with a proper filename consisting of type, timestamp and a random part
+     * Generates a prefix for the filename based on the target folder
      *
-     * @param originalFilename the original filename of the file (needed to determine the file type)
-     * @param targetFolder     the folder where the new file should be created
-     * @param keepFileName     if true, the original filename will be kept, otherwise a new filename will be generated
-     * @return the newly created file
-     * @throws IOException if the file can't be generated.
+     * @param targetFolder the target folder
+     * @return the prefix ending with an underscore character as a separator
      */
-    public File generateTargetFile(String originalFilename, String targetFolder, Boolean keepFileName) throws IOException {
-        // determine the base for the filename
-        String filenameBase = "Unspecified_";
+    public String generateTargetFilenameBase(Path targetFolder) {
         if (targetFolder.equals(FilePathService.getDragAndDropBackgroundFilePath())) {
-            filenameBase = "DragAndDropBackground_";
+            return "DragAndDropBackground_";
         }
         if (targetFolder.equals(FilePathService.getDragItemFilePath())) {
-            filenameBase = "DragItem_";
+            return "DragItem_";
         }
         if (targetFolder.equals(FilePathService.getCourseIconFilePath())) {
-            filenameBase = "CourseIcon_";
+            return "CourseIcon_";
         }
         if (targetFolder.equals(FilePathService.getExamUserSignatureFilePath())) {
-            filenameBase = "ExamUserSignature_";
+            return "ExamUserSignature_";
         }
         if (targetFolder.equals(FilePathService.getStudentImageFilePath())) {
-            filenameBase = "ExamUserImage_";
+            return "ExamUserImage_";
         }
-        if (targetFolder.contains(FilePathService.getLectureAttachmentFilePath())) {
-            filenameBase = "LectureAttachment_";
+        if (pathContains(targetFolder, FilePathService.getLectureAttachmentFilePath())) {
+            return "LectureAttachment_";
         }
-        if (targetFolder.contains(FilePathService.getAttachmentUnitFilePath())) {
-            filenameBase = "AttachmentUnit_";
+        if (pathContains(targetFolder, FilePathService.getAttachmentUnitFilePath())) {
+            return "AttachmentUnit_";
         }
-        if (targetFolder.contains(FilePathService.getAttachmentUnitFilePath()) && targetFolder.contains("/slide")) {
-            filenameBase = "AttachmentUnitSlide_";
+        if (pathContains(targetFolder, FilePathService.getAttachmentUnitFilePath()) && pathContains(targetFolder, Path.of("/slide"))) {
+            return "AttachmentUnitSlide_";
         }
+        return "Unspecified_";
+    }
 
-        // extract the file extension
-        String fileExtension = FilenameUtils.getExtension(originalFilename);
-
-        // create folder if necessary
-        File folder = new File(targetFolder);
-        if (!folder.exists()) {
-            if (!folder.mkdirs()) {
-                log.error("Could not create directory: {}", targetFolder);
-                throw new IOException("Could not create directory: " + targetFolder);
-            }
-        }
-
-        // create the file (retry if filename already exists)
-        boolean fileCreated;
-        File newFile;
-        String filename = originalFilename;
-        do {
-            if (keepFileName) {
-                if (filename.contains(DEFAULT_FILE_SUBPATH)) {
-                    filename = filename.replace(DEFAULT_FILE_SUBPATH, "");
-                }
-            }
-            else {
-                filename = filenameBase + ZonedDateTime.now().toString().substring(0, 23).replaceAll("[:.]", "-") + "_" + UUID.randomUUID().toString().substring(0, 8) + "."
-                        + fileExtension;
-            }
-            var path = Path.of(targetFolder, filename).toString();
-
-            newFile = new File(path);
-            if (keepFileName && newFile.exists()) {
-                Files.delete(newFile.toPath());
-            }
-            fileCreated = newFile.createNewFile();
-        }
-        while (!fileCreated);
-
-        return newFile;
+    private boolean pathContains(Path path, Path subPath) {
+        return path.normalize().toString().contains(subPath.normalize().toString());
     }
 
     /**
@@ -616,21 +315,20 @@ public void copyResources(final Resource[] resources, final Path prefix, final P
      * @throws IOException If the copying operation fails.
      */
     public void copyResource(final Resource resource, final Path prefix, final Path targetDirectory, final boolean keepParentDirectories) throws IOException {
-        final Path targetPath = getTargetPath(resource, prefix, targetDirectory, keepParentDirectories);
+        final Path targetPath = generateTargetPath(resource, prefix, targetDirectory, keepParentDirectories);
 
         if (isIgnoredDirectory(targetPath)) {
             return;
         }
 
-        Files.createDirectories(targetPath.getParent());
-        Files.copy(resource.getInputStream(), targetPath, REPLACE_EXISTING);
+        FileUtils.copyToFile(resource.getInputStream(), targetPath.toFile());
 
         if (targetPath.endsWith("gradlew")) {
             targetPath.toFile().setExecutable(true);
         }
     }
 
-    private Path getTargetPath(final Resource resource, final Path prefix, final Path targetDirectory, final boolean keepParentDirectory) throws IOException {
+    private Path generateTargetPath(final Resource resource, final Path prefix, final Path targetDirectory, final boolean keepParentDirectory) throws IOException {
         final Path filePath;
         if (resource.isFile()) {
             filePath = resource.getFile().toPath();
@@ -640,15 +338,15 @@ private Path getTargetPath(final Resource resource, final Path prefix, final Pat
             filePath = Path.of(url);
         }
 
-        final Path targetPath = getTargetPath(filePath, prefix, targetDirectory, keepParentDirectory);
+        final Path targetPath = generateTargetPath(filePath, prefix, targetDirectory, keepParentDirectory);
         return applyFilenameReplacements(targetPath);
     }
 
     /**
-     * Determines the target file path which a resource should be copied to.
+     * Generates the target file path which a resource should be copied to.
      * <p>
      * Searches for {@code prefix} in the {@code source} and removes all path elements including and up to the prefix.
-     * The target file path is then determined by resolving this trimmed path against the target directory.
+     * The target file path is then determined by resolving the remaining path against the target directory.
      *
      * @param source              The path where the resource is copied from.
      * @param prefix              The prefix that should be trimmed from the source path.
@@ -656,7 +354,7 @@ private Path getTargetPath(final Resource resource, final Path prefix, final Pat
      * @param keepParentDirectory Keep directories in the path between prefix and filename.
      * @return The target path where the resource should be copied to.
      */
-    private Path getTargetPath(final Path source, final Path prefix, final Path targetDirectory, final boolean keepParentDirectory) {
+    private Path generateTargetPath(final Path source, final Path prefix, final Path targetDirectory, final boolean keepParentDirectory) {
         if (!keepParentDirectory) {
             return targetDirectory.resolve(source.getFileName());
         }
@@ -666,14 +364,14 @@ private Path getTargetPath(final Path source, final Path prefix, final Path targ
 
         final int prefixStartIdx = Collections.indexOfSubList(sourcePathElements, prefixPathElements);
 
-        if (prefixStartIdx >= 0) {
-            final int startIdx = prefixStartIdx + prefixPathElements.size();
-            final Path relativeSource = source.subpath(startIdx, sourcePathElements.size());
-            return targetDirectory.resolve(relativeSource);
-        }
-        else {
+        if (prefixStartIdx < 0) {
             return targetDirectory.resolve(source);
         }
+
+        final int startIdx = prefixStartIdx + prefixPathElements.size();
+        final Path relativeSource = source.subpath(startIdx, sourcePathElements.size());
+
+        return targetDirectory.resolve(relativeSource);
     }
 
     private List<Path> getPathElements(final Path path) {
@@ -717,14 +415,14 @@ private boolean isIgnoredDirectory(final Path filePath) {
      * @param targetDirectoryPath the path of the folder where the renamed folder should be located
      * @throws IOException if the directory could not be renamed.
      */
-    public void renameDirectory(String oldDirectoryPath, String targetDirectoryPath) throws IOException {
-        File oldDirectory = new File(oldDirectoryPath);
+    public void renameDirectory(Path oldDirectoryPath, Path targetDirectoryPath) throws IOException {
+        File oldDirectory = oldDirectoryPath.toFile();
         if (!oldDirectory.exists()) {
             log.error("Directory {} should be renamed but does not exist.", oldDirectoryPath);
             throw new RuntimeException("Directory " + oldDirectoryPath + " should be renamed but does not exist.");
         }
 
-        File targetDirectory = new File(targetDirectoryPath);
+        File targetDirectory = targetDirectoryPath.toFile();
 
         FileUtils.moveDirectory(oldDirectory, targetDirectory);
     }
@@ -735,9 +433,9 @@ public void renameDirectory(String oldDirectoryPath, String targetDirectoryPath)
      * @param filePath of file to look for replaceable sections in.
      * @param sections of structure String (section name) / Boolean (keep content in section or remove it).
      */
-    public void replacePlaceholderSections(String filePath, Map<String, Boolean> sections) {
+    public void replacePlaceholderSections(Path filePath, Map<String, Boolean> sections) {
         Map<Pattern, Boolean> patternBooleanMap = sections.entrySet().stream().collect(Collectors.toMap(e -> Pattern.compile(".*%" + e.getKey() + ".*%.*"), Map.Entry::getValue));
-        File file = new File(filePath);
+        File file = filePath.toFile();
         File tempFile = new File(filePath + "_temp");
         if (!file.exists()) {
             throw new FilePathParsingException("File " + filePath + " should be updated but does not exist.");
@@ -791,7 +489,7 @@ public void replacePlaceholderSections(String filePath, Map<String, Boolean> sec
         // Accessing already opened files will cause an exception on Windows machines, therefore close the streams
         try {
             Files.delete(file.toPath());
-            FileUtils.moveFile(tempFile, new File(filePath));
+            FileUtils.moveFile(tempFile, filePath.toFile());
         }
         catch (IOException ex) {
             throw new RuntimeException("Error encountered when reading File " + filePath + ".", ex);
@@ -806,17 +504,17 @@ public void replacePlaceholderSections(String filePath, Map<String, Boolean> sec
      * @param replacementString the string that should be used to replace the target
      * @throws IOException if an issue occurs on file access for the replacement of the variables.
      */
-    public void replaceVariablesInDirectoryName(String startPath, String targetString, String replacementString) throws IOException {
+    public void replaceVariablesInDirectoryName(Path startPath, String targetString, String replacementString) throws IOException {
         log.debug("Replacing {} with {} in directory {}", targetString, replacementString, startPath);
-        File directory = new File(startPath);
+        File directory = startPath.toFile();
         if (!directory.exists() || !directory.isDirectory()) {
             throw new RuntimeException("Directory " + startPath + " should be replaced but does not exist.");
         }
-
-        if (startPath.contains(targetString)) {
+        String pathString = startPath.toString();
+        if (pathString.contains(targetString)) {
             log.debug("Target String found, replacing..");
-            String targetPath = startPath.replace(targetString, replacementString);
-            renameDirectory(startPath, targetPath);
+            String targetPath = pathString.replace(targetString, replacementString);
+            renameDirectory(startPath, Path.of(targetPath));
             directory = new File(targetPath);
         }
 
@@ -825,7 +523,7 @@ public void replaceVariablesInDirectoryName(String startPath, String targetStrin
 
         if (subDirectories != null) {
             for (String subDirectory : subDirectories) {
-                replaceVariablesInDirectoryName(Path.of(directory.getAbsolutePath(), subDirectory).toString(), targetString, replacementString);
+                replaceVariablesInDirectoryName(directory.toPath().toAbsolutePath().resolve(subDirectory), targetString, replacementString);
             }
         }
     }
@@ -838,18 +536,20 @@ public void replaceVariablesInDirectoryName(String startPath, String targetStrin
      * @param replacementString the string that should be used to replace the target
      * @throws IOException if an issue occurs on file access for the replacement of the variables.
      */
-    public void replaceVariablesInFileName(String startPath, String targetString, String replacementString) throws IOException {
+    public void replaceVariablesInFilename(Path startPath, String targetString, String replacementString) throws IOException {
         log.debug("Replacing {} with {} in directory {}", targetString, replacementString, startPath);
-        File directory = new File(startPath);
+        File directory = startPath.toFile();
         if (!directory.exists() || !directory.isDirectory()) {
             throw new FileNotFoundException("Files in the directory " + startPath + " should be replaced but it does not exist.");
         }
 
         // rename all files in the file tree
-        try (var files = Files.find(Path.of(startPath), Integer.MAX_VALUE, (filePath, fileAttr) -> fileAttr.isRegularFile() && filePath.toString().contains(targetString))) {
+        try (var files = Files.find(startPath, Integer.MAX_VALUE, (filePath, fileAttr) -> fileAttr.isRegularFile() && filePath.toString().contains(targetString))) {
             files.forEach(filePath -> {
                 try {
-                    Files.move(filePath, Path.of(filePath.toString().replace(targetString, replacementString)));
+                    // We expect the strings to be clean already, so the filename shouldn't change. If it does, we are on the safe side with the sanitation.
+                    String cleanFileName = sanitizeFilename(filePath.toString().replace(targetString, replacementString));
+                    FileUtils.moveFile(filePath.toFile(), new File(cleanFileName));
                 }
                 catch (IOException e) {
                     throw new RuntimeException("File " + filePath + " should be replaced but does not exist.");
@@ -892,7 +592,7 @@ public void replaceVariablesInFileRecursive(Path startPath, Map<String, String>
             // filter out files that should be ignored
             files = Arrays.stream(files).filter(Predicate.not(filesToIgnore::contains)).toArray(String[]::new);
             for (String file : files) {
-                replaceVariablesInFile(Path.of(directory.getAbsolutePath(), file), replacements);
+                replaceVariablesInFile(directory.toPath().toAbsolutePath().resolve(file), replacements);
             }
         }
 
@@ -904,7 +604,7 @@ public void replaceVariablesInFileRecursive(Path startPath, Map<String, String>
                     // ignore files in the '.git' folder
                     continue;
                 }
-                replaceVariablesInFileRecursive(Path.of(directory.getAbsolutePath(), subDirectory), replacements, filesToIgnore);
+                replaceVariablesInFileRecursive(directory.toPath().toAbsolutePath().resolve(subDirectory), replacements, filesToIgnore);
             }
         }
     }
@@ -918,7 +618,6 @@ public void replaceVariablesInFileRecursive(Path startPath, Map<String, String>
      */
     public void replaceVariablesInFile(Path filePath, Map<String, String> replacements) {
         log.debug("Replacing {} in file {}", replacements, filePath);
-
         if (isBinaryFile(filePath)) {
             // do not try to read binary files with 'readString'
             return;
@@ -931,7 +630,7 @@ public void replaceVariablesInFile(Path filePath, Map<String, String> replacemen
             for (Map.Entry<String, String> replacement : replacements.entrySet()) {
                 fileContent = fileContent.replace(replacement.getKey(), replacement.getValue());
             }
-            Files.writeString(filePath, fileContent, UTF_8);
+            FileUtils.writeStringToFile(filePath.toFile(), fileContent, UTF_8);
         }
         catch (IOException ex) {
             log.warn("Exception {} occurred when trying to replace {} in (binary) file {}", ex.getMessage(), replacements, filePath);
@@ -948,7 +647,7 @@ public void replaceVariablesInFile(Path filePath, Map<String, String> replacemen
      */
     private static boolean isBinaryFile(Path filePath) {
         final String fileExtension = FilenameUtils.getExtension(filePath.getFileName().toString());
-        return binaryFileExtensions.stream().anyMatch(fileExtension::equalsIgnoreCase);
+        return BINARY_FILE_EXTENSIONS.stream().anyMatch(fileExtension::equalsIgnoreCase);
     }
 
     /**
@@ -972,7 +671,7 @@ public void normalizeLineEndingsDirectory(Path startPath) throws IOException {
         Collection<File> files = FileUtils.listFiles(directory, FileFilterUtils.trueFileFilter(), directoryFileFilter);
 
         for (File file : files) {
-            normalizeLineEndings(file.toPath());
+            normalizeLineEndings(file.toPath().toAbsolutePath());
         }
     }
 
@@ -993,7 +692,7 @@ public void normalizeLineEndings(Path filePath) throws IOException {
         // https://stackoverflow.com/questions/3776923/how-can-i-normalize-the-eol-character-in-java
         String fileContent = Files.readString(filePath, UTF_8);
         fileContent = fileContent.replaceAll("\\r\\n?", "\n");
-        Files.writeString(filePath, fileContent, UTF_8);
+        FileUtils.writeStringToFile(filePath.toFile(), fileContent, UTF_8);
     }
 
     /**
@@ -1004,7 +703,7 @@ public void normalizeLineEndings(Path filePath) throws IOException {
      * @param startPath the path where the start directory is located
      * @throws IOException if an issue occurs on file access when converting to UTF-8.
      */
-    public void convertToUTF8Directory(Path startPath) throws IOException {
+    public void convertFilesInDirectoryToUtf8(Path startPath) throws IOException {
         log.debug("Converting files in directory {} to UTF-8", startPath);
         File directory = startPath.toFile();
         if (!directory.exists() || !directory.isDirectory()) {
@@ -1037,7 +736,7 @@ public void convertToUTF8(Path filePath) throws IOException {
 
         String fileContent = new String(contentArray, charset);
 
-        Files.writeString(filePath, fileContent, UTF_8);
+        FileUtils.writeStringToFile(filePath.toFile(), fileContent, UTF_8);
     }
 
     /**
@@ -1054,12 +753,15 @@ public Charset detectCharset(byte[] contentArray) {
     }
 
     /**
-     * Schedule the deletion of the given path with a given delay
+     * Schedule the deletion of the given nullsafe path with a given delay
      *
      * @param path           The path that should be deleted
      * @param delayInMinutes The delay in minutes after which the path should be deleted
      */
-    public void scheduleForDeletion(Path path, long delayInMinutes) {
+    public void schedulePathForDeletion(@Nullable Path path, long delayInMinutes) {
+        if (path == null) {
+            return;
+        }
         ScheduledFuture<?> future = executor.schedule(() -> {
             try {
                 if (Files.exists(path)) {
@@ -1077,12 +779,15 @@ public void scheduleForDeletion(Path path, long delayInMinutes) {
     }
 
     /**
-     * Schedule the recursive deletion of the given directory with a given delay.
+     * Schedule the recursive deletion of the given nullsafe directory with a given delay.
      *
      * @param path           The path to the directory that should be deleted
      * @param delayInMinutes The delay in minutes after which the path should be deleted
      */
-    public void scheduleForDirectoryDeletion(Path path, long delayInMinutes) {
+    public void scheduleDirectoryPathForRecursiveDeletion(@Nullable Path path, long delayInMinutes) {
+        if (path == null) {
+            return;
+        }
         ScheduledFuture<?> future = executor.schedule(() -> {
             try {
                 if (Files.exists(path) && Files.isDirectory(path)) {
@@ -1106,7 +811,7 @@ public void scheduleForDirectoryDeletion(Path path, long delayInMinutes) {
      * @param path the original path, e.g. /opt/artemis/repos-download
      * @return the unique path, e.g. /opt/artemis/repos-download/1609579674868
      */
-    private Path getUniquePath(Path path) {
+    public Path getUniqueSubfolderPath(Path path) {
         var uniquePath = path.resolve(String.valueOf(System.currentTimeMillis()));
         if (!Files.exists(uniquePath) && Files.isDirectory(path)) {
             try {
@@ -1120,15 +825,16 @@ private Path getUniquePath(Path path) {
     }
 
     /**
-     * create a unique path by appending a folder named with the current milliseconds (e.g. 1609579674868) of the system and schedules it for deletion
+     * create a unique path by appending a folder named with the current milliseconds (e.g. 1609579674868) of the system and schedules it for deletion.
+     * See {@link #getUniqueSubfolderPath(Path)} for more information.
      *
      * @param path                 the original path, e.g. /opt/artemis/repos-download
      * @param deleteDelayInMinutes the delay in minutes after which the path should be deleted
      * @return the unique path, e.g. /opt/artemis/repos-download/1609579674868
      */
-    public Path getTemporaryUniquePath(Path path, long deleteDelayInMinutes) {
-        var temporaryPath = getUniquePath(path);
-        scheduleForDirectoryDeletion(temporaryPath, deleteDelayInMinutes);
+    public Path getTemporaryUniqueSubfolderPath(Path path, long deleteDelayInMinutes) {
+        var temporaryPath = getUniqueSubfolderPath(path);
+        scheduleDirectoryPathForRecursiveDeletion(temporaryPath, deleteDelayInMinutes);
         return temporaryPath;
     }
 
@@ -1143,7 +849,7 @@ public Path getTemporaryUniquePath(Path path, long deleteDelayInMinutes) {
      */
     public Path getTemporaryUniquePathWithoutPathCreation(Path path, long deleteDelayInMinutes) {
         var temporaryPath = path.resolve(String.valueOf(System.currentTimeMillis()));
-        scheduleForDirectoryDeletion(temporaryPath, deleteDelayInMinutes);
+        scheduleDirectoryPathForRecursiveDeletion(temporaryPath, deleteDelayInMinutes);
         return temporaryPath;
     }
 
@@ -1179,10 +885,10 @@ public Path writeObjectToJsonFile(Object object, ObjectMapper objectMapper, Path
      * Merge the PDF files located in the given paths.
      *
      * @param paths             list of paths to merge
-     * @param mergedPdfFileName title of merged pdf file
+     * @param mergedPdfFilename title of merged pdf file
      * @return byte array of the merged file
      */
-    public Optional<byte[]> mergePdfFiles(List<String> paths, String mergedPdfFileName) {
+    public Optional<byte[]> mergePdfFiles(List<String> paths, String mergedPdfFilename) {
         if (paths == null || paths.isEmpty()) {
             return Optional.empty();
         }
@@ -1198,7 +904,7 @@ public Optional<byte[]> mergePdfFiles(List<String> paths, String mergedPdfFileNa
             }
 
             PDDocumentInformation pdDocumentInformation = new PDDocumentInformation();
-            pdDocumentInformation.setTitle(mergedPdfFileName);
+            pdDocumentInformation.setTitle(mergedPdfFilename);
             pdfMerger.setDestinationDocumentInformation(pdDocumentInformation);
 
             pdfMerger.setDestinationStream(outputStream);
@@ -1232,18 +938,18 @@ public void deleteFiles(List<Path> filePaths) {
     /**
      * Convert byte[] to MultipartFile by using CommonsMultipartFile
      *
-     * @param fileName        file name to set file name
+     * @param filename        file name to set file name
      * @param extension       extension of the file (e.g .pdf or .png)
      * @param streamByteArray byte array to save to the temp file
      * @return multipartFile wrapper for the file stored on disk with a sanitized name
      */
-    public MultipartFile convertByteArrayToMultipart(String fileName, String extension, byte[] streamByteArray) {
+    public MultipartFile convertByteArrayToMultipart(String filename, String extension, byte[] streamByteArray) {
         try {
-            String cleanFileName = sanitizeFilename(fileName);
-            Path tempPath = Path.of(FilePathService.getTempFilePath(), cleanFileName + extension);
-            Files.write(tempPath, streamByteArray);
+            String cleanFilename = sanitizeFilename(filename);
+            Path tempPath = FilePathService.getTempFilePath().resolve(cleanFilename + extension);
+            FileUtils.writeByteArrayToFile(tempPath.toFile(), streamByteArray);
             File outputFile = tempPath.toFile();
-            FileItem fileItem = new DiskFileItem(cleanFileName, Files.probeContentType(tempPath), false, outputFile.getName(), (int) outputFile.length(),
+            FileItem fileItem = new DiskFileItem(cleanFilename, Files.probeContentType(tempPath), false, outputFile.getName(), (int) outputFile.length(),
                     outputFile.getParentFile());
 
             try (InputStream input = new FileInputStream(outputFile); OutputStream fileItemOutputStream = fileItem.getOutputStream()) {
@@ -1252,7 +958,7 @@ public MultipartFile convertByteArrayToMultipart(String fileName, String extensi
             return new CommonsMultipartFile(fileItem);
         }
         catch (IOException e) {
-            log.error("Could not convert file {}.", fileName, e);
+            log.error("Could not convert file {}.", filename, e);
             throw new InternalServerErrorException("Error while converting byte[] to MultipartFile by using CommonsMultipartFile");
         }
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java b/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java
index 538676be7d47..df4454fddcc9 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/FileUploadSubmissionService.java
@@ -2,14 +2,15 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Optional;
 
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.io.FileUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,17 +36,21 @@ public class FileUploadSubmissionService extends SubmissionService {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final ExerciseDateService exerciseDateService;
 
     public FileUploadSubmissionService(FileUploadSubmissionRepository fileUploadSubmissionRepository, SubmissionRepository submissionRepository, ResultRepository resultRepository,
             ParticipationService participationService, UserRepository userRepository, StudentParticipationRepository studentParticipationRepository, FileService fileService,
             AuthorizationCheckService authCheckService, FeedbackRepository feedbackRepository, ExamDateService examDateService, ExerciseDateService exerciseDateService,
-            CourseRepository courseRepository, ParticipationRepository participationRepository, ComplaintRepository complaintRepository, FeedbackService feedbackService) {
+            CourseRepository courseRepository, ParticipationRepository participationRepository, ComplaintRepository complaintRepository, FeedbackService feedbackService,
+            FilePathService filePathService) {
         super(submissionRepository, userRepository, authCheckService, resultRepository, studentParticipationRepository, participationService, feedbackRepository, examDateService,
                 exerciseDateService, courseRepository, participationRepository, complaintRepository, feedbackService);
         this.fileUploadSubmissionRepository = fileUploadSubmissionRepository;
         this.fileService = fileService;
         this.exerciseDateService = exerciseDateService;
+        this.filePathService = filePathService;
     }
 
     /**
@@ -115,7 +120,7 @@ public Optional<FileUploadSubmission> getRandomFileUploadSubmissionEligibleForNe
     public FileUploadSubmission save(FileUploadSubmission fileUploadSubmission, MultipartFile file, StudentParticipation participation, FileUploadExercise exercise)
             throws IOException, EmptyFileException {
 
-        String newFilePath = storeFile(fileUploadSubmission, participation, file, exercise);
+        URI newFilePath = storeFile(fileUploadSubmission, participation, file, exercise);
 
         // update submission properties
         fileUploadSubmission.setSubmissionDate(ZonedDateTime.now());
@@ -132,14 +137,14 @@ public FileUploadSubmission save(FileUploadSubmission fileUploadSubmission, Mult
 
         // Note: we save before the new file path is set to potentially remove the old file on the file system
         fileUploadSubmission = fileUploadSubmissionRepository.save(fileUploadSubmission);
-        fileUploadSubmission.setFilePath(newFilePath);
+        fileUploadSubmission.setFilePath(newFilePath.toString());
         // Note: we save again so that the new file is stored on the file system
         fileUploadSubmission = fileUploadSubmissionRepository.save(fileUploadSubmission);
 
         return fileUploadSubmission;
     }
 
-    private String storeFile(FileUploadSubmission fileUploadSubmission, StudentParticipation participation, MultipartFile file, FileUploadExercise exercise)
+    private URI storeFile(FileUploadSubmission fileUploadSubmission, StudentParticipation participation, MultipartFile file, FileUploadExercise exercise)
             throws EmptyFileException, IOException {
         if (file.isEmpty()) {
             throw new EmptyFileException(file.getOriginalFilename());
@@ -150,11 +155,11 @@ private String storeFile(FileUploadSubmission fileUploadSubmission, StudentParti
         if (fileUploadSubmission.getId() == null) {
             fileUploadSubmission = fileUploadSubmissionRepository.save(fileUploadSubmission);
         }
-        final String savePath = saveFileForSubmission(file, fileUploadSubmission, exercise);
-        final String newFilePath = fileService.publicPathForActualPath(savePath, fileUploadSubmission.getId());
+        final Path savePath = saveFileForSubmission(file, fileUploadSubmission, exercise);
+        final URI newFilePath = filePathService.publicPathForActualPath(savePath, fileUploadSubmission.getId());
 
         // We need to ensure that we can access the store file and the stored file is the same as was passed to us in the request
-        final var storedFileHash = DigestUtils.md5Hex(Files.newInputStream(Path.of(savePath)));
+        final var storedFileHash = DigestUtils.md5Hex(Files.newInputStream(savePath));
         if (!multipartFileHash.equals(storedFileHash)) {
             throw new IOException("The file " + file.getName() + "could not be stored");
         }
@@ -163,7 +168,7 @@ private String storeFile(FileUploadSubmission fileUploadSubmission, StudentParti
         Optional<FileUploadSubmission> previousFileUploadSubmission = participation.findLatestSubmission();
 
         previousFileUploadSubmission.filter(previousSubmission -> previousSubmission.getFilePath() != null).ifPresent(previousSubmission -> {
-            final String oldFilePath = previousSubmission.getFilePath();
+            final URI oldFilePath = URI.create(previousSubmission.getFilePath());
             // check if we already had a file associated with this submission
             if (!oldFilePath.equals(newFilePath)) { // different name
                 // IMPORTANT: only delete the file when it has changed the name
@@ -177,7 +182,7 @@ private String storeFile(FileUploadSubmission fileUploadSubmission, StudentParti
         return newFilePath;
     }
 
-    private String saveFileForSubmission(final MultipartFile file, final Submission submission, FileUploadExercise exercise) throws IOException {
+    private Path saveFileForSubmission(final MultipartFile file, final Submission submission, FileUploadExercise exercise) throws IOException {
         final var exerciseId = exercise.getId();
         final var submissionId = submission.getId();
         var filename = file.getOriginalFilename();
@@ -186,22 +191,17 @@ private String saveFileForSubmission(final MultipartFile file, final Submission
             var components = filename.split("\\\\");
             filename = components[components.length - 1];
         }
-        // replace all illegal characters with ascii characters \w means A-Za-z0-9 to avoid problems during download later on
-        filename = filename.replaceAll("[^\\w.-]", "");
+        filename = FileService.sanitizeFilename(filename);
         // if the filename is now too short, we prepend "file"
         // this prevents potential problems when users call their file e.g. ßßß.pdf
         if (filename.length() < 5) {
             filename = "file" + filename;
         }
-        final var dirPath = FileUploadSubmission.buildFilePath(exerciseId, submissionId);
-        final var filePath = Path.of(dirPath, filename).toString();
-        final var savedFile = new File(filePath);
-        final var dir = new File(dirPath);
+        final Path dirPath = FileUploadSubmission.buildFilePath(exerciseId, submissionId);
+        final Path filePath = dirPath.resolve(filename);
+        final File savedFile = filePath.toFile();
 
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-        Files.copy(file.getInputStream(), savedFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        FileUtils.copyToFile(file.getInputStream(), savedFile);
 
         return filePath;
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java b/src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java
new file mode 100644
index 000000000000..23a55c67d48d
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/service/HazelcastPathSerializer.java
@@ -0,0 +1,28 @@
+package de.tum.in.www1.artemis.service;
+
+import static de.tum.in.www1.artemis.config.Constants.HAZELCAST_PATH_SERIALIZER_ID;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+
+import com.hazelcast.nio.serialization.ByteArraySerializer;
+
+public class HazelcastPathSerializer implements ByteArraySerializer<Path> {
+
+    @Override
+    public byte[] write(Path path) throws IOException {
+        return path.toString().getBytes(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public Path read(byte[] buffer) throws IOException {
+        String pathString = new String(buffer, StandardCharsets.UTF_8);
+        return Path.of(pathString);
+    }
+
+    @Override
+    public int getTypeId() {
+        return HAZELCAST_PATH_SERIALIZER_ID;
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/service/LearningPathService.java b/src/main/java/de/tum/in/www1/artemis/service/LearningPathService.java
index 33287ecf4380..2329e5c5f757 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/LearningPathService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/LearningPathService.java
@@ -1,10 +1,14 @@
 package de.tum.in.www1.artemis.service;
 
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
+import java.util.stream.LongStream;
+import java.util.stream.Stream;
 
 import javax.validation.constraints.NotNull;
 
+import org.jgrapht.alg.util.UnionFind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.Page;
@@ -13,12 +17,14 @@
 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.CompetencyRelation;
 import de.tum.in.www1.artemis.domain.competency.LearningPath;
 import de.tum.in.www1.artemis.repository.*;
 import de.tum.in.www1.artemis.web.rest.dto.PageableSearchDTO;
 import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO;
 import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO;
 import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathPageableSearchDTO;
+import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO;
 import de.tum.in.www1.artemis.web.rest.util.PageUtil;
 
 /**
@@ -43,12 +49,15 @@ public class LearningPathService {
 
     private final CourseRepository courseRepository;
 
+    private final CompetencyRelationRepository competencyRelationRepository;
+
     public LearningPathService(UserRepository userRepository, LearningPathRepository learningPathRepository, CompetencyProgressRepository competencyProgressRepository,
-            CourseRepository courseRepository) {
+            CourseRepository courseRepository, CompetencyRelationRepository competencyRelationRepository) {
         this.userRepository = userRepository;
         this.learningPathRepository = learningPathRepository;
         this.competencyProgressRepository = competencyProgressRepository;
         this.courseRepository = courseRepository;
+        this.competencyRelationRepository = competencyRelationRepository;
     }
 
     /**
@@ -182,4 +191,225 @@ public LearningPathHealthDTO getHealthStatusForCourse(@NotNull Course course) {
             return new LearningPathHealthDTO(LearningPathHealthDTO.HealthStatus.MISSING, numberOfStudents - numberOfLearningPaths);
         }
     }
+
+    /**
+     * Generates Ngx graph representation of the learning path graph.
+     *
+     * @param learningPath the learning path for which the Ngx representation should be created
+     * @return Ngx graph representation of the learning path
+     * @see NgxLearningPathDTO
+     */
+    public NgxLearningPathDTO generateNgxGraphRepresentation(@NotNull LearningPath learningPath) {
+        Set<NgxLearningPathDTO.Node> nodes = new HashSet<>();
+        Set<NgxLearningPathDTO.Edge> edges = new HashSet<>();
+        learningPath.getCompetencies().forEach(competency -> generateNgxGraphRepresentationForCompetency(learningPath, competency, nodes, edges));
+        generateNgxGraphRepresentationForRelations(learningPath, nodes, edges);
+        return new NgxLearningPathDTO(nodes, edges);
+    }
+
+    /**
+     * Generates Ngx graph representation for competency.
+     * <p>
+     * A competency's representation consists of
+     * <ul>
+     * <li>start node</li>
+     * <li>end node</li>
+     * <li>a node for each learning unit (exercises or lecture unit)</li>
+     * <li>edges from start node to each learning unit</li>
+     * <li>edges from each learning unit to end node</li>
+     * </ul>
+     *
+     * @param learningPath the learning path for which the representation should be created
+     * @param competency   the competency for which the representation will be created
+     * @param nodes        set of nodes to store the new nodes
+     * @param edges        set of edges to store the new edges
+     */
+    private void generateNgxGraphRepresentationForCompetency(LearningPath learningPath, Competency competency, Set<NgxLearningPathDTO.Node> nodes,
+            Set<NgxLearningPathDTO.Edge> edges) {
+        Set<NgxLearningPathDTO.Node> currentCluster = new HashSet<>();
+        // generates start and end node
+        final var startNodeId = getCompetencyStartNodeId(competency.getId());
+        final var endNodeId = getCompetencyEndNodeId(competency.getId());
+        currentCluster.add(new NgxLearningPathDTO.Node(startNodeId, NgxLearningPathDTO.NodeType.COMPETENCY_START, competency.getId()));
+        currentCluster.add(new NgxLearningPathDTO.Node(endNodeId, NgxLearningPathDTO.NodeType.COMPETENCY_END, competency.getId()));
+
+        // generate nodes and edges for lecture units
+        competency.getLectureUnits().forEach(lectureUnit -> {
+            currentCluster.add(new NgxLearningPathDTO.Node(getLectureUnitNodeId(competency.getId(), lectureUnit.getId()), NgxLearningPathDTO.NodeType.LECTURE_UNIT,
+                    lectureUnit.getId(), lectureUnit.getLecture().getId(), lectureUnit.isCompletedFor(learningPath.getUser()), lectureUnit.getName()));
+            edges.add(new NgxLearningPathDTO.Edge(getLectureUnitInEdgeId(competency.getId(), lectureUnit.getId()), startNodeId,
+                    getLectureUnitNodeId(competency.getId(), lectureUnit.getId())));
+            edges.add(new NgxLearningPathDTO.Edge(getLectureUnitOutEdgeId(competency.getId(), lectureUnit.getId()), getLectureUnitNodeId(competency.getId(), lectureUnit.getId()),
+                    endNodeId));
+        });
+        // generate nodes and edges for exercises
+        competency.getExercises().forEach(exercise -> {
+            currentCluster.add(new NgxLearningPathDTO.Node(getExerciseNodeId(competency.getId(), exercise.getId()), NgxLearningPathDTO.NodeType.EXERCISE, exercise.getId(),
+                    exercise.isCompletedFor(learningPath.getUser()), exercise.getTitle()));
+            edges.add(new NgxLearningPathDTO.Edge(getExerciseInEdgeId(competency.getId(), exercise.getId()), startNodeId, getExerciseNodeId(competency.getId(), exercise.getId())));
+            edges.add(new NgxLearningPathDTO.Edge(getExerciseOutEdgeId(competency.getId(), exercise.getId()), getExerciseNodeId(competency.getId(), exercise.getId()), endNodeId));
+        });
+        // if no linked learning units exist directly link start to end
+        if (currentCluster.size() == 2) {
+            edges.add(new NgxLearningPathDTO.Edge(getDirectEdgeId(competency.getId()), startNodeId, endNodeId));
+        }
+
+        nodes.addAll(currentCluster);
+    }
+
+    /**
+     * Generates Ngx graph representations for competency relations.
+     * <p>
+     * The representation will contain:
+     * <ul>
+     * <li>
+     * For each matching cluster (transitive closure of competencies that are in a match relation):
+     * <ul>
+     * <li>two nodes (start and end of cluster) will be created</li>
+     * <li>edges from the start node of the cluster to each start node of the competencies</li>
+     * <li>edges from each end node of the competency to the end node of the cluster</li>
+     * </ul>
+     * </li>
+     * <li>
+     * For each other relation: edge from head competency end node to tail competency start node. If competency is part of a matching cluster, the edge will be linked to the
+     * corresponding cluster start/end node.
+     * </li>
+     * </ul>
+     *
+     * two nodes (start and end of cluster) will be created.
+     *
+     * @param learningPath the learning path for which the Ngx representation should be created
+     * @param nodes        set of nodes to store the new nodes
+     * @param edges        set of edges to store the new edges
+     */
+    private void generateNgxGraphRepresentationForRelations(LearningPath learningPath, Set<NgxLearningPathDTO.Node> nodes, Set<NgxLearningPathDTO.Edge> edges) {
+        final var relations = competencyRelationRepository.findAllByCourseId(learningPath.getCourse().getId());
+
+        // compute match clusters
+        Map<Long, Integer> competencyToMatchCluster = new HashMap<>();
+        final var competenciesInMatchRelation = relations.stream().filter(relation -> relation.getType().equals(CompetencyRelation.RelationType.MATCHES))
+                .flatMap(relation -> Stream.of(relation.getHeadCompetency().getId(), relation.getTailCompetency().getId())).collect(Collectors.toSet());
+        if (!competenciesInMatchRelation.isEmpty()) {
+            UnionFind<Long> matchClusters = new UnionFind<>(competenciesInMatchRelation);
+            relations.stream().filter(relation -> relation.getType().equals(CompetencyRelation.RelationType.MATCHES))
+                    .forEach(relation -> matchClusters.union(relation.getHeadCompetency().getId(), relation.getTailCompetency().getId()));
+
+            // generate map between competencies and cluster node
+            AtomicInteger matchClusterId = new AtomicInteger();
+            relations.stream().filter(relation -> relation.getType().equals(CompetencyRelation.RelationType.MATCHES))
+                    .flatMapToLong(relation -> LongStream.of(relation.getHeadCompetency().getId(), relation.getTailCompetency().getId())).distinct().forEach(competencyId -> {
+                        var parentId = matchClusters.find(competencyId);
+                        var clusterId = competencyToMatchCluster.computeIfAbsent(parentId, (key) -> matchClusterId.getAndIncrement());
+                        competencyToMatchCluster.put(competencyId, clusterId);
+                    });
+
+            // generate match cluster start and end nodes
+            for (int i = 0; i < matchClusters.numberOfSets(); i++) {
+                nodes.add(new NgxLearningPathDTO.Node(getMatchingClusterStartNodeId(i), NgxLearningPathDTO.NodeType.MATCH_START));
+                nodes.add(new NgxLearningPathDTO.Node(getMatchingClusterEndNodeId(i), NgxLearningPathDTO.NodeType.MATCH_END));
+            }
+
+            // generate edges between match cluster nodes and corresponding competencies
+            competencyToMatchCluster.forEach((competency, cluster) -> {
+                edges.add(new NgxLearningPathDTO.Edge(getInEdgeId(competency), getMatchingClusterStartNodeId(cluster), getCompetencyStartNodeId(competency)));
+                edges.add(new NgxLearningPathDTO.Edge(getOutEdgeId(competency), getCompetencyEndNodeId(competency), getMatchingClusterEndNodeId(cluster)));
+            });
+        }
+
+        // generate edges for remaining relations
+        final Set<String> createdRelations = new HashSet<>();
+        relations.stream().filter(relation -> !relation.getType().equals(CompetencyRelation.RelationType.MATCHES))
+                .forEach(relation -> generateNgxGraphRepresentationForRelation(relation, competencyToMatchCluster, createdRelations, edges));
+    }
+
+    /**
+     * Generates Ngx graph representations for competency relation.
+     *
+     * @param relation                 the relation for which the Ngx representation should be created
+     * @param competencyToMatchCluster map from competencies to corresponding cluster
+     * @param createdRelations         set of edge ids that have already been created
+     * @param edges                    set of edges to store the new edges
+     */
+    private void generateNgxGraphRepresentationForRelation(CompetencyRelation relation, Map<Long, Integer> competencyToMatchCluster, Set<String> createdRelations,
+            Set<NgxLearningPathDTO.Edge> edges) {
+        final var sourceId = relation.getHeadCompetency().getId();
+        String sourceNodeId;
+        if (competencyToMatchCluster.containsKey(sourceId)) {
+            sourceNodeId = getMatchingClusterEndNodeId(competencyToMatchCluster.get(sourceId));
+        }
+        else {
+            sourceNodeId = getCompetencyEndNodeId(sourceId);
+        }
+        final var targetId = relation.getTailCompetency().getId();
+        String targetNodeId;
+        if (competencyToMatchCluster.containsKey(targetId)) {
+            targetNodeId = getMatchingClusterStartNodeId(competencyToMatchCluster.get(targetId));
+        }
+        else {
+            targetNodeId = getCompetencyStartNodeId(targetId);
+        }
+        final String relationEdgeId = getRelationEdgeId(sourceNodeId, targetNodeId);
+        // skip if relation has already been created (possible for edges linked to matching cluster start/end nodes)
+        if (!createdRelations.contains(relationEdgeId)) {
+            final var edge = new NgxLearningPathDTO.Edge(relationEdgeId, sourceNodeId, targetNodeId);
+            edges.add(edge);
+            createdRelations.add(relationEdgeId);
+        }
+    }
+
+    public static String getCompetencyStartNodeId(long competencyId) {
+        return "node-" + competencyId + "-start";
+    }
+
+    public static String getCompetencyEndNodeId(long competencyId) {
+        return "node-" + competencyId + "-end";
+    }
+
+    public static String getLectureUnitNodeId(long competencyId, long lectureUnitId) {
+        return "node-" + competencyId + "-lu-" + lectureUnitId;
+    }
+
+    public static String getExerciseNodeId(long competencyId, long exerciseId) {
+        return "node-" + competencyId + "-ex-" + exerciseId;
+    }
+
+    public static String getMatchingClusterStartNodeId(long matchingClusterId) {
+        return "matching-" + matchingClusterId + "-start";
+    }
+
+    public static String getMatchingClusterEndNodeId(long matchingClusterId) {
+        return "matching-" + matchingClusterId + "-end";
+    }
+
+    public static String getLectureUnitInEdgeId(long competencyId, long lectureUnitId) {
+        return "edge-" + competencyId + "-lu-" + getInEdgeId(lectureUnitId);
+    }
+
+    public static String getLectureUnitOutEdgeId(long competencyId, long lectureUnitId) {
+        return "edge-" + competencyId + "-lu-" + getOutEdgeId(lectureUnitId);
+    }
+
+    public static String getExerciseInEdgeId(long competencyId, long exercise) {
+        return "edge-" + competencyId + "-ex-" + getInEdgeId(exercise);
+    }
+
+    public static String getExerciseOutEdgeId(long competencyId, long exercise) {
+        return "edge-" + competencyId + "-ex-" + getOutEdgeId(exercise);
+    }
+
+    public static String getInEdgeId(long id) {
+        return "edge-" + id + "-in";
+    }
+
+    public static String getOutEdgeId(long id) {
+        return "edge-" + id + "-out";
+    }
+
+    public static String getRelationEdgeId(String sourceNodeId, String targetNodeId) {
+        return "edge-relation-" + sourceNodeId + "-" + targetNodeId;
+    }
+
+    public static String getDirectEdgeId(long competencyId) {
+        return "edge-" + competencyId + "-direct";
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java b/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java
index 0c8bc8131492..203f8ea870c9 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/LectureImportService.java
@@ -1,11 +1,13 @@
 package de.tum.in.www1.artemis.service;
 
+import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
+
 import java.io.IOException;
-import java.nio.file.Files;
+import java.net.URI;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.*;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -30,14 +32,14 @@ public class LectureImportService {
 
     private final AttachmentRepository attachmentRepository;
 
-    private final FileService fileService;
+    private final FilePathService filePathService;
 
     public LectureImportService(LectureRepository lectureRepository, LectureUnitRepository lectureUnitRepository, AttachmentRepository attachmentRepository,
-            FileService fileService) {
+            FilePathService filePathService) {
         this.lectureRepository = lectureRepository;
         this.lectureUnitRepository = lectureUnitRepository;
         this.attachmentRepository = attachmentRepository;
-        this.fileService = fileService;
+        this.filePathService = filePathService;
     }
 
     /**
@@ -151,15 +153,15 @@ private Attachment cloneAttachment(final Attachment importedAttachment) {
         attachment.setVersion(importedAttachment.getVersion());
         attachment.setAttachmentType(importedAttachment.getAttachmentType());
 
-        Path oldPath = Path.of(fileService.actualPathForPublicPath(importedAttachment.getLink()));
-        Path tempPath = Path.of(FilePathService.getTempFilePath(), oldPath.getFileName().toString());
+        Path oldPath = filePathService.actualPathForPublicPath(URI.create(importedAttachment.getLink()));
+        Path tempPath = FilePathService.getTempFilePath().resolve(oldPath.getFileName());
 
         try {
             log.debug("Copying attachment file from {} to {}", oldPath, tempPath);
-            Files.copy(oldPath, tempPath, StandardCopyOption.REPLACE_EXISTING);
+            FileUtils.copyFile(oldPath.toFile(), tempPath.toFile(), REPLACE_EXISTING);
 
             // File was copied to a temp directory and will be moved once we persist the attachment
-            attachment.setLink(fileService.publicPathForActualPath(tempPath.toString(), null));
+            attachment.setLink(filePathService.publicPathForActualPath(tempPath, null).toString());
         }
         catch (IOException e) {
             log.error("Error while copying file", e);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java b/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java
index d3c5c857462b..22924c761d6c 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/LegalDocumentService.java
@@ -1,11 +1,12 @@
 package de.tum.in.www1.artemis.service;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 import java.util.Optional;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -155,8 +156,7 @@ protected LegalDocument updateLegalDocument(LegalDocument legalDocument) {
             if (!Files.exists(legalDocumentsBasePath)) {
                 Files.createDirectories(legalDocumentsBasePath);
             }
-            Files.writeString(getLegalDocumentPath(legalDocument.getLanguage(), legalDocument.getType()), legalDocument.getText(), StandardOpenOption.CREATE,
-                    StandardOpenOption.TRUNCATE_EXISTING);
+            FileUtils.writeStringToFile(getLegalDocumentPath(legalDocument.getLanguage(), legalDocument.getType()).toFile(), legalDocument.getText(), StandardCharsets.UTF_8);
             return legalDocument;
         }
         catch (IOException e) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java b/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
index 8006f3a40275..e1a43e3f8c39 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/PlantUmlService.java
@@ -8,15 +8,14 @@
 import java.nio.file.Paths;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
-import net.sourceforge.plantuml.FileFormat;
-import net.sourceforge.plantuml.FileFormatOption;
-import net.sourceforge.plantuml.SourceStringReader;
+import net.sourceforge.plantuml.*;
 
 @Service
 public class PlantUmlService {
@@ -50,8 +49,7 @@ private void ensureThemes() {
                 log.info("Storing UML theme to temporary directory");
                 final var themeResource = resourceLoaderService.getResource(Path.of("puml", fileName));
                 try (var inputStream = themeResource.getInputStream()) {
-                    Files.createDirectories(PATH_TMP_THEME);
-                    Files.write(path, inputStream.readAllBytes());
+                    FileUtils.copyToFile(inputStream, path.toFile());
                     log.info("UML theme stored successfully to {}", path);
                 }
                 catch (IOException e) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java b/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java
index 9d24d2383fb4..29638f7d66b5 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/QuizExerciseImportService.java
@@ -1,5 +1,7 @@
 package de.tum.in.www1.artemis.service;
 
+import java.net.URI;
+import java.nio.file.Path;
 import java.util.*;
 
 import javax.validation.constraints.NotNull;
@@ -23,14 +25,18 @@ public class QuizExerciseImportService extends ExerciseImportService {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final ChannelService channelService;
 
     public QuizExerciseImportService(QuizExerciseService quizExerciseService, FileService fileService, ExampleSubmissionRepository exampleSubmissionRepository,
-            SubmissionRepository submissionRepository, ResultRepository resultRepository, ChannelService channelService, FeedbackService feedbackService) {
+            SubmissionRepository submissionRepository, ResultRepository resultRepository, ChannelService channelService, FeedbackService feedbackService,
+            FilePathService filePathService) {
         super(exampleSubmissionRepository, submissionRepository, resultRepository, feedbackService);
         this.quizExerciseService = quizExerciseService;
         this.fileService = fileService;
         this.channelService = channelService;
+        this.filePathService = filePathService;
     }
 
     /**
@@ -97,9 +103,15 @@ private void copyQuizQuestions(QuizExercise importedExercise, QuizExercise newEx
                 }
             }
             else if (quizQuestion instanceof DragAndDropQuestion dndQuestion) {
-                // Need to copy the file and get a new path, otherwise two different questions would share the same image and would cause problems in case one was deleted
-                dndQuestion
-                        .setBackgroundFilePath(fileService.copyExistingFileToTarget(dndQuestion.getBackgroundFilePath(), FilePathService.getDragAndDropBackgroundFilePath(), null));
+                if (dndQuestion.getBackgroundFilePath() != null) {
+                    // Need to copy the file and get a new path, otherwise two different questions would share the same image and would cause problems in case one was deleted
+                    Path oldPath = filePathService.actualPathForPublicPath(URI.create(dndQuestion.getBackgroundFilePath()));
+                    Path newPath = fileService.copyExistingFileToTarget(oldPath, FilePathService.getDragAndDropBackgroundFilePath());
+                    dndQuestion.setBackgroundFilePath(filePathService.publicPathForActualPath(newPath, null).toString());
+                }
+                else {
+                    log.warn("BackgroundFilePath of DragAndDropQuestion {} is null", dndQuestion.getId());
+                }
 
                 for (DropLocation dropLocation : dndQuestion.getDropLocations()) {
                     dropLocation.setId(null);
@@ -110,7 +122,9 @@ else if (quizQuestion instanceof DragAndDropQuestion dndQuestion) {
                     dragItem.setQuestion(dndQuestion);
                     if (dragItem.getPictureFilePath() != null) {
                         // Need to copy the file and get a new path, same as above
-                        dragItem.setPictureFilePath(fileService.copyExistingFileToTarget(dragItem.getPictureFilePath(), FilePathService.getDragItemFilePath(), null));
+                        Path oldDragItemPath = filePathService.actualPathForPublicPath(URI.create(dragItem.getPictureFilePath()));
+                        Path newDragItemPath = fileService.copyExistingFileToTarget(oldDragItemPath, FilePathService.getDragItemFilePath());
+                        dragItem.setPictureFilePath(filePathService.publicPathForActualPath(newDragItemPath, null).toString());
                     }
                 }
                 for (DragAndDropMapping dragAndDropMapping : dndQuestion.getCorrectMappings()) {
diff --git a/src/main/java/de/tum/in/www1/artemis/service/RepositoryService.java b/src/main/java/de/tum/in/www1/artemis/service/RepositoryService.java
index 324ecd8fad0d..8b294f0bdddb 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/RepositoryService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/RepositoryService.java
@@ -186,7 +186,7 @@ public Map<String, Boolean> getFilesWithInformationAboutChange(Repository reposi
     public void createFile(Repository repository, String filePath, InputStream inputStream) throws IOException {
         Path safePath = checkIfPathIsValidAndExistanceAndReturnSafePath(repository, filePath, false);
         File file = checkIfPathAndFileAreValidAndReturnSafeFile(repository, safePath);
-        Files.copy(inputStream, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        FileUtils.copyToFile(inputStream, file);
         repository.setContent(null); // invalidate cache
         inputStream.close();
     }
@@ -205,7 +205,7 @@ public void createFolder(Repository repository, String folderPath, InputStream i
         Files.createDirectory(repository.getLocalPath().resolve(safePath));
         // We need to add an empty keep file so that the folder can be added to the git repository
         File keep = new File(repository.getLocalPath().resolve(safePath).resolve(".keep"), repository);
-        Files.copy(inputStream, keep.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        FileUtils.copyToFile(inputStream, keep);
         repository.setContent(null); // invalidate cache
         inputStream.close();
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java b/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java
index 42f7936fa5e9..62abfa99e07b 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ResourceLoaderService.java
@@ -2,13 +2,11 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -16,6 +14,7 @@
 
 import javax.annotation.Nonnull;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -200,13 +199,10 @@ public Path getResourceFilePath(Path path) throws IOException, URISyntaxExceptio
         }
         else if ("jar".equals(resourceUrl.getProtocol())) {
             // Resource is in a jar file.
-            InputStream resourceInputStream = resource.getInputStream();
-
             Path resourcePath = Files.createTempFile(UUID.randomUUID().toString(), "");
-            Files.copy(resourceInputStream, resourcePath, StandardCopyOption.REPLACE_EXISTING);
-            resourceInputStream.close();
-            // Delete the temporary file when the JVM exits.
-            resourcePath.toFile().deleteOnExit();
+            File file = resourcePath.toFile();
+            file.deleteOnExit();
+            FileUtils.copyInputStreamToFile(resource.getInputStream(), file);
             return resourcePath;
         }
         throw new IllegalArgumentException("Unsupported protocol: " + resourceUrl.getProtocol());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java b/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java
index 623f49fe8933..7c22ef6cf264 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/SlideSplitterService.java
@@ -4,6 +4,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.URI;
+import java.nio.file.Path;
 
 import javax.imageio.ImageIO;
 
@@ -33,10 +35,13 @@ public class SlideSplitterService {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final SlideRepository slideRepository;
 
-    public SlideSplitterService(FileService fileService, SlideRepository slideRepository) {
+    public SlideSplitterService(FileService fileService, FilePathService filePathService, SlideRepository slideRepository) {
         this.fileService = fileService;
+        this.filePathService = filePathService;
         this.slideRepository = slideRepository;
     }
 
@@ -47,8 +52,8 @@ public SlideSplitterService(FileService fileService, SlideRepository slideReposi
      */
     @Async
     public void splitAttachmentUnitIntoSingleSlides(AttachmentUnit attachmentUnit) {
-        String attachmentPath = fileService.actualPathForPublicPath(attachmentUnit.getAttachment().getLink());
-        File file = new File(attachmentPath);
+        Path attachmentPath = filePathService.actualPathForPublicPath(URI.create(attachmentUnit.getAttachment().getLink()));
+        File file = attachmentPath.toFile();
         try (PDDocument document = Loader.loadPDF(file)) {
             String pdfFilename = file.getName();
             splitAttachmentUnitIntoSingleSlides(document, attachmentUnit, pdfFilename);
@@ -77,7 +82,7 @@ public void splitAttachmentUnitIntoSingleSlides(PDDocument document, AttachmentU
                 BufferedImage bufferedImage = pdfRenderer.renderImageWithDPI(page, 72, ImageType.RGB);
                 byte[] imageInByte = bufferedImageToByteArray(bufferedImage, "png");
                 MultipartFile slideFile = fileService.convertByteArrayToMultipart(fileNameWithOutExt + "_" + attachmentUnit.getId() + "_Slide_" + (page + 1), ".png", imageInByte);
-                String filePath = fileService.handleSaveFile(slideFile, true, false);
+                String filePath = fileService.handleSaveFile(slideFile, true, false).toString();
                 Slide slideEntity = new Slide();
                 slideEntity.setSlideImagePath(filePath);
                 slideEntity.setSlideNumber(page + 1);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java b/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java
index c686196aebdd..45cb8e38262a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/ZipFileService.java
@@ -12,6 +12,7 @@
 import javax.annotation.Nullable;
 
 import org.apache.commons.compress.utils.FileNameUtils;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -62,7 +63,7 @@ else if (Files.isReadable(path) && Files.isDirectory(path)) {
      */
     public void createTemporaryZipFile(Path zipFilePath, List<Path> paths, long deleteDelayInMinutes) throws IOException {
         createZipFile(zipFilePath, paths);
-        fileService.scheduleForDeletion(zipFilePath, deleteDelayInMinutes);
+        fileService.schedulePathForDeletion(zipFilePath, deleteDelayInMinutes);
     }
 
     /**
@@ -119,7 +120,7 @@ private void copyToZipFile(ZipOutputStream zipOutputStream, Path path, ZipEntry
         try {
             if (Files.exists(path)) {
                 zipOutputStream.putNextEntry(zipEntry);
-                Files.copy(path, zipOutputStream);
+                FileUtils.copyFile(path.toFile(), zipOutputStream);
                 zipOutputStream.closeEntry();
             }
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java
index 920471153db6..a5499626c650 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/connectors/localci/LocalCIContainerService.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -272,7 +273,7 @@ public Path createBuildScript(ProgrammingExercise programmingExercise, List<Auxi
                 ./gradlew clean test""");
 
         try {
-            Files.writeString(buildScriptPath, buildScript.toString(), StandardCharsets.UTF_8);
+            FileUtils.writeStringToFile(buildScriptPath.toFile(), buildScript.toString(), StandardCharsets.UTF_8);
         }
         catch (IOException e) {
             throw new LocalCIException("Failed to create build script file", 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 1b2a48207d82..8605d20766d6 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
@@ -3,6 +3,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import javax.servlet.http.HttpServletResponse;
@@ -31,7 +32,10 @@
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.security.jwt.JWTCookieService;
+import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService;
+import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService;
 import de.tum.in.www1.artemis.service.user.UserCreationService;
+import tech.jhipster.security.RandomUtil;
 
 @Service
 public class LtiService {
@@ -50,12 +54,19 @@ public class LtiService {
 
     private final JWTCookieService jwtCookieService;
 
+    private final Optional<VcsUserManagementService> optionalVcsUserManagementService;
+
+    private final Optional<CIUserManagementService> optionalCIUserManagementService;
+
     public LtiService(UserCreationService userCreationService, UserRepository userRepository, ArtemisAuthenticationProvider artemisAuthenticationProvider,
-            JWTCookieService jwtCookieService) {
+            JWTCookieService jwtCookieService, Optional<VcsUserManagementService> optionalVcsUserManagementService,
+            Optional<CIUserManagementService> optionalCIUserManagementService) {
         this.userCreationService = userCreationService;
         this.userRepository = userRepository;
         this.artemisAuthenticationProvider = artemisAuthenticationProvider;
         this.jwtCookieService = jwtCookieService;
+        this.optionalVcsUserManagementService = optionalVcsUserManagementService;
+        this.optionalCIUserManagementService = optionalCIUserManagementService;
     }
 
     /**
@@ -112,11 +123,18 @@ private Authentication createNewUserFromLaunchRequest(String email, String usern
             final User newUser;
             final var groups = new HashSet<String>();
             groups.add(LTI_GROUP_NAME);
-            newUser = userCreationService.createUser(username, null, groups, firstName, lastName, email, null, null, Constants.DEFAULT_LANGUAGE, true);
+
+            var password = RandomUtil.generatePassword();
+            newUser = userCreationService.createUser(username, password, groups, firstName, lastName, email, null, null, Constants.DEFAULT_LANGUAGE, true);
             newUser.setActivationKey(null);
             userRepository.save(newUser);
+
+            optionalVcsUserManagementService.ifPresent(vcsUserManagementService -> vcsUserManagementService.createVcsUser(newUser, password));
+            optionalCIUserManagementService.ifPresent(ciUserManagementService -> ciUserManagementService.createUser(newUser, password));
+
             log.info("Created new user {}", newUser);
             return newUser;
+
         });
 
         log.info("createNewUserFromLaunchRequest: {}", user);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java
index cd2aabaaad9f..89f640e742f6 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/exam/ExamUserService.java
@@ -110,7 +110,7 @@ public ExamUsersNotFoundDTO saveImages(long examId, MultipartFile file) {
                     ExamUser examUser = examUserOptional.get();
                     MultipartFile studentImageFile = fileService.convertByteArrayToMultipart(examUserWithImageDTO.studentRegistrationNumber() + "_student_image", ".png",
                             examUserWithImageDTO.image().imageInBytes());
-                    String responsePath = fileService.handleSaveFile(studentImageFile, false, false);
+                    String responsePath = fileService.handleSaveFile(studentImageFile, false, false).toString();
                     examUser.setStudentImagePath(responsePath);
                     examUserRepository.save(examUser);
                 }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java
index e2f39720073c..ddd5c15e5a5a 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/CourseExamExportService.java
@@ -128,7 +128,7 @@ private Optional<Path> zipExportedExercises(Path outputDir, List<String> exportE
         var exportedCourse = createCourseZipFile(courseZip, List.of(tmpDir), exportErrors);
 
         // Delete temporary directory used for zipping
-        fileService.scheduleForDirectoryDeletion(tmpDir, 1);
+        fileService.scheduleDirectoryPathForRecursiveDeletion(tmpDir, 1);
 
         var exportState = exportErrors.isEmpty() ? CourseExamExportState.COMPLETED : CourseExamExportState.COMPLETED_WITH_WARNINGS;
         notifyUserAboutExerciseExportState(notificationTopic, exportState, exportErrors);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java
index ff1d639e0b3a..b059fdefba47 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportCreationService.java
@@ -11,6 +11,7 @@
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVPrinter;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -113,7 +114,7 @@ private DataExport createDataExportWithContent(DataExport dataExport) throws IOE
     private void addReadmeFile(Path workingDirectory) throws IOException, URISyntaxException {
         var readmeInDataExportPath = workingDirectory.resolve("README.md");
         var readmeTemplatePath = Path.of("templates", "dataexport", "README.md");
-        Files.copy(resourceLoaderService.getResourceFilePath(readmeTemplatePath), readmeInDataExportPath);
+        FileUtils.copyFile(resourceLoaderService.getResourceFilePath(readmeTemplatePath).toFile(), readmeInDataExportPath.toFile());
     }
 
     /**
@@ -195,7 +196,7 @@ private Path prepareDataExport(DataExport dataExport) throws IOException {
         }
         dataExport = dataExportRepository.save(dataExport);
         Path workingDirectory = Files.createTempDirectory(dataExportsPath, "data-export-working-dir");
-        fileService.scheduleForDirectoryDeletion(workingDirectory, 30);
+        fileService.scheduleDirectoryPathForRecursiveDeletion(workingDirectory, 30);
         dataExport.setDataExportState(DataExportState.IN_CREATION);
         dataExportRepository.save(dataExport);
         return workingDirectory;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java
index ea1d17ab992c..f55ccbb21e3e 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportExerciseCreationService.java
@@ -5,8 +5,8 @@
 import static de.tum.in.www1.artemis.service.export.DataExportUtil.retrieveCourseDirPath;
 import static de.tum.in.www1.artemis.service.util.RoundingUtil.roundToNDecimalPlaces;
 
-import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
@@ -149,7 +149,7 @@ public void createProgrammingExerciseExport(ProgrammingExercise programmingExerc
 
         // we use this directory only to clone the repository and don't do this in our current directory because the current directory is part of the final data export
         // --> we can delete it after use
-        var tempRepoWorkingDir = fileService.getTemporaryUniquePath(repoClonePath, 10);
+        var tempRepoWorkingDir = fileService.getTemporaryUniqueSubfolderPath(repoClonePath, 10);
         programmingExerciseExportService.exportStudentRepositories(programmingExercise, listOfProgrammingExerciseParticipations, repositoryExportOptions, tempRepoWorkingDir,
                 exerciseDir, Collections.synchronizedList(new ArrayList<>()));
 
@@ -235,7 +235,7 @@ private void storeModelingSubmissionContent(ModelingSubmission modelingSubmissio
         }
 
         try (var modelAsPdf = apollonConversionService.get().convertModel(modelingSubmission.getModel())) {
-            Files.write(outputDir.resolve(fileName + PDF_FILE_EXTENSION), modelAsPdf.readAllBytes());
+            FileUtils.writeByteArrayToFile(outputDir.resolve(fileName + PDF_FILE_EXTENSION).toFile(), modelAsPdf.readAllBytes());
         }
         catch (Exception e) {
             log.warn("Failed to include the model as pdf, going to include it as plain JSON file.");
@@ -254,11 +254,11 @@ private void storeModelingSubmissionContent(ModelingSubmission modelingSubmissio
      * @throws IOException if the file cannot be written
      */
     private void addModelJsonWithExplanationHowToView(String model, Path outputDir, String fileName) throws IOException {
-        Files.writeString(outputDir.resolve(fileName + ".json"), model);
+        FileUtils.writeStringToFile(outputDir.resolve(fileName + ".md").toFile(), model, StandardCharsets.UTF_8);
         String explanation = """
                 You can view your model if you go to [Apollon Modeling Editor](https://www.apollon.ase.in.tum.de) and click on File --> Import and select the .json file.
                 """;
-        Files.writeString(outputDir.resolve("view_model.md"), explanation);
+        FileUtils.writeStringToFile(outputDir.resolve("view_model.md").toFile(), explanation, StandardCharsets.UTF_8);
     }
 
     /**
@@ -271,7 +271,8 @@ private void addModelJsonWithExplanationHowToView(String model, Path outputDir,
     private void storeTextSubmissionContent(TextSubmission textSubmission, Path outputDir) throws IOException {
         // text can be null which leads to an exception
         if (textSubmission.getText() != null) {
-            Files.writeString(outputDir.resolve("text_exercise_submission_" + textSubmission.getId() + "_text.txt"), textSubmission.getText());
+            FileUtils.writeStringToFile(outputDir.resolve("text_exercise_submission_" + textSubmission.getId() + "_text.txt").toFile(), textSubmission.getText(),
+                    StandardCharsets.UTF_8);
         }
         else {
             log.warn("Cannot include text submission content in data export because content is null for submission with id: {}", textSubmission.getId());
@@ -329,7 +330,8 @@ private void createResultsAndComplaintFiles(Submission submission, Path outputDi
                         resultScoreAndFeedbacks.append("\n");
                     }
                 }
-                Files.writeString(outputDir.resolve("submission_" + submission.getId() + "_result_" + result.getId() + TXT_FILE_EXTENSION), resultScoreAndFeedbacks);
+                FileUtils.writeStringToFile(outputDir.resolve("submission_" + submission.getId() + "_result_" + result.getId() + TXT_FILE_EXTENSION).toFile(),
+                        resultScoreAndFeedbacks.toString(), StandardCharsets.UTF_8);
             }
             resultScoreAndFeedbacks = new StringBuilder();
         }
@@ -430,9 +432,9 @@ else if (plagiarismCase.getVerdict() == PlagiarismVerdict.WARNING) {
      * @param fileUploadSubmission the file upload submission for which the file should be copied
      * @throws IOException if the file cannot be copied
      */
-    private void copyFileUploadSubmissionFile(String submissionFilePath, Path outputDir, FileUploadSubmission fileUploadSubmission) throws IOException {
+    private void copyFileUploadSubmissionFile(Path submissionFilePath, Path outputDir, FileUploadSubmission fileUploadSubmission) throws IOException {
         try {
-            FileUtils.copyDirectory(new File(submissionFilePath), outputDir.toFile());
+            FileUtils.copyDirectory(submissionFilePath.toFile(), outputDir.toFile());
         }
         catch (IOException exception) {
             log.info("Cannot include submission for file upload exercise stored at {}", submissionFilePath);
@@ -449,8 +451,8 @@ private void copyFileUploadSubmissionFile(String submissionFilePath, Path output
      */
     private void addInfoThatFileForFileUploadSubmissionNoLongerExists(Path outputDir, FileUploadSubmission fileUploadSubmission) throws IOException {
         var exercise = fileUploadSubmission.getParticipation().getExercise();
-        Files.writeString(outputDir.resolve("submission_file_no_longer_exists.md"),
-                String.format("Your submitted file for the exercise %s no longer exists on the file system.", exercise));
+        FileUtils.writeStringToFile(outputDir.resolve("submission_file_no_longer_exists.md").toFile(),
+                String.format("Your submitted file for the exercise %s no longer exists on the file system.", exercise), StandardCharsets.UTF_8);
     }
 
     /**
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java
index a89e41411f0a..dcb16d013298 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportQuizExerciseCreationService.java
@@ -1,12 +1,13 @@
 package de.tum.in.www1.artemis.service.export;
 
 import java.io.IOException;
-import java.nio.file.Files;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.stereotype.Service;
 
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
@@ -73,11 +74,12 @@ else if (submittedAnswer instanceof MultipleChoiceSubmittedAnswer multipleChoice
                 }
             }
             if (!multipleChoiceQuestionsSubmissions.isEmpty()) {
-                Files.write(outputDir.resolve("quiz_submission_" + submission.getId() + "_multiple_choice_questions_answers" + TXT_FILE_EXTENSION),
-                        multipleChoiceQuestionsSubmissions);
+                FileUtils.writeLines(outputDir.resolve("quiz_submission_" + submission.getId() + "_multiple_choice_questions_answers" + TXT_FILE_EXTENSION).toFile(),
+                        StandardCharsets.UTF_8.name(), multipleChoiceQuestionsSubmissions);
             }
             if (!shortAnswerQuestionsSubmissions.isEmpty()) {
-                Files.write(outputDir.resolve("quiz_submission_" + submission.getId() + "_short_answer_questions_answers" + TXT_FILE_EXTENSION), shortAnswerQuestionsSubmissions);
+                FileUtils.writeLines(outputDir.resolve("quiz_submission_" + submission.getId() + "_short_answer_questions_answers" + TXT_FILE_EXTENSION).toFile(),
+                        StandardCharsets.UTF_8.name(), shortAnswerQuestionsSubmissions);
             }
         }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java
index 6972474acadd..19890057c762 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/DataExportService.java
@@ -150,7 +150,7 @@ public void deleteDataExportAndSetDataExportState(DataExport dataExport) {
         if (dataExport.getFilePath() == null) {
             return;
         }
-        fileService.scheduleForDeletion(Path.of(dataExport.getFilePath()), 2);
+        fileService.schedulePathForDeletion(Path.of(dataExport.getFilePath()), 2);
         if (dataExport.getDataExportState().hasBeenDownloaded()) {
             dataExport.setDataExportState(DataExportState.DOWNLOADED_DELETED);
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java
index 691c4c875843..b57dcda0b5b9 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/ExerciseWithSubmissionsExportService.java
@@ -1,12 +1,14 @@
 package de.tum.in.www1.artemis.service.export;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -71,7 +73,7 @@ private void exportProblemStatementWithEmbeddedFiles(Exercise exercise, List<Str
         String cleanProblemStatementFileName = FileService.sanitizeFilename(problemStatementFileName);
         var problemStatementExportPath = exportDir.resolve(cleanProblemStatementFileName);
         if (exercise.getProblemStatement() != null) {
-            Files.writeString(problemStatementExportPath, exercise.getProblemStatement());
+            FileUtils.writeStringToFile(problemStatementExportPath.toFile(), exercise.getProblemStatement(), StandardCharsets.UTF_8);
             copyEmbeddedFiles(exercise, exportDir, pathsToBeZipped, exportErrors);
             pathsToBeZipped.add(problemStatementExportPath);
         }
@@ -149,12 +151,12 @@ private void copyFilesEmbeddedWithHtmlSyntax(Exercise exercise, List<String> exp
      */
     private void constructFilenameAndCopyFile(Exercise exercise, List<String> exportErrors, Path embeddedFilesDir, String filePath) {
         String fileName = filePath.replace(API_MARKDOWN_FILE_PATH, "");
-        Path imageFilePath = Path.of(FilePathService.getMarkdownFilePath(), fileName);
+        Path imageFilePath = FilePathService.getMarkdownFilePath().resolve(fileName);
         Path imageExportPath = embeddedFilesDir.resolve(fileName);
         // we need this check as it might be that the matched string is different and not filtered out above but the file is already copied
         if (!Files.exists(imageExportPath)) {
             try {
-                Files.copy(imageFilePath, imageExportPath);
+                FileUtils.copyFile(imageFilePath.toFile(), imageExportPath.toFile());
             }
             catch (IOException e) {
                 exportErrors.add("Failed to copy embedded files: " + e.getMessage());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java
index a8302aff65c5..928c98d4b9c5 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/FileUploadSubmissionExportService.java
@@ -6,6 +6,7 @@
 import java.nio.file.Path;
 import java.util.regex.Pattern;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -34,17 +35,16 @@ protected void saveSubmissionToFile(Exercise exercise, Submission submission, Fi
         }
 
         // we need to get the 'real' file path here, the submission only has the api url path
-        String filePath = FileUploadSubmission.buildFilePath(exercise.getId(), submission.getId());
-        Path filePathPath = Path.of(filePath);
+        Path filePath = FileUploadSubmission.buildFilePath(exercise.getId(), submission.getId());
 
-        if (!Files.exists(filePathPath)) { // throw if submission file does not exist
-            throw new IOException("Cannot export submission " + submission.getId() + " because the uploaded file " + filePathPath + " doesn't exist.");
+        if (!Files.exists(filePath)) { // throw if submission file does not exist
+            throw new IOException("Cannot export submission " + submission.getId() + " because the uploaded file " + filePath + " doesn't exist.");
         }
 
-        try (var files = Files.list(filePathPath)) {
+        try (var files = Files.list(filePath)) {
             files.forEach(content -> {
                 try {
-                    Files.copy(content, file.toPath());
+                    FileUtils.copyFile(content.toFile(), file);
                 }
                 catch (IOException e) {
                     log.error("Failed to copy file {} to zip file", content, e);
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java
index 29bafc2e0296..400e771aea10 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/ProgrammingExerciseExportService.java
@@ -675,7 +675,7 @@ private Path createZipForRepositoryWithParticipation(final ProgrammingExercise p
                 try {
                     log.debug("Normalizing code style for participation {}", participation);
                     fileService.normalizeLineEndingsDirectory(repository.getLocalPath());
-                    fileService.convertToUTF8Directory(repository.getLocalPath());
+                    fileService.convertFilesInDirectoryToUtf8(repository.getLocalPath());
                 }
                 catch (IOException ex) {
                     log.warn("Cannot normalize code style in the repository {} due to the following exception: {}", repository.getLocalPath(), ex.getMessage());
diff --git a/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java b/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java
index 9bf450a76ccf..545971416039 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/export/SubmissionExportService.java
@@ -82,7 +82,7 @@ public File exportStudentSubmissionsElseThrow(Long exerciseId, SubmissionExportO
      * @return the zipped file with the exported submissions
      */
     public List<Path> exportStudentSubmissions(Long exerciseId, SubmissionExportOptionsDTO submissionExportOptions) {
-        Path outputDir = fileService.getTemporaryUniquePath(submissionExportPath, EXPORTED_SUBMISSIONS_DELETION_DELAY_IN_MINUTES);
+        Path outputDir = fileService.getTemporaryUniqueSubfolderPath(submissionExportPath, EXPORTED_SUBMISSIONS_DELETION_DELAY_IN_MINUTES);
         return exportStudentSubmissions(exerciseId, submissionExportOptions, true, outputDir, new ArrayList<>(), new ArrayList<>());
     }
 
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 ca47d0ef6f4e..b135284995e9 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
@@ -169,7 +169,7 @@ public File checkPlagiarismWithJPlagReport(long programmingExerciseId, float sim
     @NotNull
     private JPlagResult computeJPlagResult(ProgrammingExercise programmingExercise, float similarityThreshold, int minimumScore) {
         long programmingExerciseId = programmingExercise.getId();
-        final var targetPath = fileService.getTemporaryUniquePath(repoDownloadClonePath, 60);
+        final var targetPath = fileService.getTemporaryUniqueSubfolderPath(repoDownloadClonePath, 60);
         List<ProgrammingExerciseParticipation> participations = filterStudentParticipationsForComparison(programmingExercise, minimumScore);
         log.info("Download repositories for JPlag for programming exercise {} to compare {} participations", programmingExerciseId, participations.size());
 
@@ -245,9 +245,9 @@ private void limitAndSavePlagiarismResult(TextPlagiarismResult textPlagiarismRes
      * @return the zip file
      */
     public File generateJPlagReportZip(JPlagResult jPlagResult, ProgrammingExercise programmingExercise) {
-        final var targetPath = fileService.getTemporaryUniquePath(repoDownloadClonePath, 5);
-        final var reportFolder = targetPath.resolve(programmingExercise.getProjectKey() + " JPlag Report").toString();
-        final var reportFolderFile = new File(reportFolder);
+        final var targetPath = fileService.getTemporaryUniqueSubfolderPath(repoDownloadClonePath, 5);
+        final var reportFolder = targetPath.resolve(programmingExercise.getProjectKey() + " JPlag Report");
+        final var reportFolderFile = reportFolder.toFile();
 
         // Create directories.
         if (!reportFolderFile.mkdirs()) {
@@ -259,11 +259,11 @@ public File generateJPlagReportZip(JPlagResult jPlagResult, ProgrammingExercise
         // Write JPlag report result to the file.
         log.info("Write JPlag report to file system and zip it");
         ReportObjectFactory reportObjectFactory = new ReportObjectFactory();
-        reportObjectFactory.createAndSaveReport(jPlagResult, reportFolder);
+        reportObjectFactory.createAndSaveReport(jPlagResult, reportFolder.toString());
         // JPlag automatically zips the report
 
         var zipFile = new File(reportFolder + ".zip");
-        fileService.scheduleForDeletion(zipFile.getAbsoluteFile().toPath(), 1);
+        fileService.schedulePathForDeletion(zipFile.getAbsoluteFile().toPath(), 1);
         return zipFile;
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java
index 692b99aeb043..e0cc65715604 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/programming/JavaTemplateUpgradeService.java
@@ -1,12 +1,11 @@
 package de.tum.in.www1.artemis.service.programming;
 
 import java.io.*;
-import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
 import java.util.*;
 import java.util.function.Predicate;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Plugin;
@@ -290,7 +289,7 @@ private void overwriteFilesIfPresent(Repository repository, Resource[] templateR
             Optional<Resource> templateResource = getFileByName(templateResources, filename);
             if (repoFile.isPresent() && templateResource.isPresent()) {
                 try (InputStream inputStream = templateResource.get().getInputStream()) {
-                    Files.copy(inputStream, repoFile.get().toPath(), StandardCopyOption.REPLACE_EXISTING);
+                    FileUtils.copyToFile(inputStream, repoFile.get());
                 }
             }
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java
index fcd9fe6c3999..2d085d54a80d 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseImportFromFileService.java
@@ -89,7 +89,7 @@ public ProgrammingExercise importProgrammingExerciseFromFile(ProgrammingExercise
         }
         finally {
             // want to make sure the directories are deleted, even if an exception is thrown
-            fileService.scheduleForDirectoryDeletion(importExerciseDir, 5);
+            fileService.scheduleDirectoryPathForRecursiveDeletion(importExerciseDir, 5);
         }
         return importedProgrammingExercise;
     }
@@ -106,11 +106,10 @@ private void copyEmbeddedFiles(Path importExerciseDir) throws IOException {
             return;
         }
         try (var embeddedFiles = Files.list(embeddedFilesDir)) {
-            for (var file : embeddedFiles.toList()) {
-                var targetPath = Path.of(FilePathService.getMarkdownFilePath(), file.getFileName().toString());
-                // we need this check because the detection if a file exists of Files.copy seems not to work properly
+            for (Path file : embeddedFiles.toList()) {
+                Path targetPath = FilePathService.getMarkdownFilePath().resolve(file.getFileName());
                 if (!Files.exists(targetPath)) {
-                    Files.copy(file, targetPath);
+                    FileUtils.copyFile(file.toFile(), targetPath.toFile());
                 }
             }
         }
diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java
index b43038b0a0b6..65f093083484 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseRepositoryService.java
@@ -10,6 +10,7 @@
 import java.time.ZonedDateTime;
 import java.util.*;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -310,7 +311,7 @@ private void setupJVMTestTemplateAndPush(final RepositoryResources resources, fi
 
         if (ProjectType.MAVEN_BLACKBOX.equals(projectType)) {
             Path dejagnuLibFolderPath = repoLocalPath.resolve("testsuite").resolve("lib");
-            fileService.replaceVariablesInFileName(dejagnuLibFolderPath.toString(), PACKAGE_NAME_FILE_PLACEHOLDER, programmingExercise.getPackageName());
+            fileService.replaceVariablesInFilename(dejagnuLibFolderPath, PACKAGE_NAME_FILE_PLACEHOLDER, programmingExercise.getPackageName());
         }
 
         final Map<String, Boolean> sectionsMap = new HashMap<>();
@@ -422,7 +423,7 @@ private void setupBuildToolProjectFile(final Path repoLocalPath, final ProjectTy
             projectFileFileName = POM_XML;
         }
 
-        fileService.replacePlaceholderSections(repoLocalPath.resolve(projectFileFileName).toAbsolutePath().toString(), activeFeatures);
+        fileService.replacePlaceholderSections(repoLocalPath.resolve(projectFileFileName).toAbsolutePath(), activeFeatures);
     }
 
     private void setupStaticCodeAnalysisConfigFiles(final RepositoryResources resources, final Path templatePath, final Path repoLocalPath) throws IOException {
@@ -483,7 +484,7 @@ private void setupTestTemplateSequentialTestRuns(final RepositoryResources resou
 
         final Path repoLocalPath = getRepoAbsoluteLocalPath(resources.repository);
 
-        fileService.replacePlaceholderSections(repoLocalPath.resolve(projectFileName).toAbsolutePath().toString(), sectionsMap);
+        fileService.replacePlaceholderSections(repoLocalPath.resolve(projectFileName).toAbsolutePath(), sectionsMap);
 
         final Optional<Resource> stagePomXml = getStagePomXml(templatePath, projectTemplatePath, isMaven);
 
@@ -545,7 +546,7 @@ private void setupBuildStage(final Path resourcePrefix, final Path templatePath,
         // staging project files are only required for maven
         final boolean isMaven = isMavenProject(projectType);
         if (isMaven && stagePomXml.isPresent()) {
-            Files.copy(stagePomXml.get().getInputStream(), buildStagePath.resolve(POM_XML));
+            FileUtils.copyFile(stagePomXml.get().getFile(), buildStagePath.resolve(POM_XML).toFile());
         }
 
         final Path buildStageResourcesPath = templatePath.resolve(TEST_FILES_PATH).resolve(buildStageTemplateSubDirectory);
@@ -582,8 +583,7 @@ void replacePlaceholders(final ProgrammingExercise programmingExercise, final Re
 
         switch (programmingLanguage) {
             case JAVA, KOTLIN -> {
-                fileService.replaceVariablesInDirectoryName(getRepoAbsoluteLocalPath(repository).toString(), PACKAGE_NAME_FOLDER_PLACEHOLDER,
-                        programmingExercise.getPackageFolderName());
+                fileService.replaceVariablesInDirectoryName(getRepoAbsoluteLocalPath(repository), PACKAGE_NAME_FOLDER_PLACEHOLDER, programmingExercise.getPackageFolderName());
                 replacements.put(PACKAGE_NAME_PLACEHOLDER, programmingExercise.getPackageName());
             }
             case SWIFT -> replaceSwiftPlaceholders(replacements, programmingExercise, repository);
@@ -608,20 +608,23 @@ void replacePlaceholders(final ProgrammingExercise programmingExercise, final Re
      * @throws IOException Thrown if accessing repository files fails.
      */
     private void replaceSwiftPlaceholders(final Map<String, String> replacements, final ProgrammingExercise programmingExercise, final Repository repository) throws IOException {
-        final String repositoryLocalPath = getRepoAbsoluteLocalPath(repository).toString();
+        final Path repositoryLocalPath = getRepoAbsoluteLocalPath(repository);
         final String packageName = programmingExercise.getPackageName();
+        // The client already provides a clean package name, but we have to make sure that no one abuses the API for injection.
+        // So usually, the name should not change.
+        final String cleanPackageName = packageName.replaceAll("[^a-zA-Z\\d]", "");
 
         if (ProjectType.PLAIN.equals(programmingExercise.getProjectType())) {
-            fileService.replaceVariablesInDirectoryName(repositoryLocalPath, PACKAGE_NAME_FOLDER_PLACEHOLDER, packageName);
-            fileService.replaceVariablesInFileName(repositoryLocalPath, PACKAGE_NAME_FILE_PLACEHOLDER, packageName);
+            fileService.replaceVariablesInDirectoryName(repositoryLocalPath, PACKAGE_NAME_FOLDER_PLACEHOLDER, cleanPackageName);
+            fileService.replaceVariablesInFilename(repositoryLocalPath, PACKAGE_NAME_FILE_PLACEHOLDER, cleanPackageName);
 
-            replacements.put(PACKAGE_NAME_PLACEHOLDER, packageName);
+            replacements.put(PACKAGE_NAME_PLACEHOLDER, cleanPackageName);
         }
         else if (ProjectType.XCODE.equals(programmingExercise.getProjectType())) {
-            fileService.replaceVariablesInDirectoryName(repositoryLocalPath, APP_NAME_PLACEHOLDER, packageName);
-            fileService.replaceVariablesInFileName(repositoryLocalPath, APP_NAME_PLACEHOLDER, packageName);
+            fileService.replaceVariablesInDirectoryName(repositoryLocalPath, APP_NAME_PLACEHOLDER, cleanPackageName);
+            fileService.replaceVariablesInFilename(repositoryLocalPath, APP_NAME_PLACEHOLDER, cleanPackageName);
 
-            replacements.put(APP_NAME_PLACEHOLDER, packageName);
+            replacements.put(APP_NAME_PLACEHOLDER, cleanPackageName);
         }
     }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java
index 459b46953ca8..536f716a23a8 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/programming/ProgrammingExerciseService.java
@@ -4,6 +4,7 @@
 import static de.tum.in.www1.artemis.domain.enumeration.BuildPlanType.TEMPLATE;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
@@ -14,6 +15,7 @@
 
 import javax.annotation.Nullable;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jgit.api.errors.GitAPIException;
@@ -566,7 +568,7 @@ private boolean saveAndPushStructuralOracle(User user, Repository testRepository
         // If not, then update the oracle file by rewriting it and push the changes.
         if (!Files.exists(structureOraclePath)) {
             try {
-                Files.write(structureOraclePath, structureOracleJSON.getBytes());
+                FileUtils.writeStringToFile(structureOraclePath.toFile(), structureOracleJSON, StandardCharsets.UTF_8);
                 gitService.stageAllChanges(testRepository);
                 gitService.commitAndPush(testRepository, "Generate the structure oracle file.", true, user);
                 return true;
@@ -586,7 +588,7 @@ private boolean saveAndPushStructuralOracle(User user, Repository testRepository
             }
             else {
                 try {
-                    Files.write(structureOraclePath, structureOracleJSON.getBytes());
+                    FileUtils.writeStringToFile(structureOraclePath.toFile(), structureOracleJSON, StandardCharsets.UTF_8);
                     gitService.stageAllChanges(testRepository);
                     gitService.commitAndPush(testRepository, "Update the structure oracle file.", true, user);
                     return true;
diff --git a/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java b/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java
index 0f1ff37b08e5..c1f4b98fafb6 100644
--- a/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java
+++ b/src/main/java/de/tum/in/www1/artemis/service/user/UserCreationService.java
@@ -7,7 +7,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.PatternSyntaxException;
-import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
 import javax.validation.constraints.NotNull;
@@ -162,11 +161,9 @@ public User createUser(ManagedUserVM userDTO) {
         else {
             user.setLangKey(userDTO.getLangKey());
         }
-        if (userDTO.getAuthorities() != null) {
-            Set<Authority> authorities = userDTO.getAuthorities().stream().map(authorityRepository::findById).filter(Optional::isPresent).map(Optional::get)
-                    .collect(Collectors.toSet());
-            user.setAuthorities(authorities);
-        }
+
+        setUserAuthorities(userDTO, user);
+
         String password = userDTO.getPassword() == null ? RandomUtil.generatePassword() : userDTO.getPassword();
         String passwordHash = passwordService.hashPassword(password);
         user.setPassword(passwordHash);
@@ -197,6 +194,24 @@ public User createUser(ManagedUserVM userDTO) {
         return user;
     }
 
+    /**
+     * Updates the authorities for the user according to the ones set in the DTO.
+     *
+     * @param userDTO The source for the authorities that should be set.
+     * @param user    The target user where the authorities are set.
+     */
+    private void setUserAuthorities(final ManagedUserVM userDTO, final User user) {
+        // A user needs to have at least some role, otherwise an authentication token can never be constructed
+        if (userDTO.getAuthorities() == null || userDTO.getAuthorities().isEmpty()) {
+            userDTO.setAuthorities(Set.of(STUDENT.getAuthority()));
+        }
+
+        // clear and add instead of new Set for Hibernate change tracking
+        final Set<Authority> authorities = user.getAuthorities();
+        authorities.clear();
+        userDTO.getAuthorities().stream().map(authorityRepository::findById).flatMap(Optional::stream).forEach(authorities::add);
+    }
+
     /**
      * Update basic information (first name, last name, email, language) for the current user.
      * This method is typically invoked by the user
@@ -244,9 +259,8 @@ public User updateUser(@NotNull User user, ManagedUserVM updatedUserDTO) {
             user.setPassword(passwordService.hashPassword(updatedUserDTO.getPassword()));
         }
         user.setOrganizations(updatedUserDTO.getOrganizations());
-        Set<Authority> managedAuthorities = user.getAuthorities();
-        managedAuthorities.clear();
-        updatedUserDTO.getAuthorities().stream().map(authorityRepository::findById).filter(Optional::isPresent).map(Optional::get).forEach(managedAuthorities::add);
+        setUserAuthorities(updatedUserDTO, user);
+
         log.debug("Changed Information for User: {}", user);
 
         return saveUser(user);
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java
index 961db819c051..47e27d39c576 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/AttachmentResource.java
@@ -24,6 +24,7 @@
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastTutor;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
+import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.service.FileService;
 import de.tum.in.www1.artemis.service.notifications.GroupNotificationService;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
@@ -53,15 +54,18 @@ public class AttachmentResource {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final CacheManager cacheManager;
 
     public AttachmentResource(AttachmentRepository attachmentRepository, GroupNotificationService groupNotificationService, AuthorizationCheckService authorizationCheckService,
-            UserRepository userRepository, FileService fileService, CacheManager cacheManager) {
+            UserRepository userRepository, FileService fileService, FilePathService filePathService, CacheManager cacheManager) {
         this.attachmentRepository = attachmentRepository;
         this.groupNotificationService = groupNotificationService;
         this.authorizationCheckService = authorizationCheckService;
         this.userRepository = userRepository;
         this.fileService = fileService;
+        this.filePathService = filePathService;
         this.cacheManager = cacheManager;
     }
 
@@ -79,11 +83,11 @@ public ResponseEntity<Attachment> createAttachment(@RequestPart Attachment attac
         log.debug("REST request to save Attachment : {}", attachment);
         attachment.setId(null);
 
-        String pathString = fileService.handleSaveFile(file, false, false);
+        String pathString = fileService.handleSaveFile(file, false, false).toString();
         attachment.setLink(pathString);
 
         Attachment result = attachmentRepository.save(attachment);
-        this.cacheManager.getCache("files").evict(fileService.actualPathForPublicPath(result.getLink()));
+        this.cacheManager.getCache("files").evict(filePathService.actualPathForPublicPath(URI.create(result.getLink())).toString());
         return ResponseEntity.created(new URI("/api/attachments/" + result.getId())).body(result);
     }
 
@@ -109,12 +113,12 @@ public ResponseEntity<Attachment> updateAttachment(@PathVariable Long attachment
         attachment.setAttachmentUnit(originalAttachment.getAttachmentUnit());
 
         if (file != null) {
-            String pathString = fileService.handleSaveFile(file, false, false);
+            String pathString = fileService.handleSaveFile(file, false, false).toString();
             attachment.setLink(pathString);
         }
 
         Attachment result = attachmentRepository.save(attachment);
-        this.cacheManager.getCache("files").evict(fileService.actualPathForPublicPath(result.getLink()));
+        this.cacheManager.getCache("files").evict(filePathService.actualPathForPublicPath(URI.create(result.getLink())).toString());
         if (notificationText != null) {
             groupNotificationService.notifyStudentGroupAboutAttachmentChange(result, notificationText);
         }
@@ -169,7 +173,7 @@ public ResponseEntity<Void> deleteAttachment(@PathVariable Long attachmentId) {
             course = attachment.getLecture().getCourse();
             relatedEntity = "lecture " + attachment.getLecture().getTitle();
             try {
-                this.cacheManager.getCache("files").evict(fileService.actualPathForPublicPath(attachment.getLink()));
+                this.cacheManager.getCache("files").evict(filePathService.actualPathForPublicPath(URI.create(attachment.getLink())).toString());
             }
             catch (RuntimeException exception) {
                 // this catch is required for deleting wrongly formatted attachment database entries
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
index a5a26daf1153..dd503338932c 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/CourseResource.java
@@ -219,7 +219,7 @@ public ResponseEntity<Course> updateCourse(@PathVariable Long courseId, @Request
         courseUpdate.validateUnenrollmentEndDate();
 
         if (file != null) {
-            String pathString = fileService.handleSaveFile(file, false, false);
+            String pathString = fileService.handleSaveFile(file, false, false).toString();
             courseUpdate.setCourseIcon(pathString);
         }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java
index f4651b7b789f..e4006712c5b1 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/ExamUserResource.java
@@ -71,7 +71,7 @@ public ResponseEntity<ExamUser> updateExamUser(@RequestPart ExamUserDTO examUser
                 .orElseThrow(() -> new EntityNotFoundException("Exam user with login: \"" + examUserDTO.login() + "\" does not exist"));
 
         if (signatureFile != null) {
-            String responsePath = fileService.handleSaveFile(signatureFile, true, false);
+            String responsePath = fileService.handleSaveFile(signatureFile, true, false).toString();
             examUser.setSigningImagePath(responsePath);
         }
         examUser.setDidCheckImage(examUserDTO.didCheckImage());
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 7cd98dca5191..2464683b3a36 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
@@ -58,6 +58,8 @@ public class FileResource {
 
     private final FileService fileService;
 
+    private final FilePathService filePathService;
+
     private final ResourceLoaderService resourceLoaderService;
 
     private final LectureRepository lectureRepository;
@@ -86,10 +88,12 @@ public class FileResource {
 
     private final CourseRepository courseRepository;
 
-    public FileResource(SlideRepository slideRepository, AuthorizationCheckService authorizationCheckService, FileService fileService, ResourceLoaderService resourceLoaderService,
-            LectureRepository lectureRepository, FileUploadSubmissionRepository fileUploadSubmissionRepository, FileUploadExerciseRepository fileUploadExerciseRepository,
-            AttachmentRepository attachmentRepository, AttachmentUnitRepository attachmentUnitRepository, AuthorizationCheckService authCheckService, UserRepository userRepository,
-            ExamUserRepository examUserRepository, QuizQuestionRepository quizQuestionRepository, DragItemRepository dragItemRepository, CourseRepository courseRepository) {
+    public FileResource(FilePathService filePathService, SlideRepository slideRepository, AuthorizationCheckService authorizationCheckService, FileService fileService,
+            ResourceLoaderService resourceLoaderService, LectureRepository lectureRepository, FileUploadSubmissionRepository fileUploadSubmissionRepository,
+            FileUploadExerciseRepository fileUploadExerciseRepository, AttachmentRepository attachmentRepository, AttachmentUnitRepository attachmentUnitRepository,
+            AuthorizationCheckService authCheckService, UserRepository userRepository, ExamUserRepository examUserRepository, QuizQuestionRepository quizQuestionRepository,
+            DragItemRepository dragItemRepository, CourseRepository courseRepository) {
+        this.filePathService = filePathService;
         this.fileService = fileService;
         this.resourceLoaderService = resourceLoaderService;
         this.lectureRepository = lectureRepository;
@@ -122,7 +126,7 @@ public FileResource(SlideRepository slideRepository, AuthorizationCheckService a
     @EnforceAtLeastTutor
     public ResponseEntity<String> saveFile(@RequestParam(value = "file") MultipartFile file, @RequestParam(defaultValue = "false") boolean keepFileName) throws URISyntaxException {
         log.debug("REST request to upload file : {}", file.getOriginalFilename());
-        String responsePath = fileService.handleSaveFile(file, keepFileName, false);
+        String responsePath = fileService.handleSaveFile(file, keepFileName, false).toString();
 
         // return path for getting the file
         String responseBody = "{\"path\":\"" + responsePath + "\"}";
@@ -142,7 +146,7 @@ public ResponseEntity<String> saveFile(@RequestParam(value = "file") MultipartFi
     public ResponseEntity<byte[]> getTempFile(@PathVariable String filename) {
         log.debug("REST request to get file : {}", filename);
         sanitizeFilenameElseThrow(filename);
-        return responseEntityForFilePath(Path.of(FilePathService.getTempFilePath(), filename).toString());
+        return responseEntityForFilePath(FilePathService.getTempFilePath().resolve(filename));
     }
 
     /**
@@ -158,7 +162,7 @@ public ResponseEntity<byte[]> getTempFile(@PathVariable String filename) {
     public ResponseEntity<String> saveMarkdownFile(@RequestParam(value = "file") MultipartFile file, @RequestParam(defaultValue = "false") boolean keepFileName)
             throws URISyntaxException {
         log.debug("REST request to upload file for markdown: {}", file.getOriginalFilename());
-        String responsePath = fileService.handleSaveFile(file, keepFileName, true);
+        String responsePath = fileService.handleSaveFile(file, keepFileName, true).toString();
 
         // return path for getting the file
         String responseBody = "{\"path\":\"" + responsePath + "\"}";
@@ -233,7 +237,7 @@ public ResponseEntity<byte[]> getDragAndDropBackgroundFile(@PathVariable Long qu
         DragAndDropQuestion question = quizQuestionRepository.findDnDQuestionByIdOrElseThrow(questionId);
         Course course = question.getExercise().getCourseViaExerciseGroupOrCourseMember();
         authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, course, null);
-        return responseEntityForFilePath(fileService.actualPathForPublicPath(question.getBackgroundFilePath()));
+        return responseEntityForFilePath(filePathService.actualPathForPublicPath(URI.create(question.getBackgroundFilePath())));
     }
 
     /**
@@ -252,7 +256,7 @@ public ResponseEntity<byte[]> getDragItemFile(@PathVariable Long dragItemId) {
         if (dragItem.getPictureFilePath() == null) {
             throw new EntityNotFoundException("Drag item " + dragItemId + " has no picture file");
         }
-        return responseEntityForFilePath(fileService.actualPathForPublicPath(dragItem.getPictureFilePath()));
+        return responseEntityForFilePath(filePathService.actualPathForPublicPath(URI.create(dragItem.getPictureFilePath())));
     }
 
     /**
@@ -286,7 +290,7 @@ public ResponseEntity<byte[]> getFileUploadSubmission(@PathVariable Long exercis
             throw new AccessForbiddenException();
         }
 
-        return buildFileResponse(fileService.actualPathForPublicPath(submission.getFilePath()), false);
+        return buildFileResponse(filePathService.actualPathForPublicPath(URI.create(submission.getFilePath())), false);
     }
 
     /**
@@ -301,7 +305,7 @@ public ResponseEntity<byte[]> getCourseIcon(@PathVariable Long courseId) {
         log.debug("REST request to get icon for course : {}", courseId);
         Course course = courseRepository.findByIdElseThrow(courseId);
         authCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, course, null);
-        return responseEntityForFilePath(fileService.actualPathForPublicPath(course.getCourseIcon()));
+        return responseEntityForFilePath(filePathService.actualPathForPublicPath(URI.create(course.getCourseIcon())));
     }
 
     /**
@@ -317,7 +321,7 @@ public ResponseEntity<byte[]> getUserSignature(@PathVariable Long examUserId) {
         ExamUser examUser = examUserRepository.findWithExamById(examUserId).orElseThrow();
         authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, examUser.getExam().getCourse(), null);
 
-        return buildFileResponse(fileService.actualPathForPublicPath(examUser.getSigningImagePath()), false);
+        return buildFileResponse(filePathService.actualPathForPublicPath(URI.create(examUser.getSigningImagePath())), false);
     }
 
     /**
@@ -333,7 +337,7 @@ public ResponseEntity<byte[]> getExamUserImage(@PathVariable Long examUserId) {
         ExamUser examUser = examUserRepository.findWithExamById(examUserId).orElseThrow();
         authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.INSTRUCTOR, examUser.getExam().getCourse(), null);
 
-        return buildFileResponse(fileService.actualPathForPublicPath(examUser.getStudentImagePath()), true);
+        return buildFileResponse(filePathService.actualPathForPublicPath(URI.create(examUser.getStudentImagePath())), true);
     }
 
     /**
@@ -360,7 +364,7 @@ public ResponseEntity<byte[]> getLectureAttachment(@PathVariable Long lectureId,
         // check if the user is authorized to access the requested attachment unit
         checkAttachmentAuthorizationOrThrow(course, attachment);
 
-        return buildFileResponse(fileService.actualPathForPublicPath(attachment.getLink()), false);
+        return buildFileResponse(filePathService.actualPathForPublicPath(URI.create(attachment.getLink())), false);
     }
 
     /**
@@ -385,8 +389,8 @@ public ResponseEntity<byte[]> getLecturePdfAttachmentsMerged(@PathVariable Long
 
         List<String> attachmentLinks = lectureAttachments.stream()
                 .filter(unit -> authCheckService.isAllowedToSeeLectureUnit(unit, user) && "pdf".equals(StringUtils.substringAfterLast(unit.getAttachment().getLink(), ".")))
-                .map(unit -> Path.of(FilePathService.getAttachmentUnitFilePath(), String.valueOf(unit.getId()), StringUtils.substringAfterLast(unit.getAttachment().getLink(), "/"))
-                        .toString())
+                .map(unit -> FilePathService.getAttachmentUnitFilePath()
+                        .resolve(Path.of(String.valueOf(unit.getId()), StringUtils.substringAfterLast(unit.getAttachment().getLink(), "/"))).toString())
                 .toList();
 
         Optional<byte[]> file = fileService.mergePdfFiles(attachmentLinks, lectureRepository.getLectureTitle(lectureId));
@@ -417,7 +421,7 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachment(@PathVariable Long att
         // check if the user is authorized to access the requested attachment unit
         checkAttachmentAuthorizationOrThrow(course, attachment);
 
-        return buildFileResponse(fileService.actualPathForPublicPath(attachment.getLink()), false);
+        return buildFileResponse(filePathService.actualPathForPublicPath(URI.create(attachment.getLink())), false);
     }
 
     /**
@@ -448,8 +452,8 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachmentSlide(@PathVariable Lon
         if (matcher.matches()) {
             String fileName = matcher.group(1);
             return buildFileResponse(
-                    Path.of(FilePathService.getAttachmentUnitFilePath(), String.valueOf(attachmentUnit.getId()), "slide", String.valueOf(slide.getSlideNumber())).toString(),
-                    fileName, true);
+                    FilePathService.getAttachmentUnitFilePath().resolve(Path.of(attachmentUnit.getId().toString(), "slide", String.valueOf(slide.getSlideNumber()))), fileName,
+                    true);
         }
         else {
             throw new EntityNotFoundException("Slide", slideNumber);
@@ -463,20 +467,19 @@ public ResponseEntity<byte[]> getAttachmentUnitAttachmentSlide(@PathVariable Lon
      * @param filename the name of the file
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(String path, String filename) {
+    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename) {
         return buildFileResponse(path, filename, false);
     }
 
     /**
      * Builds the response with headers, body and content type for specified path containing the file name
      *
-     * @param pathString to the file including the file name
-     * @param cache      true if the response should contain a header that allows caching; false otherwise
+     * @param path  to the file including the file name
+     * @param cache true if the response should contain a header that allows caching; false otherwise
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(String pathString, boolean cache) {
-        Path path = Path.of(pathString);
-        return buildFileResponse(path.getParent().toString(), path.getFileName().toString(), cache);
+    private ResponseEntity<byte[]> buildFileResponse(Path path, boolean cache) {
+        return buildFileResponse(path.getParent(), path.getFileName().toString(), cache);
     }
 
     /**
@@ -487,10 +490,10 @@ private ResponseEntity<byte[]> buildFileResponse(String pathString, boolean cach
      * @param cache    true if the response should contain a header that allows caching; false otherwise
      * @return response entity
      */
-    private ResponseEntity<byte[]> buildFileResponse(String path, String filename, boolean cache) {
+    private ResponseEntity<byte[]> buildFileResponse(Path path, String filename, boolean cache) {
         try {
-            var actualPath = Path.of(path, filename).toString();
-            var file = fileService.getFileForPath(actualPath);
+            Path actualPath = path.resolve(filename);
+            byte[] file = fileService.getFileForPath(actualPath);
             if (file == null) {
                 return ResponseEntity.notFound().build();
             }
@@ -547,7 +550,7 @@ private void checkAttachmentAuthorizationOrThrow(Course course, Attachment attac
      * @param filePath the path for the file to read
      * @return ResponseEntity with status 200 and the file as byte stream, status 404 if the file doesn't exist, or status 500 if there is an error while reading the file
      */
-    private ResponseEntity<byte[]> responseEntityForFilePath(String filePath) {
+    private ResponseEntity<byte[]> responseEntityForFilePath(Path filePath) {
         try {
             var file = fileService.getFileForPath(filePath);
             if (file == null) {
@@ -556,7 +559,7 @@ private ResponseEntity<byte[]> responseEntityForFilePath(String filePath) {
             return ResponseEntity.ok(file);
         }
         catch (IOException e) {
-            e.printStackTrace();
+            log.error("Failed to return requested file with path {}", filePath, e);
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
     }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java
index bfef936c606d..be11819bc2aa 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/LearningPathResource.java
@@ -8,9 +8,14 @@
 import org.springframework.web.bind.annotation.*;
 
 import de.tum.in.www1.artemis.domain.Course;
+import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.competency.LearningPath;
 import de.tum.in.www1.artemis.repository.CourseRepository;
+import de.tum.in.www1.artemis.repository.LearningPathRepository;
+import de.tum.in.www1.artemis.repository.UserRepository;
 import de.tum.in.www1.artemis.security.Role;
 import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastInstructor;
+import de.tum.in.www1.artemis.security.annotations.EnforceAtLeastStudent;
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.LearningPathService;
 import de.tum.in.www1.artemis.service.feature.Feature;
@@ -19,6 +24,7 @@
 import de.tum.in.www1.artemis.web.rest.dto.SearchResultPageDTO;
 import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO;
 import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathPageableSearchDTO;
+import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO;
 import de.tum.in.www1.artemis.web.rest.errors.AccessForbiddenException;
 
 @RestController
@@ -33,10 +39,17 @@ public class LearningPathResource {
 
     private final LearningPathService learningPathService;
 
-    public LearningPathResource(CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService, LearningPathService learningPathService) {
+    private final LearningPathRepository learningPathRepository;
+
+    private final UserRepository userRepository;
+
+    public LearningPathResource(CourseRepository courseRepository, AuthorizationCheckService authorizationCheckService, LearningPathService learningPathService,
+            LearningPathRepository learningPathRepository, UserRepository userRepository) {
         this.courseRepository = courseRepository;
         this.authorizationCheckService = authorizationCheckService;
         this.learningPathService = learningPathService;
+        this.learningPathRepository = learningPathRepository;
+        this.userRepository = userRepository;
     }
 
     /**
@@ -123,4 +136,33 @@ public ResponseEntity<LearningPathHealthDTO> getHealthStatusForCourse(@PathVaria
 
         return ResponseEntity.ok(learningPathService.getHealthStatusForCourse(course));
     }
+
+    /**
+     * GET /learning-path/:learningPathId/graph : Gets the ngx representation of the learning path.
+     *
+     * @param learningPathId the id of the learning path that should be fetched
+     * @return the ResponseEntity with status 200 (OK) and with body the ngx representation of the learning path
+     */
+    @GetMapping("/learning-path/{learningPathId}/graph")
+    @FeatureToggle(Feature.LearningPaths)
+    @EnforceAtLeastStudent
+    public ResponseEntity<NgxLearningPathDTO> getLearningPathNgxGraph(@PathVariable Long learningPathId) {
+        log.debug("REST request to get ngx representation of learning path with id: {}", learningPathId);
+        LearningPath learningPath = learningPathRepository.findWithEagerCompetenciesAndLearningObjectsAndCompletedUsersByIdElseThrow(learningPathId);
+        Course course = courseRepository.findByIdElseThrow(learningPath.getCourse().getId());
+        if (!course.getLearningPathsEnabled()) {
+            throw new BadRequestException("Learning paths are not enabled for this course.");
+        }
+        User user = userRepository.getUserWithGroupsAndAuthorities();
+        if (authorizationCheckService.isStudentInCourse(course, user)) {
+            if (!user.getId().equals(learningPath.getUser().getId())) {
+                throw new AccessForbiddenException("You are not allowed to access another users learning path.");
+            }
+        }
+        else if (!authorizationCheckService.isAtLeastInstructorInCourse(course, user) && !authorizationCheckService.isAdmin()) {
+            throw new AccessForbiddenException("You are not allowed to access another users learning path.");
+        }
+        NgxLearningPathDTO graph = learningPathService.generateNgxGraphRepresentation(learningPath);
+        return ResponseEntity.ok(graph);
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
index c57e0b30b911..dae6f829e55f 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/admin/AdminCourseResource.java
@@ -124,7 +124,7 @@ public ResponseEntity<Course> createCourse(@RequestPart Course course, @RequestP
         courseService.createOrValidateGroups(course);
 
         if (file != null) {
-            String pathString = fileService.handleSaveFile(file, false, false);
+            String pathString = fileService.handleSaveFile(file, false, false).toString();
             course.setCourseIcon(pathString);
         }
 
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java
new file mode 100644
index 000000000000..06b36697fd75
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/competency/NgxLearningPathDTO.java
@@ -0,0 +1,43 @@
+package de.tum.in.www1.artemis.web.rest.dto.competency;
+
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+
+/**
+ * Represents simplified learning path optimized for Ngx representation
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public record NgxLearningPathDTO(Set<Node> nodes, Set<Edge> edges) {
+
+    public record Node(String id, NodeType type, Long linkedResource, Long linkedResourceParent, boolean completed, String label) {
+
+        public Node(String id, NodeType type, Long linkedResource, boolean completed, String label) {
+            this(id, type, linkedResource, null, completed, label);
+        }
+
+        public Node(String id, NodeType type, Long linkedResource, String label) {
+            this(id, type, linkedResource, false, label);
+        }
+
+        public Node(String id, NodeType type, String label) {
+            this(id, type, null, label);
+        }
+
+        public Node(String id, NodeType type, Long linkedResource) {
+            this(id, type, linkedResource, "");
+        }
+
+        public Node(String id, NodeType type) {
+            this(id, type, null, "");
+        }
+    }
+
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    public record Edge(String id, String source, String target) {
+    }
+
+    public enum NodeType {
+        COMPETENCY_START, COMPETENCY_END, MATCH_START, MATCH_END, EXERCISE, LECTURE_UNIT,
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java
new file mode 100644
index 000000000000..1161edf68de8
--- /dev/null
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/dto/lectureunit/LectureUnitForLearningPathNodeDetailsDTO.java
@@ -0,0 +1,12 @@
+package de.tum.in.www1.artemis.web.rest.dto.lectureunit;
+
+import javax.validation.constraints.NotNull;
+
+import de.tum.in.www1.artemis.domain.lecture.LectureUnit;
+
+public record LectureUnitForLearningPathNodeDetailsDTO(long id, @NotNull String name, @NotNull String type) {
+
+    public static LectureUnitForLearningPathNodeDetailsDTO of(@NotNull LectureUnit lectureUnit) {
+        return new LectureUnitForLearningPathNodeDetailsDTO(lectureUnit.getId(), lectureUnit.getName(), lectureUnit.getType());
+    }
+}
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java
index 0881bdb29a17..57fbd7abb92d 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/lecture/LectureUnitResource.java
@@ -22,6 +22,7 @@
 import de.tum.in.www1.artemis.service.AuthorizationCheckService;
 import de.tum.in.www1.artemis.service.CompetencyProgressService;
 import de.tum.in.www1.artemis.service.LectureUnitService;
+import de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO;
 import de.tum.in.www1.artemis.web.rest.errors.ConflictException;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 import de.tum.in.www1.artemis.web.rest.util.HeaderUtil;
@@ -161,4 +162,18 @@ public ResponseEntity<Void> deleteLectureUnit(@PathVariable Long lectureUnitId,
         return ResponseEntity.ok().headers(HeaderUtil.createEntityDeletionAlert(applicationName, true, ENTITY_NAME, lectureUnitName)).build();
     }
 
+    /**
+     * GET /lecture-units/:lectureUnitId/for-learning-path-node-details : Gets lecture unit for the details view of a learning path node.
+     *
+     * @param lectureUnitId the id of the lecture unit that should be fetched
+     * @return the ResponseEntity with status 200 (OK)
+     */
+    @GetMapping("/lecture-units/{lectureUnitId}/for-learning-path-node-details")
+    @EnforceAtLeastStudent
+    public ResponseEntity<LectureUnitForLearningPathNodeDetailsDTO> getLectureUnitForLearningPathNodeDetails(@PathVariable long lectureUnitId) {
+        log.info("REST request to get lecture unit for learning path node details with id: {}", lectureUnitId);
+        LectureUnit lectureUnit = lectureUnitRepository.findById(lectureUnitId).orElseThrow();
+        authorizationCheckService.checkHasAtLeastRoleInCourseElseThrow(Role.STUDENT, lectureUnit.getLecture().getCourse(), null);
+        return ResponseEntity.ok(LectureUnitForLearningPathNodeDetailsDTO.of(lectureUnit));
+    }
 }
diff --git a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java b/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java
index d94088c67748..5cce9e0333c0 100644
--- a/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java
+++ b/src/main/java/de/tum/in/www1/artemis/web/rest/repository/RepositoryResource.java
@@ -8,8 +8,6 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileAlreadyExistsException;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +15,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.errors.CheckoutConflictException;
 import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.WrongRepositoryStateException;
@@ -391,7 +390,7 @@ private void fetchAndUpdateFile(FileSubmission submission, Repository repository
         }
 
         InputStream inputStream = new ByteArrayInputStream(submission.getFileContent().getBytes(StandardCharsets.UTF_8));
-        Files.copy(inputStream, file.get().toPath(), StandardCopyOption.REPLACE_EXISTING);
+        FileUtils.copyToFile(inputStream, file.get());
         inputStream.close();
     }
 }
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 34ba2b455a03..1d6fb1b5fd58 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
@@ -41,6 +41,7 @@ export class AboutUsComponent implements OnInit {
         ['learningAnalytics', { learningAnalyticsUrl: 'https://ls1intum.github.io/Artemis/user/learning-analytics/' }],
         ['adaptiveLearning', { adaptiveLearningUrl: 'https://ls1intum.github.io/Artemis/user/adaptive-learning/' }],
         ['tutorialGroups', { tutorialGroupsUrl: 'https://ls1intum.github.io/Artemis/user/tutorialgroups/' }],
+        ['iris', { irisUrl: 'https://artemis.cit.tum.de/about-iris' }],
         ['scalable', { scalingUrl: 'https://ls1intum.github.io/Artemis/user/scaling/' }],
         ['highUserSatisfaction', { userExperienceUrl: 'https://ls1intum.github.io/Artemis/user/user-experience/' }],
         ['customizable', { customizableUrl: 'https://ls1intum.github.io/Artemis/user/courses/customizable' }],
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.html
new file mode 100644
index 000000000000..3dfbe0a378a5
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.html
@@ -0,0 +1,52 @@
+<div
+    class="node-icon-container"
+    *ngIf="node.type === NodeType.EXERCISE || node.type === NodeType.LECTURE_UNIT; else noTask"
+    [jhiStickyPopover]="popContentTask"
+    placement="right"
+    triggers="manual"
+>
+    <fa-icon *ngIf="node.completed" id="completed" [icon]="faCheckCircle" class="completed"></fa-icon>
+    <fa-icon *ngIf="!node.completed" id="not-completed" [icon]="faPlayCircle"></fa-icon>
+</div>
+<ng-template #noTask>
+    <div
+        class="node-icon-container"
+        *ngIf="node.type === NodeType.COMPETENCY_START || node.type === NodeType.COMPETENCY_END; else noCompetency"
+        [jhiStickyPopover]="popContentCompetency"
+        placement="right"
+        triggers="manual"
+    >
+        <fa-icon id="generic" [icon]="faCircle"></fa-icon>
+    </div>
+</ng-template>
+
+<ng-template #noCompetency>
+    <div class="node-icon-container">
+        <fa-icon id="match" [icon]="faCircle"></fa-icon>
+    </div>
+</ng-template>
+
+<ng-template #popContentTask>
+    <jhi-exercise-node-details
+        class="node-details"
+        *ngIf="node.type === NodeType.EXERCISE"
+        [exerciseId]="node.linkedResource!"
+        [(exercise)]="nodeDetailsData.exercise"
+    ></jhi-exercise-node-details>
+    <jhi-lecture-unit-node-details
+        class="node-details"
+        *ngIf="node.type === NodeType.LECTURE_UNIT"
+        [lectureUnitId]="node.linkedResource!"
+        [(lectureUnit)]="nodeDetailsData.lectureUnit"
+    ></jhi-lecture-unit-node-details>
+</ng-template>
+
+<ng-template #popContentCompetency>
+    <jhi-competency-node-details
+        class="node-details"
+        [courseId]="courseId"
+        [competencyId]="node.linkedResource!"
+        [(competency)]="nodeDetailsData.competency"
+        [(competencyProgress)]="nodeDetailsData.competencyProgress"
+    ></jhi-competency-node-details>
+</ng-template>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.ts
new file mode 100644
index 000000000000..d9771c27a43e
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph-node.component.ts
@@ -0,0 +1,33 @@
+import { Component, Input } from '@angular/core';
+import { faCheckCircle, faCircle, faPlayCircle, faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
+import { NgxLearningPathNode, NodeType } from 'app/entities/competency/learning-path.model';
+import { Competency, CompetencyProgress } from 'app/entities/competency.model';
+import { Exercise } from 'app/entities/exercise.model';
+import { Lecture } from 'app/entities/lecture.model';
+import { LectureUnitForLearningPathNodeDetailsDTO } from 'app/entities/lecture-unit/lectureUnit.model';
+
+class NodeDetailsData {
+    competency?: Competency;
+    competencyProgress?: CompetencyProgress;
+    exercise?: Exercise;
+    lecture?: Lecture;
+    lectureUnit?: LectureUnitForLearningPathNodeDetailsDTO;
+}
+
+@Component({
+    selector: 'jhi-learning-path-graph-node',
+    templateUrl: './learning-path-graph-node.component.html',
+})
+export class LearningPathGraphNodeComponent {
+    @Input() courseId: number;
+    @Input() node: NgxLearningPathNode;
+
+    faCheckCircle = faCheckCircle;
+    faPlayCircle = faPlayCircle;
+    faQuestionCircle = faQuestionCircle;
+    faCircle = faCircle;
+
+    nodeDetailsData = new NodeDetailsData();
+
+    protected readonly NodeType = NodeType;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.html
new file mode 100644
index 000000000000..1e4f5fd6848f
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.html
@@ -0,0 +1,40 @@
+<div class="graph-container">
+    <ngx-graph
+        *ngIf="ngxLearningPath"
+        [links]="ngxLearningPath.edges"
+        [nodes]="ngxLearningPath.nodes"
+        [layout]="layout"
+        [layoutSettings]="{ orientation: 'TB' }"
+        [curve]="curve"
+        [draggingEnabled]="draggingEnabled"
+        [panningEnabled]="panningEnabled"
+        [enableZoom]="zoomEnabled"
+        [panOnZoom]="panOnZoom"
+        [update$]="update$"
+        [center$]="center$"
+        [zoomToFit$]="zoomToFit$"
+    >
+        <ng-template #defsTemplate>
+            <svg:marker id="arrow" viewBox="0 -5 10 10" refX="8" refY="0" markerWidth="4" markerHeight="4" orient="auto">
+                <svg:path d="M0,-5L10,0L0,5" class="arrow-head" />
+            </svg:marker>
+        </ng-template>
+        <ng-template #nodeTemplate let-node>
+            <svg:g class="node" [attr.width]="node.dimension.width" [attr.height]="node.dimension.height">
+                <svg:foreignObject [attr.width]="node.dimension.width" [attr.height]="node.dimension.height">
+                    <jhi-learning-path-graph-node class="node" [courseId]="courseId" [node]="node" (click)="nodeClicked.emit(node)"></jhi-learning-path-graph-node>
+                </svg:foreignObject>
+            </svg:g>
+        </ng-template>
+        <ng-template #linkTemplate let-link>
+            <svg:g class="edge">
+                <svg:path class="line" stroke-width="2"></svg:path>
+            </svg:g>
+        </ng-template>
+        <ng-template #clusterTemplate let-cluster>
+            <svg:g class="node cluster">
+                <svg:rect rx="5" ry="5" [attr.width]="cluster.dimension.width" [attr.height]="cluster.dimension.height" [attr.fill]="cluster.data.color" />
+            </svg:g>
+        </ng-template>
+    </ngx-graph>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.scss b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.scss
new file mode 100644
index 000000000000..36d2fb2ebd59
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.scss
@@ -0,0 +1,54 @@
+.graph-container {
+    display: block;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+
+    .ngx-graph {
+        width: auto;
+    }
+
+    .node {
+        display: flex;
+        width: 100%;
+        height: 100%;
+    }
+
+    #arrow {
+        stroke: var(--body-color);
+        fill: var(--body-color);
+    }
+
+    .edge {
+        stroke: var(--body-color) !important;
+        marker-end: url(#arrow);
+    }
+}
+
+jhi-learning-path-graph-node:hover {
+    cursor: pointer;
+}
+
+.node-icon-container {
+    width: 100%;
+    display: flex;
+
+    fa-icon {
+        width: 100%;
+
+        svg {
+            margin: 10%;
+            width: 80%;
+            height: 80%;
+        }
+    }
+}
+
+.completed {
+    color: var(--bs-success);
+}
+
+.node-details {
+    display: block;
+    max-width: 40vw;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.ts
new file mode 100644
index 000000000000..c7f8bda2b015
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/learning-path-graph.component.ts
@@ -0,0 +1,63 @@
+import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Layout } from '@swimlane/ngx-graph';
+import * as shape from 'd3-shape';
+import { Subject } from 'rxjs';
+import { LearningPathService } from 'app/course/learning-paths/learning-path.service';
+import { NgxLearningPathDTO, NgxLearningPathNode } from 'app/entities/competency/learning-path.model';
+
+@Component({
+    selector: 'jhi-learning-path-graph',
+    styleUrls: ['./learning-path-graph.component.scss'],
+    templateUrl: './learning-path-graph.component.html',
+    encapsulation: ViewEncapsulation.None,
+})
+export class LearningPathGraphComponent implements OnInit {
+    isLoading = false;
+    @Input() learningPathId: number;
+    @Input() courseId: number;
+    @Output() nodeClicked: EventEmitter<NgxLearningPathNode> = new EventEmitter();
+    ngxLearningPath: NgxLearningPathDTO;
+
+    layout: string | Layout = 'dagreCluster';
+    curve = shape.curveBundle;
+
+    draggingEnabled = false;
+    panningEnabled = true;
+    zoomEnabled = true;
+    panOnZoom = true;
+
+    update$: Subject<boolean> = new Subject<boolean>();
+    center$: Subject<boolean> = new Subject<boolean>();
+    zoomToFit$: Subject<boolean> = new Subject<boolean>();
+
+    constructor(
+        private activatedRoute: ActivatedRoute,
+        private learningPathService: LearningPathService,
+    ) {}
+
+    ngOnInit() {
+        if (this.learningPathId) {
+            this.loadData();
+        }
+    }
+
+    loadData() {
+        this.isLoading = true;
+        this.learningPathService.getLearningPathNgxGraph(this.learningPathId).subscribe((ngxLearningPathResponse) => {
+            this.ngxLearningPath = ngxLearningPathResponse.body!;
+            this.isLoading = false;
+        });
+    }
+
+    onResize() {
+        this.update$.next(true);
+        this.center$.next(true);
+        this.zoomToFit$.next(true);
+    }
+
+    onCenterView() {
+        this.zoomToFit$.next(true);
+        this.center$.next(true);
+    }
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.html
new file mode 100644
index 000000000000..b31670b4d330
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.html
@@ -0,0 +1,18 @@
+<div *ngIf="competency" class="row">
+    <div class="col-9">
+        <h3 class="mb-0">
+            <fa-icon
+                *ngIf="competency.taxonomy"
+                [icon]="getIcon(competency.taxonomy)"
+                [fixedWidth]="true"
+                [ngbTooltip]="getIconTooltip(competency.taxonomy) | artemisTranslate"
+                container="body"
+            ></fa-icon>
+            <span>{{ competency.title }}</span>
+            <span *ngIf="this.mastery >= 100" class="badge text-white text-bg-success" jhiTranslate="artemisApp.competency.mastered">Mastered</span>
+            <span *ngIf="competency.optional" class="badge text-white bg-warning" jhiTranslate="artemisApp.competency.optional">Optional</span>
+        </h3>
+        <div *ngIf="competency.description">{{ competency.description }}</div>
+    </div>
+    <div class="col-3"><jhi-competency-rings [progress]="progress" [confidence]="confidence" [mastery]="mastery"></jhi-competency-rings></div>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.ts
new file mode 100644
index 000000000000..1de146171245
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component.ts
@@ -0,0 +1,65 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import { onError } from 'app/shared/util/global.utils';
+import { CompetencyService } from 'app/course/competencies/competency.service';
+import { Competency, CompetencyProgress, getIcon, getIconTooltip } from 'app/entities/competency.model';
+import { AlertService } from 'app/core/util/alert.service';
+
+@Component({
+    selector: 'jhi-competency-node-details',
+    templateUrl: './competency-node-details.component.html',
+})
+export class CompetencyNodeDetailsComponent implements OnInit {
+    @Input() courseId: number;
+    @Input() competencyId: number;
+    @Input() competency?: Competency;
+    @Output() competencyChange = new EventEmitter<Competency>();
+    @Input() competencyProgress?: CompetencyProgress;
+    @Output() competencyProgressChange = new EventEmitter<CompetencyProgress>();
+
+    isLoading = false;
+
+    constructor(
+        private competencyService: CompetencyService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit() {
+        if (!this.competency || !this.competencyProgress) {
+            this.loadData();
+        }
+    }
+    private loadData() {
+        this.isLoading = true;
+        this.competencyService.findById(this.competencyId!, this.courseId!).subscribe({
+            next: (resp) => {
+                this.competency = resp.body!;
+                if (this.competency.userProgress?.length) {
+                    this.competencyProgress = this.competency.userProgress.first()!;
+                } else {
+                    this.competencyProgress = { progress: 0, confidence: 0 } as CompetencyProgress;
+                }
+                this.isLoading = false;
+                this.competencyChange.emit(this.competency);
+                this.competencyProgressChange.emit(this.competencyProgress);
+            },
+            error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
+        });
+    }
+
+    get progress(): number {
+        return Math.round(this.competencyProgress?.progress ?? 0);
+    }
+
+    get confidence(): number {
+        return Math.min(Math.round(((this.competencyProgress?.confidence ?? 0) / (this.competency?.masteryThreshold ?? 100)) * 100), 100);
+    }
+
+    get mastery(): number {
+        const weight = 2 / 3;
+        return Math.round((1 - weight) * this.progress + weight * this.confidence);
+    }
+
+    protected readonly getIcon = getIcon;
+    protected readonly getIconTooltip = getIconTooltip;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.html
new file mode 100644
index 000000000000..d364b09a85b2
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.html
@@ -0,0 +1,14 @@
+<div *ngIf="exercise" class="row">
+    <div class="col">
+        <h3 class="mb-0">
+            <fa-icon
+                *ngIf="exercise.type"
+                [icon]="getIcon(exercise.type)"
+                [fixedWidth]="true"
+                [ngbTooltip]="getIconTooltip(exercise.type) | artemisTranslate"
+                container="body"
+            ></fa-icon>
+            <span>{{ exercise.title }}</span>
+        </h3>
+    </div>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.ts
new file mode 100644
index 000000000000..65259f79acfb
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component.ts
@@ -0,0 +1,43 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import { onError } from 'app/shared/util/global.utils';
+import { AlertService } from 'app/core/util/alert.service';
+import { Exercise, getIcon, getIconTooltip } from 'app/entities/exercise.model';
+import { ExerciseService } from 'app/exercises/shared/exercise/exercise.service';
+
+@Component({
+    selector: 'jhi-exercise-node-details',
+    templateUrl: './exercise-node-details.component.html',
+})
+export class ExerciseNodeDetailsComponent implements OnInit {
+    @Input() exerciseId: number;
+    @Input() exercise?: Exercise;
+    @Output() exerciseChange = new EventEmitter<Exercise>();
+
+    isLoading = false;
+
+    constructor(
+        private exerciseService: ExerciseService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit() {
+        if (!this.exercise) {
+            this.loadData();
+        }
+    }
+    private loadData() {
+        this.isLoading = true;
+        this.exerciseService.find(this.exerciseId).subscribe({
+            next: (exerciseResponse) => {
+                this.exercise = exerciseResponse.body!;
+                this.isLoading = false;
+                this.exerciseChange.emit(this.exercise);
+            },
+            error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
+        });
+    }
+
+    protected readonly getIcon = getIcon;
+    protected readonly getIconTooltip = getIconTooltip;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.html b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.html
new file mode 100644
index 000000000000..4f6553e2ef8e
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.html
@@ -0,0 +1,14 @@
+<div *ngIf="lectureUnit" class="row">
+    <div class="col">
+        <h3 class="mb-0">
+            <fa-icon
+                *ngIf="lectureUnit.type"
+                [icon]="getIcon(lectureUnit.type!)"
+                [fixedWidth]="true"
+                [ngbTooltip]="getIconTooltip(lectureUnit.type!) | artemisTranslate"
+                container="body"
+            ></fa-icon>
+            <span>{{ lectureUnit.name }}</span>
+        </h3>
+    </div>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.ts
new file mode 100644
index 000000000000..300909fde0f7
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component.ts
@@ -0,0 +1,45 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { HttpErrorResponse } from '@angular/common/http';
+import { onError } from 'app/shared/util/global.utils';
+import { AlertService } from 'app/core/util/alert.service';
+import { LectureUnit, getIcon, getIconTooltip } from 'app/entities/lecture-unit/lectureUnit.model';
+import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
+
+@Component({
+    selector: 'jhi-lecture-unit-node-details',
+    templateUrl: './lecture-unit-node-details.component.html',
+})
+export class LectureUnitNodeDetailsComponent implements OnInit {
+    @Input() lectureUnitId: number;
+
+    @Input() lectureUnit?: LectureUnit;
+    @Output() lectureUnitChange = new EventEmitter<LectureUnit>();
+
+    isLoading = false;
+
+    constructor(
+        private lectureUnitService: LectureUnitService,
+        private alertService: AlertService,
+    ) {}
+
+    ngOnInit() {
+        if (!this.lectureUnit) {
+            this.loadData();
+        }
+    }
+    private loadData() {
+        this.isLoading = true;
+
+        this.lectureUnitService.getLectureUnitForLearningPathNodeDetails(this.lectureUnitId!).subscribe({
+            next: (lectureUnitResult) => {
+                this.lectureUnit = lectureUnitResult.body!;
+                this.isLoading = false;
+                this.lectureUnitChange.emit(this.lectureUnit);
+            },
+            error: (errorResponse: HttpErrorResponse) => onError(this.alertService, errorResponse),
+        });
+    }
+
+    protected readonly getIcon = getIcon;
+    protected readonly getIconTooltip = getIconTooltip;
+}
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 b0d9f165b87c..c6e89d1e7a8c 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
@@ -76,7 +76,7 @@ <h5 class="card-title">{{ 'artemisApp.learningPath.manageLearningPaths.health.mi
                         <ngb-progressbar type="primary" [showValue]="true" [value]="learningPath.progress ?? 0" [max]="100"></ngb-progressbar>
                     </td>
                     <td class="col-1">
-                        <jhi-button (onClick)="viewLearningPath()" [title]="'entity.action.view'"></jhi-button>
+                        <jhi-button (onClick)="viewLearningPath(learningPath)" [title]="'entity.action.view'"></jhi-button>
                     </td>
                 </tr>
             </tbody>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.ts
index 0cb7c855f550..60d0b168c6ec 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.ts
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-management.component.ts
@@ -12,6 +12,8 @@ import { SortService } from 'app/shared/service/sort.service';
 import { LearningPathPageableSearchDTO } from 'app/entities/competency/learning-path.model';
 import { faSort, faTriangleExclamation } from '@fortawesome/free-solid-svg-icons';
 import { HealthStatus, LearningPathHealthDTO } from 'app/entities/competency/learning-path-health.model';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { LearningPathProgressModalComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-modal.component';
 
 export enum TableColumn {
     ID = 'ID',
@@ -55,6 +57,7 @@ export class LearningPathManagementComponent implements OnInit {
         private alertService: AlertService,
         private pagingService: LearningPathPagingService,
         private sortService: SortService,
+        private modalService: NgbModal,
     ) {}
 
     get page(): number {
@@ -199,8 +202,15 @@ export class LearningPathManagementComponent implements OnInit {
             this.page = pageNumber;
         }
     }
-    viewLearningPath() {
-        // todo: part of future pr
+
+    viewLearningPath(learningPath: LearningPathPageableSearchDTO) {
+        const modalRef = this.modalService.open(LearningPathProgressModalComponent, {
+            size: 'xl',
+            backdrop: 'static',
+            windowClass: 'learning-path-modal',
+        });
+        modalRef.componentInstance.courseId = this.courseId;
+        modalRef.componentInstance.learningPath = learningPath;
     }
 
     protected readonly HealthStatus = HealthStatus;
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.html b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.html
new file mode 100644
index 000000000000..7477b90ced6c
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.html
@@ -0,0 +1,19 @@
+<div class="modal-container">
+    <div class="row modal-nav">
+        <jhi-learning-path-progress-nav
+            [learningPath]="learningPath"
+            (onRefresh)="learningPathGraphComponent.loadData(); learningPathGraphComponent.onCenterView()"
+            (onCenterView)="learningPathGraphComponent.onCenterView()"
+            (onClose)="close()"
+        ></jhi-learning-path-progress-nav>
+    </div>
+    <div class="row">
+        <jhi-learning-path-graph
+            #learningPathGraphComponent
+            class="graph"
+            *ngIf="courseId && learningPath"
+            [courseId]="courseId"
+            [learningPathId]="learningPath.id!"
+        ></jhi-learning-path-graph>
+    </div>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.scss b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.scss
new file mode 100644
index 000000000000..cc798cd46adb
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.scss
@@ -0,0 +1,26 @@
+.modal-container {
+    display: flex;
+    flex-wrap: wrap;
+    height: 90vh;
+    width: 100%;
+    padding-top: 8px;
+
+    .row {
+        width: 100%;
+        margin-left: 0;
+        margin-right: 0;
+    }
+
+    .modal-nav {
+        height: max-content;
+    }
+
+    .graph {
+        width: 100%;
+        overflow: hidden;
+    }
+}
+
+.learning-path-modal .modal-dialog .modal-content {
+    min-height: 500px;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.ts
new file mode 100644
index 000000000000..090b7d5405f4
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-modal.component.ts
@@ -0,0 +1,20 @@
+import { Component, Input, ViewChild } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { LearningPathGraphComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph.component';
+import { LearningPathPageableSearchDTO } from 'app/entities/competency/learning-path.model';
+@Component({
+    selector: 'jhi-learning-path-progress-modal',
+    styleUrls: ['./learning-path-progress-modal.component.scss'],
+    templateUrl: './learning-path-progress-modal.component.html',
+})
+export class LearningPathProgressModalComponent {
+    @Input() courseId: number;
+    @Input() learningPath: LearningPathPageableSearchDTO;
+    @ViewChild('learningPathGraphComponent') learningPathGraphComponent: LearningPathGraphComponent;
+
+    constructor(private activeModal: NgbActiveModal) {}
+
+    close() {
+        this.activeModal.close();
+    }
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.html b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.html
new file mode 100644
index 000000000000..66f5c6778206
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.html
@@ -0,0 +1,16 @@
+<div class="row">
+    <div class="col">
+        <h3 *ngIf="learningPath">{{ learningPath.user?.name }} ({{ learningPath.user?.login }})</h3>
+    </div>
+    <div class="col-auto">
+        <button id="refresh-button" class="btn btn-primary m-1" (click)="onRefresh.emit()">
+            <fa-icon [icon]="faArrowsRotate" ngbTooltip="{{ 'artemisApp.learningPath.manageLearningPaths.progressNav.refresh' | artemisTranslate }}"></fa-icon>
+        </button>
+        <button id="center-button" class="btn btn-primary m-1" (click)="onCenterView.emit()">
+            <fa-icon [icon]="faArrowsToEye" ngbTooltip="{{ 'artemisApp.learningPath.manageLearningPaths.progressNav.center' | artemisTranslate }}"></fa-icon>
+        </button>
+        <button id="close-button" class="btn btn-danger m-1" (click)="onClose.emit()">
+            <fa-icon [icon]="faXmark" ngbTooltip="{{ 'entity.action.close' | artemisTranslate }}"></fa-icon>
+        </button>
+    </div>
+</div>
diff --git a/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.ts b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.ts
new file mode 100644
index 000000000000..9b4a8d38c686
--- /dev/null
+++ b/src/main/webapp/app/course/learning-paths/learning-path-management/learning-path-progress-nav.component.ts
@@ -0,0 +1,18 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { faArrowsRotate, faArrowsToEye, faXmark } from '@fortawesome/free-solid-svg-icons';
+import { LearningPathPageableSearchDTO } from 'app/entities/competency/learning-path.model';
+
+@Component({
+    selector: 'jhi-learning-path-progress-nav',
+    templateUrl: './learning-path-progress-nav.component.html',
+})
+export class LearningPathProgressNavComponent {
+    @Input() learningPath: LearningPathPageableSearchDTO;
+    @Output() onRefresh: EventEmitter<void> = new EventEmitter();
+    @Output() onCenterView: EventEmitter<void> = new EventEmitter();
+    @Output() onClose: EventEmitter<void> = new EventEmitter();
+
+    faXmark = faXmark;
+    faArrowsToEye = faArrowsToEye;
+    faArrowsRotate = faArrowsRotate;
+}
diff --git a/src/main/webapp/app/course/learning-paths/learning-path.service.ts b/src/main/webapp/app/course/learning-paths/learning-path.service.ts
index ece1bc6b204a..b201a57f84d3 100644
--- a/src/main/webapp/app/course/learning-paths/learning-path.service.ts
+++ b/src/main/webapp/app/course/learning-paths/learning-path.service.ts
@@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { HttpClient, HttpResponse } from '@angular/common/http';
 import { LearningPathHealthDTO } from 'app/entities/competency/learning-path-health.model';
+import { NgxLearningPathDTO } from 'app/entities/competency/learning-path.model';
+import { map } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class LearningPathService {
@@ -20,4 +22,18 @@ export class LearningPathService {
     getHealthStatusForCourse(courseId: number) {
         return this.httpClient.get<LearningPathHealthDTO>(`${this.resourceURL}/courses/${courseId}/learning-path-health`, { observe: 'response' });
     }
+
+    getLearningPathNgxGraph(learningPathId: number): Observable<HttpResponse<NgxLearningPathDTO>> {
+        return this.httpClient.get<NgxLearningPathDTO>(`${this.resourceURL}/learning-path/${learningPathId}/graph`, { observe: 'response' }).pipe(
+            map((ngxLearningPathResponse) => {
+                if (!ngxLearningPathResponse.body!.nodes) {
+                    ngxLearningPathResponse.body!.nodes = [];
+                }
+                if (!ngxLearningPathResponse.body!.edges) {
+                    ngxLearningPathResponse.body!.edges = [];
+                }
+                return ngxLearningPathResponse;
+            }),
+        );
+    }
 }
diff --git a/src/main/webapp/app/course/learning-paths/learning-paths.module.ts b/src/main/webapp/app/course/learning-paths/learning-paths.module.ts
index 4d1a254a674f..8c37905813e9 100644
--- a/src/main/webapp/app/course/learning-paths/learning-paths.module.ts
+++ b/src/main/webapp/app/course/learning-paths/learning-paths.module.ts
@@ -3,10 +3,29 @@ import { ArtemisSharedModule } from 'app/shared/shared.module';
 import { ArtemisSharedComponentModule } from 'app/shared/components/shared-component.module';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { LearningPathManagementComponent } from 'app/course/learning-paths/learning-path-management/learning-path-management.component';
+import { NgxGraphModule } from '@swimlane/ngx-graph';
+import { ArtemisLectureUnitsModule } from 'app/overview/course-lectures/lecture-units.module';
+import { ArtemisCompetenciesModule } from 'app/course/competencies/competency.module';
+import { LearningPathProgressModalComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-modal.component';
+import { LearningPathGraphComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph.component';
+import { LearningPathProgressNavComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-nav.component';
+import { LearningPathGraphNodeComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph-node.component';
+import { CompetencyNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component';
+import { LectureUnitNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component';
+import { ExerciseNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/exercise-node-details.component';
 
 @NgModule({
-    imports: [ArtemisSharedModule, FormsModule, ReactiveFormsModule, ArtemisSharedComponentModule],
-    declarations: [LearningPathManagementComponent],
+    imports: [ArtemisSharedModule, FormsModule, ReactiveFormsModule, ArtemisSharedComponentModule, NgxGraphModule, ArtemisLectureUnitsModule, ArtemisCompetenciesModule],
+    declarations: [
+        LearningPathManagementComponent,
+        LearningPathProgressModalComponent,
+        LearningPathProgressNavComponent,
+        LearningPathGraphComponent,
+        LearningPathGraphNodeComponent,
+        CompetencyNodeDetailsComponent,
+        LectureUnitNodeDetailsComponent,
+        ExerciseNodeDetailsComponent,
+    ],
     exports: [],
 })
 export class ArtemisLearningPathsModule {}
diff --git a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.ts b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.ts
index bcb3d0e29ed7..47f8b19703e4 100644
--- a/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.ts
+++ b/src/main/webapp/app/course/manage/course-lti-configuration/course-lti-configuration.component.ts
@@ -72,7 +72,7 @@ export class CourseLtiConfigurationComponent implements OnInit {
      * Gets the deep linking url
      */
     getDeepLinkingUrl(): string {
-        return `${location.origin}/api/lti13/deep-linking/${this.course.id}`; // Needs to match url in CustomLti13Configurer
+        return `${location.origin}/api/public/lti13/deep-linking/${this.course.id}`; // Needs to match url in CustomLti13Configurer
     }
 
     /**
@@ -93,14 +93,14 @@ export class CourseLtiConfigurationComponent implements OnInit {
      * Gets the initiate login url
      */
     getInitiateLoginUrl(): string {
-        return `${location.origin}/api/lti13/initiate-login/${this.onlineCourseConfiguration?.registrationId}`; // Needs to match uri in CustomLti13Configurer
+        return `${location.origin}/api/public/lti13/initiate-login/${this.onlineCourseConfiguration?.registrationId}`; // Needs to match uri in CustomLti13Configurer
     }
 
     /**
      * Gets the redirect uri
      */
     getRedirectUri(): string {
-        return `${location.origin}/api/lti13/auth-callback`; // Needs to match uri in CustomLti13Configurer
+        return `${location.origin}/api/public/lti13/auth-callback`; // Needs to match uri in CustomLti13Configurer
     }
 
     /**
diff --git a/src/main/webapp/app/entities/competency/learning-path.model.ts b/src/main/webapp/app/entities/competency/learning-path.model.ts
index aee01ef000cd..8834651fbd21 100644
--- a/src/main/webapp/app/entities/competency/learning-path.model.ts
+++ b/src/main/webapp/app/entities/competency/learning-path.model.ts
@@ -2,6 +2,7 @@ import { BaseEntity } from 'app/shared/model/base-entity';
 import { Course } from 'app/entities/course.model';
 import { User, UserNameAndLoginDTO } from 'app/core/user/user.model';
 import { Competency } from 'app/entities/competency.model';
+import { Edge, Node } from '@swimlane/ngx-graph';
 
 export class LearningPath implements BaseEntity {
     public id?: number;
@@ -18,3 +19,32 @@ export class LearningPathPageableSearchDTO {
     public user?: UserNameAndLoginDTO;
     public progress?: number;
 }
+
+export class NgxLearningPathDTO {
+    public nodes: NgxLearningPathNode[];
+    public edges: NgxLearningPathEdge[];
+}
+
+export class NgxLearningPathNode implements Node {
+    public id: string;
+    public type?: NodeType;
+    public linkedResource?: number;
+    public linkedResourceParent?: number;
+    public completed?: boolean;
+    public label?: string;
+}
+
+export class NgxLearningPathEdge implements Edge {
+    public id?: string;
+    public source: string;
+    public target: string;
+}
+
+export enum NodeType {
+    COMPETENCY_START = 'COMPETENCY_START',
+    COMPETENCY_END = 'COMPETENCY_END',
+    MATCH_START = 'MATCH_START',
+    MATCH_END = 'MATCH_END',
+    EXERCISE = 'EXERCISE',
+    LECTURE_UNIT = 'LECTURE_UNIT',
+}
diff --git a/src/main/webapp/app/entities/exercise.model.ts b/src/main/webapp/app/entities/exercise.model.ts
index 11474da66052..286e89a58bef 100644
--- a/src/main/webapp/app/entities/exercise.model.ts
+++ b/src/main/webapp/app/entities/exercise.model.ts
@@ -152,6 +152,10 @@ export abstract class Exercise implements BaseEntity {
     }
 }
 
+/**
+ * Get an icon for the type of the given exercise.
+ * @param exerciseType {ExerciseType}
+ */
 export function getIcon(exerciseType?: ExerciseType): IconProp {
     if (!exerciseType) {
         return faQuestion as IconProp;
diff --git a/src/main/webapp/app/entities/lecture-unit/lectureUnit.model.ts b/src/main/webapp/app/entities/lecture-unit/lectureUnit.model.ts
index 647d462e0cb7..48863fff879d 100644
--- a/src/main/webapp/app/entities/lecture-unit/lectureUnit.model.ts
+++ b/src/main/webapp/app/entities/lecture-unit/lectureUnit.model.ts
@@ -2,6 +2,8 @@ import { BaseEntity } from 'app/shared/model/base-entity';
 import dayjs from 'dayjs/esm';
 import { Lecture } from 'app/entities/lecture.model';
 import { Competency } from 'app/entities/competency.model';
+import { IconProp } from '@fortawesome/fontawesome-svg-core';
+import { faDownload, faLink, faQuestion, faScroll, faVideo } from '@fortawesome/free-solid-svg-icons';
 
 // IMPORTANT NOTICE: The following strings have to be consistent with
 // the ones defined in LectureUnit.java
@@ -13,6 +15,22 @@ export enum LectureUnitType {
     ONLINE = 'online',
 }
 
+export const lectureUnitIcons = {
+    [LectureUnitType.ATTACHMENT]: faDownload,
+    [LectureUnitType.EXERCISE]: faQuestion,
+    [LectureUnitType.TEXT]: faScroll,
+    [LectureUnitType.VIDEO]: faVideo,
+    [LectureUnitType.ONLINE]: faLink,
+};
+
+export const lectureUnitTooltips = {
+    [LectureUnitType.ATTACHMENT]: 'artemisApp.attachmentUnit.tooltip',
+    [LectureUnitType.EXERCISE]: '',
+    [LectureUnitType.TEXT]: 'artemisApp.textUnit.tooltip',
+    [LectureUnitType.VIDEO]: 'artemisApp.videoUnit.tooltip',
+    [LectureUnitType.ONLINE]: 'artemisApp.onlineUnit.tooltip',
+};
+
 export abstract class LectureUnit implements BaseEntity {
     public id?: number;
     public name?: string;
@@ -28,3 +46,23 @@ export abstract class LectureUnit implements BaseEntity {
         this.type = type;
     }
 }
+
+export function getIcon(lectureUnitType: LectureUnitType): IconProp {
+    if (!lectureUnitType) {
+        return faQuestion as IconProp;
+    }
+    return lectureUnitIcons[lectureUnitType] as IconProp;
+}
+
+export function getIconTooltip(lectureUnitType: LectureUnitType) {
+    if (!lectureUnitType) {
+        return '';
+    }
+    return lectureUnitTooltips[lectureUnitType];
+}
+
+export class LectureUnitForLearningPathNodeDetailsDTO {
+    public id?: number;
+    public name?: string;
+    public type?: LectureUnitType;
+}
diff --git a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.html b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.html
index 087c41cd6df0..f4c2bade4233 100644
--- a/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.html
+++ b/src/main/webapp/app/exam/manage/exams/exam-exercise-import/exam-exercise-import.component.html
@@ -90,7 +90,7 @@ <h4 class="form-check d-flex justify-content-center">
                             </td>
                             <td>{{ exercise.id }}</td>
                             <td>
-                                <fa-icon size="2x" [icon]="getExerciseIcon(exercise)"></fa-icon>
+                                <fa-icon size="2x" [icon]="getExerciseIcon(exercise.type)"></fa-icon>
                             </td>
                             <td>
                                 <input
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 d5aed741cdac..b5f3d94a8c64 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
@@ -5,6 +5,7 @@ import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { ExerciseGroup } from 'app/entities/exercise-group.model';
 import { IconProp } from '@fortawesome/fontawesome-svg-core';
 import { SHORT_NAME_PATTERN } from 'app/shared/constants/input.constants';
+import { getIcon } from 'app/entities/exercise.model';
 
 @Component({
     selector: 'jhi-exam-exercise-import',
@@ -44,6 +45,8 @@ export class ExamExerciseImportComponent implements OnInit {
     faKeyboard = faKeyboard;
     faFont = faFont;
 
+    getExerciseIcon = getIcon;
+
     constructor() {}
 
     ngOnInit(): void {
@@ -316,23 +319,4 @@ export class ExamExerciseImportComponent implements OnInit {
         });
         return validConfiguration;
     }
-
-    /**
-     * Get an icon for the type of the given exercise.
-     * @param exercise {Exercise}
-     */
-    getExerciseIcon(exercise: Exercise): IconProp {
-        switch (exercise.type) {
-            case ExerciseType.QUIZ:
-                return this.faCheckDouble;
-            case ExerciseType.FILE_UPLOAD:
-                return this.faFileUpload;
-            case ExerciseType.MODELING:
-                return this.faProjectDiagram;
-            case ExerciseType.PROGRAMMING:
-                return this.faKeyboard;
-            default:
-                return this.faFont;
-        }
-    }
 }
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 af99e74e4163..1e18e4e7d47d 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
@@ -45,11 +45,6 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
             <div class="d-flex flex-column justify-content-center">
                 <div class="btn-group flex-btn-group-container">
                     <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']" style="justify-content: end">
-                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.FILE_UPLOAD)" class="btn btn-info btn-sm me-1 mb-1">
-                            <fa-icon [icon]="faFileImport"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faFileUpload"></fa-icon>
-                            <span class="d-none d-xl-inline">{{ 'artemisApp.fileUploadExercise.home.importLabel' | artemisTranslate }}</span>
-                        </a>
                         <a
                             *ngIf="course?.isAtLeastEditor"
                             [routerLink]="[exerciseGroup.id, 'file-upload-exercises', 'new']"
@@ -57,16 +52,16 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             style="max-height: 44%"
                         >
                             <fa-icon [icon]="faPlus"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faFileUpload"></fa-icon>
                             <span class="d-none d-xl-inline">{{ 'artemisApp.fileUploadExercise.home.createLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faFileUpload"></fa-icon>
                         </a>
-                    </div>
-                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']" style="justify-content: end">
-                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.QUIZ)" class="btn btn-info btn-sm me-1 mb-1">
+                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.FILE_UPLOAD)" class="btn btn-info btn-sm me-1 mb-1">
                             <fa-icon [icon]="faFileImport"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faCheckDouble"></fa-icon>
-                            <span class="d-none d-xl-inline">{{ 'artemisApp.quizExercise.home.importLabel' | artemisTranslate }}</span>
+                            <span class="d-none d-xl-inline">{{ 'artemisApp.fileUploadExercise.home.importLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faFileUpload"></fa-icon>
                         </a>
+                    </div>
+                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']" style="justify-content: end">
                         <a
                             *ngIf="course?.isAtLeastEditor"
                             [routerLink]="[exerciseGroup.id, 'quiz-exercises', 'new']"
@@ -74,52 +69,57 @@ <h5 class="group-title font-weight-bold mb-0">{{ exerciseGroup.title }}</h5>
                             style="max-height: 44%"
                         >
                             <fa-icon [icon]="faPlus"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faCheckDouble"></fa-icon>
                             <span class="d-none d-xl-inline">{{ 'artemisApp.quizExercise.home.createLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faCheckDouble"></fa-icon>
                         </a>
-                    </div>
-                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
-                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.TEXT)" class="btn btn-info btn-sm me-1 mb-1">
+                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.QUIZ)" class="btn btn-info btn-sm me-1 mb-1">
                             <fa-icon [icon]="faFileImport"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faFont"></fa-icon>
-                            <span class="d-none d-xl-inline">{{ 'artemisApp.textExercise.home.importLabel' | artemisTranslate }}</span>
+                            <span class="d-none d-xl-inline">{{ 'artemisApp.quizExercise.home.importLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faCheckDouble"></fa-icon>
                         </a>
+                    </div>
+                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
                         <a *ngIf="course?.isAtLeastEditor" [routerLink]="[exerciseGroup.id, 'text-exercises', 'new']" class="add-text-exercise btn btn-info btn-sm me-1 mb-1">
                             <fa-icon [icon]="faPlus"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faFont"></fa-icon>
                             <span class="d-none d-xl-inline">{{ 'artemisApp.textExercise.home.createLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faFont"></fa-icon>
                         </a>
-                    </div>
-                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
-                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.MODELING)" class="btn btn-info btn-sm me-1 mb-1">
+                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.TEXT)" class="btn btn-info btn-sm me-1 mb-1">
                             <fa-icon [icon]="faFileImport"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faProjectDiagram"></fa-icon>
-                            <span class="d-none d-xl-inline">{{ 'artemisApp.modelingExercise.home.importLabel' | artemisTranslate }}</span>
+                            <span class="d-none d-xl-inline">{{ 'artemisApp.textExercise.home.importLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faFont"></fa-icon>
                         </a>
+                    </div>
+                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
                         <a
                             *ngIf="course?.isAtLeastEditor"
                             [routerLink]="[exerciseGroup.id, 'modeling-exercises', 'new']"
                             class="add-modeling-exercise btn btn-info btn-sm me-1 mb-1"
                         >
                             <fa-icon [icon]="faPlus"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faProjectDiagram"></fa-icon>
                             <span class="d-none d-xl-inline">{{ 'artemisApp.modelingExercise.home.createLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faProjectDiagram"></fa-icon>
                         </a>
-                    </div>
-                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
-                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.PROGRAMMING)" class="btn btn-info btn-sm me-1 mb-1">
+                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.MODELING)" class="btn btn-info btn-sm me-1 mb-1">
                             <fa-icon [icon]="faFileImport"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faKeyboard"></fa-icon>
-                            <span class="d-none d-xl-inline">{{ 'artemisApp.programmingExercise.home.importLabel' | artemisTranslate }}</span>
+                            <span class="d-none d-xl-inline">{{ 'artemisApp.modelingExercise.home.importLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faProjectDiagram"></fa-icon>
                         </a>
+                    </div>
+                    <div class="btn-group-vertical me-1 mb-1" *jhiHasAnyAuthority="['ROLE_ADMIN', 'ROLE_INSTRUCTOR', 'ROLE_EDITOR']">
                         <a
                             *ngIf="course?.isAtLeastEditor"
                             [routerLink]="[exerciseGroup.id, 'programming-exercises', 'new']"
                             class="add-programming-exercise btn btn-info btn-sm me-1 mb-1"
                         >
                             <fa-icon [icon]="faPlus"></fa-icon>
-                            <fa-icon class="d-xl-none" [icon]="faKeyboard"></fa-icon>
                             <span class="d-none d-xl-inline">{{ 'artemisApp.programmingExercise.home.createLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faKeyboard"></fa-icon>
+                        </a>
+                        <a *ngIf="course?.isAtLeastEditor" (click)="openImportModal(exerciseGroup, exerciseType.PROGRAMMING)" class="btn btn-info btn-sm me-1 mb-1">
+                            <fa-icon [icon]="faFileImport"></fa-icon>
+                            <span class="d-none d-xl-inline">{{ 'artemisApp.programmingExercise.home.importLabel' | artemisTranslate }}</span>
+                            <fa-icon [icon]="faKeyboard"></fa-icon>
                         </a>
                     </div>
                     <div class="btn-group-vertical me-1 mb-1">
diff --git a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.html b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.html
index 91bee476f954..bfd15c7e0002 100644
--- a/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.html
+++ b/src/main/webapp/app/exercises/programming/manage/programming-exercise-create-buttons.component.html
@@ -8,6 +8,7 @@
     >
         <fa-icon [icon]="faPlus"></fa-icon>
         <span class="hidden-sm-down" jhiTranslate="artemisApp.programmingExercise.home.createLabel">Create Programming Exercise</span>
+        <fa-icon [icon]="faKeyboard"></fa-icon>
     </button>
     <button
         id="import-programming-exercise"
@@ -17,5 +18,6 @@
     >
         <fa-icon [icon]="faFileImport"></fa-icon>
         <span class="hidden-sm-down" jhiTranslate="artemisApp.programmingExercise.home.importLabel">Import new Programming Exercise</span>
+        <fa-icon [icon]="faKeyboard"></fa-icon>
     </button>
 </div>
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 c1fa37c0a30c..5ec55e54f894 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
@@ -1,7 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { Course } from 'app/entities/course.model';
 import { FeatureToggle } from 'app/shared/feature-toggle/feature-toggle.service';
-import { faFileImport, faPlus } from '@fortawesome/free-solid-svg-icons';
+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';
@@ -20,6 +20,7 @@ export class ProgrammingExerciseCreateButtonsComponent {
 
     faPlus = faPlus;
     faFileImport = faFileImport;
+    faKeyboard = faKeyboard;
 
     constructor(
         private router: Router,
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.html b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.html
index b6057241b807..fbc66fcfd615 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.html
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.html
@@ -7,14 +7,17 @@
     >
         <fa-icon [icon]="faPlus"></fa-icon>
         <span jhiTranslate="artemisApp.quizExercise.home.createLabel">Create new Quiz</span>
+        <fa-icon [icon]="faCheckDouble"></fa-icon>
     </button>
     <button id="create-dd-quiz" class="btn btn-primary text-truncate mb-1 me-1" [routerLink]="['/course-management', course.id, 'apollon-diagrams']">
         <fa-icon [icon]="faPlus"></fa-icon>
         <span jhiTranslate="artemisApp.quizExercise.home.createModelDragAndDrop">Create new Drag and Drop Model Quiz</span>
+        <fa-icon [icon]="faCheckDouble"></fa-icon>
     </button>
     <button id="import-quiz-exercise" class="btn btn-primary jh-create-entity create-quiz-exercise text-truncate mb-1 me-1" (click)="openImportModal()">
         <fa-icon [icon]="faFileImport"></fa-icon>
         <span class="hidden-sm-down" jhiTranslate="artemisApp.quizExercise.home.importLabel">Import Quiz</span>
+        <fa-icon [icon]="faCheckDouble"></fa-icon>
     </button>
     <button
         *ngIf="quizExercisesCount"
@@ -23,5 +26,6 @@
     >
         <fa-icon [icon]="faFileExport"></fa-icon>
         <span jhiTranslate="artemisApp.quizExercise.home.exportLabel">Export Quiz Exercises</span>
+        <fa-icon [icon]="faCheckDouble"></fa-icon>
     </button>
 </div>
diff --git a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.ts b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.ts
index 7f35097392ab..80924d7e8254 100644
--- a/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.ts
+++ b/src/main/webapp/app/exercises/quiz/manage/quiz-exercise-create-buttons.component.ts
@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 import { Course } from 'app/entities/course.model';
-import { faFileExport, faFileImport, faPlus } from '@fortawesome/free-solid-svg-icons';
+import { faCheckDouble, faFileExport, faFileImport, 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 { NgbModal } from '@ng-bootstrap/ng-bootstrap';
@@ -19,6 +19,7 @@ export class QuizExerciseCreateButtonsComponent {
     faPlus = faPlus;
     faFileImport = faFileImport;
     faFileExport = faFileExport;
+    faCheckDouble = faCheckDouble;
 
     constructor(
         private router: Router,
diff --git a/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.html b/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.html
index 4d616bbed07b..5cc06d26350f 100644
--- a/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.html
+++ b/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.html
@@ -7,9 +7,11 @@
     >
         <fa-icon [icon]="faPlus"></fa-icon>
         <span [jhiTranslate]="'artemisApp.' + translationLabel + 'Exercise.home.createLabel'">Create new Exercise</span>
+        <fa-icon [icon]="getExerciseTypeIcon(exerciseType)"></fa-icon>
     </button>
     <button [id]="'import-' + exerciseType + '-exercise'" class="btn btn-primary jh-create-entity text-truncate mb-1 me-1" (click)="openImportModal()">
         <fa-icon [icon]="faFileImport"></fa-icon>
         <span [jhiTranslate]="'artemisApp.' + translationLabel + 'Exercise.home.importLabel'">Import Exercise</span>
+        <fa-icon [icon]="getExerciseTypeIcon(exerciseType)"></fa-icon>
     </button>
 </div>
diff --git a/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.ts b/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.ts
index 8a738a285ee1..f24d1d507c9d 100644
--- a/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.ts
+++ b/src/main/webapp/app/exercises/shared/manage/exercise-create-buttons.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Course } from 'app/entities/course.model';
 import { faFileImport, faPlus } from '@fortawesome/free-solid-svg-icons';
 import { ExerciseImportWrapperComponent } from 'app/exercises/shared/import/exercise-import-wrapper/exercise-import-wrapper.component';
+import { getIcon } from 'app/entities/exercise.model';
 import { Exercise, ExerciseType } from 'app/entities/exercise.model';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Router } from '@angular/router';
@@ -19,6 +20,8 @@ export class ExerciseCreateButtonsComponent implements OnInit {
     faPlus = faPlus;
     faFileImport = faFileImport;
 
+    getExerciseTypeIcon = getIcon;
+
     constructor(
         private router: Router,
         private modalService: NgbModal,
diff --git a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts
index 7405159f676e..c16717ef0e0f 100644
--- a/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts
+++ b/src/main/webapp/app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service.ts
@@ -1,4 +1,4 @@
-import { LectureUnit, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
+import { LectureUnit, LectureUnitForLearningPathNodeDetailsDTO, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
 import { HttpClient, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -138,4 +138,10 @@ export class LectureUnitService {
             return lectureUnit.releaseDate;
         }
     }
+
+    getLectureUnitForLearningPathNodeDetails(lectureUnitId: number) {
+        return this.httpClient.get<LectureUnitForLearningPathNodeDetailsDTO>(`${this.resourceURL}/lecture-units/${lectureUnitId}/for-learning-path-node-details`, {
+            observe: 'response',
+        });
+    }
 }
diff --git a/src/main/webapp/app/lti/lti13-exercise-launch.component.ts b/src/main/webapp/app/lti/lti13-exercise-launch.component.ts
index bd2f2f4e2a0c..cd0e3e15a6e1 100644
--- a/src/main/webapp/app/lti/lti13-exercise-launch.component.ts
+++ b/src/main/webapp/app/lti/lti13-exercise-launch.component.ts
@@ -42,7 +42,7 @@ export class Lti13ExerciseLaunchComponent implements OnInit {
         const requestBody = new HttpParams().set('state', state).set('id_token', idToken);
 
         this.http
-            .post('api/lti13/auth-login', requestBody.toString(), {
+            .post('api/public/lti13/auth-login', requestBody.toString(), {
                 headers: new HttpHeaders().set('Content-Type', 'application/x-www-form-urlencoded'),
             })
             .subscribe({
diff --git a/src/main/webapp/app/shared/shared.module.ts b/src/main/webapp/app/shared/shared.module.ts
index b63a45c1c99a..a7b2c03ec4a4 100644
--- a/src/main/webapp/app/shared/shared.module.ts
+++ b/src/main/webapp/app/shared/shared.module.ts
@@ -23,6 +23,7 @@ import { AssessmentWarningComponent } from 'app/assessment/assessment-warning/as
 import { JhiConnectionWarningComponent } from 'app/shared/connection-warning/connection-warning.component';
 import { LoadingIndicatorContainerComponent } from 'app/shared/loading-indicator-container/loading-indicator-container.component';
 import { CompetencySelectionComponent } from 'app/shared/competency-selection/competency-selection.component';
+import { StickyPopoverDirective } from 'app/shared/sticky-popover/sticky-popover.directive';
 import { ConfirmEntityNameComponent } from 'app/shared/confirm-entity-name/confirm-entity-name.component';
 
 @NgModule({
@@ -49,6 +50,7 @@ import { ConfirmEntityNameComponent } from 'app/shared/confirm-entity-name/confi
         ItemCountComponent,
         ConsistencyCheckComponent,
         AssessmentWarningComponent,
+        StickyPopoverDirective,
     ],
     exports: [
         ArtemisSharedLibsModule,
@@ -75,6 +77,7 @@ import { ConfirmEntityNameComponent } from 'app/shared/confirm-entity-name/confi
         ConsistencyCheckComponent,
         AssessmentWarningComponent,
         CompetencySelectionComponent,
+        StickyPopoverDirective,
     ],
 })
 export class ArtemisSharedModule {}
diff --git a/src/main/webapp/app/shared/sticky-popover/sticky-popover.directive.ts b/src/main/webapp/app/shared/sticky-popover/sticky-popover.directive.ts
new file mode 100644
index 000000000000..4ec7db908407
--- /dev/null
+++ b/src/main/webapp/app/shared/sticky-popover/sticky-popover.directive.ts
@@ -0,0 +1,119 @@
+import {
+    ApplicationRef,
+    ChangeDetectorRef,
+    Directive,
+    ElementRef,
+    Inject,
+    Injector,
+    Input,
+    NgZone,
+    OnDestroy,
+    OnInit,
+    Renderer2,
+    TemplateRef,
+    ViewContainerRef,
+} from '@angular/core';
+import { DOCUMENT } from '@angular/common';
+import { NgbPopover, NgbPopoverConfig } from '@ng-bootstrap/ng-bootstrap';
+
+@Directive({
+    selector: '[jhiStickyPopover]',
+})
+export class StickyPopoverDirective extends NgbPopover implements OnInit, OnDestroy {
+    @Input() jhiStickyPopover: TemplateRef<any>;
+
+    popoverTitle: string;
+
+    triggers: string;
+    container: string;
+    canClosePopover: boolean;
+
+    private closeTimeout: any;
+    private clickInPopover: boolean = false;
+
+    toggle(): void {
+        super.toggle();
+    }
+
+    isOpen(): boolean {
+        return super.isOpen();
+    }
+
+    constructor(
+        private _elRef: ElementRef,
+        private _render: Renderer2,
+        injector: Injector,
+        private viewContainerRef: ViewContainerRef,
+        config: NgbPopoverConfig,
+        ngZone: NgZone,
+        private changeRef: ChangeDetectorRef,
+        private applicationRef: ApplicationRef,
+        @Inject(DOCUMENT) _document: any,
+    ) {
+        super(_elRef, _render, injector, viewContainerRef, config, ngZone, _document, changeRef, applicationRef);
+        this.triggers = 'manual';
+        this.popoverTitle = '';
+        this.container = 'body';
+    }
+
+    ngOnInit(): void {
+        super.ngOnInit();
+        this.ngbPopover = this.jhiStickyPopover;
+
+        this._render.listen(this._elRef.nativeElement, 'pointerenter', () => {
+            this.canClosePopover = true;
+            clearTimeout(this.closeTimeout);
+            if (!this.isOpen()) {
+                this.open();
+            }
+        });
+
+        this._render.listen(this._elRef.nativeElement, 'pointerleave', () => {
+            this.closeTimeout = setTimeout(() => {
+                if (this.canClosePopover) {
+                    this.close();
+                }
+            }, 100);
+        });
+
+        this._render.listen(this._elRef.nativeElement, 'click', () => {
+            this.close();
+        });
+    }
+
+    ngOnDestroy(): void {
+        super.ngOnDestroy();
+    }
+
+    open() {
+        super.open();
+        setTimeout(() => {
+            const popover = window.document.querySelector('.popover');
+            this._render.listen(popover, 'mouseover', () => {
+                this.canClosePopover = false;
+            });
+
+            this._render.listen(popover, 'pointerleave', () => {
+                this.canClosePopover = true;
+                clearTimeout(this.closeTimeout);
+                this.closeTimeout = setTimeout(() => {
+                    if (this.canClosePopover) {
+                        this.close();
+                    }
+                }, 250);
+            });
+
+            this._render.listen(popover, 'click', () => {
+                this.clickInPopover = true;
+            });
+        }, 0);
+    }
+
+    close() {
+        if (this.clickInPopover) {
+            this.clickInPopover = false;
+        } else {
+            super.close();
+        }
+    }
+}
diff --git a/src/main/webapp/i18n/de/aboutUs.json b/src/main/webapp/i18n/de/aboutUs.json
index 26078189fa76..43112e6bb220 100644
--- a/src/main/webapp/i18n/de/aboutUs.json
+++ b/src/main/webapp/i18n/de/aboutUs.json
@@ -56,6 +56,9 @@
             "tutorialGroups": {
                 "text": "<a href={{ tutorialGroupsUrl }}>Übungsgruppen:</a> Verwaltung der Übungsgruppen eines Kurses. Planung der Sitzungen, Zuweisung der verantwortlichen Tutor:innen, Registrierung der Studierenden und Verfolgung der Anwesenheit."
             },
+            "iris": {
+                "text": "<a href={{ irisUrl }}>Iris:</a> Artemis integriert Iris, einen Chatbot, der Studierende und Lehrende bei häufig gestellten Fragen und Aufgaben unterstützt."
+            },
             "scalable": {
                 "text": "<a href={{ scalingUrl }}>Skalierbar</a> auf mehrere Kurse mit Tausenden von Studierenden. Konfigurieren von zusätzlichen Build-Agenten in der kontinuierlichen Integrationsumgebung."
             },
diff --git a/src/main/webapp/i18n/de/competency.json b/src/main/webapp/i18n/de/competency.json
index 62d59e2cd035..6543d4a798a8 100644
--- a/src/main/webapp/i18n/de/competency.json
+++ b/src/main/webapp/i18n/de/competency.json
@@ -169,6 +169,11 @@
                     "name": "Name",
                     "login": "Login",
                     "progress": "Fortschritt"
+                },
+                "progressNav": {
+                    "header": "Lernpfad",
+                    "refresh": "Aktualisieren",
+                    "center": "Zentrieren"
                 }
             }
         }
diff --git a/src/main/webapp/i18n/de/health.json b/src/main/webapp/i18n/de/health.json
index f059ccd6a1bf..16a7a407c33d 100644
--- a/src/main/webapp/i18n/de/health.json
+++ b/src/main/webapp/i18n/de/health.json
@@ -28,7 +28,8 @@
             "hazelcast": "Hazelcast",
             "websocketBroker": "Websocket Broker (Server -> Broker)",
             "athena": "Athena",
-            "apollon": "Apollon Conversion Server"
+            "apollon": "Apollon Conversion Server",
+            "iris": "Pyris Server"
         },
         "table": {
             "service": "Dienst Name",
diff --git a/src/main/webapp/i18n/en/aboutUs.json b/src/main/webapp/i18n/en/aboutUs.json
index 67d52eae0dd6..0e582d2793cf 100644
--- a/src/main/webapp/i18n/en/aboutUs.json
+++ b/src/main/webapp/i18n/en/aboutUs.json
@@ -56,6 +56,9 @@
             "tutorialGroups": {
                 "text": "<a href={{ tutorialGroupsUrl }}>Tutorial Groups:</a> Manage the tutorial groups of a course. Plan the sessions, assign responsible tutors, register students and track the attendance."
             },
+            "iris": {
+                "text": "<a href={{ irisUrl }}>Iris:</a> Artemis integrates Iris, a chatbot that supports students and instructors with common questions and tasks."
+            },
             "scalable": {
                 "text": "<a href={{ scalingUrl }}>Scalable</a> to multiple courses with thousands of students. Configure additional build agents in the continuous integration environment."
             },
diff --git a/src/main/webapp/i18n/en/competency.json b/src/main/webapp/i18n/en/competency.json
index fbc7c96a12aa..ba6dc5f20b2e 100644
--- a/src/main/webapp/i18n/en/competency.json
+++ b/src/main/webapp/i18n/en/competency.json
@@ -168,6 +168,11 @@
                     "name": "Name",
                     "login": "Login",
                     "progress": "Progress"
+                },
+                "progressNav": {
+                    "header": "Learning Path",
+                    "refresh": "Refresh",
+                    "center": "Center view"
                 }
             }
         }
diff --git a/src/main/webapp/i18n/en/health.json b/src/main/webapp/i18n/en/health.json
index 8fe047ae5775..b100bc030af0 100644
--- a/src/main/webapp/i18n/en/health.json
+++ b/src/main/webapp/i18n/en/health.json
@@ -28,7 +28,8 @@
             "hazelcast": "Hazelcast",
             "websocketBroker": "Websocket Broker (Server -> Broker)",
             "athena": "Athena",
-            "apollon": "Apollon Conversion Server"
+            "apollon": "Apollon Conversion Server",
+            "iris": "Pyris Server"
         },
         "table": {
             "service": "Service name",
diff --git a/src/test/java/de/tum/in/www1/artemis/ArchitectureTest.java b/src/test/java/de/tum/in/www1/artemis/ArchitectureTest.java
index eaef679a24ec..3a7aded9442a 100644
--- a/src/test/java/de/tum/in/www1/artemis/ArchitectureTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/ArchitectureTest.java
@@ -1,11 +1,15 @@
 package de.tum.in.www1.artemis;
 
 import static com.tngtech.archunit.base.DescribedPredicate.*;
+import static com.tngtech.archunit.core.domain.JavaCall.Predicates.target;
 import static com.tngtech.archunit.core.domain.JavaClass.Predicates.*;
+import static com.tngtech.archunit.core.domain.properties.HasName.Predicates.nameMatching;
+import static com.tngtech.archunit.core.domain.properties.HasOwner.Predicates.With.owner;
 import static com.tngtech.archunit.lang.SimpleConditionEvent.violated;
 import static com.tngtech.archunit.lang.conditions.ArchPredicates.*;
 import static com.tngtech.archunit.lang.syntax.ArchRuleDefinition.*;
 
+import java.nio.file.Files;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -84,6 +88,14 @@ void testValidSimpMessageSendingOperationsUsage() {
         usage.check(productionClasses);
     }
 
+    @Test
+    void testFileWriteUsage() {
+        ArchRule usage = noClasses().should()
+                .callMethodWhere(target(owner(assignableTo(Files.class))).and(target(nameMatching("copy")).or(target(nameMatching("move"))).or(target(nameMatching("write.*")))))
+                .because("Files.copy does not create directories if they do not exist. Use Apache FileUtils instead.");
+        usage.check(allClasses);
+    }
+
     // Custom Predicates for JavaAnnotations since ArchUnit only defines them for classes
 
     private DescribedPredicate<? super JavaAnnotation<?>> simpleNameAnnotation(String name) {
diff --git a/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java
index b66ee2697abe..bca382ba465c 100644
--- a/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/ImprintResourceIntegrationTest.java
@@ -5,10 +5,11 @@
 import static org.mockito.Mockito.mockStatic;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -51,10 +52,9 @@ void testGetImprintForUpdate_cannotReadFileInternalServerError() throws Exceptio
     @Test
     @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN")
     void testUpdatePrivacyStatement_cannotWriteFileInternalServerError() throws Exception {
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(argThat(path -> path.toString().contains("_de")))).thenReturn(true);
-            mockedFiles.when(
-                    () -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE), eq(StandardOpenOption.TRUNCATE_EXISTING)))
+            mockedFileUtils.when(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)))
                     .thenThrow(new IOException());
             request.putWithResponseBody("/api/admin/imprint", new Imprint("text", Language.GERMAN), Imprint.class, HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -64,13 +64,12 @@ void testUpdatePrivacyStatement_cannotWriteFileInternalServerError() throws Exce
     @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN")
     void testUpdatePrivacyStatement_directoryDoesntExist_createsDirectoryAndSavesFile() throws Exception {
         Imprint response;
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(false);
 
             response = request.putWithResponseBody("/api/admin/imprint", new Imprint("updatedText", Language.GERMAN), Imprint.class, HttpStatus.OK);
             mockedFiles.verify(() -> Files.createDirectories(any()));
-            mockedFiles.verify(() -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE),
-                    eq(StandardOpenOption.TRUNCATE_EXISTING)));
+            mockedFileUtils.verify(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)));
         }
         assertThat(response.getText()).isEqualTo("updatedText");
         assertThat(response.getLanguage()).isEqualTo(Language.GERMAN);
@@ -200,12 +199,10 @@ void testUpdateImprint_writesFile_ReturnsUpdatedFileContent() throws Exception {
         Imprint response;
         Imprint requestBody = new Imprint(Language.GERMAN);
         requestBody.setText("Impressum");
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(any())).thenReturn(true);
             response = request.putWithResponseBody("/api/admin/imprint", requestBody, Imprint.class, HttpStatus.OK);
-            mockedFiles.verify(() -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE),
-                    eq(StandardOpenOption.TRUNCATE_EXISTING)));
-
+            mockedFileUtils.verify(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)));
         }
         assertThat(response.getLanguage()).isEqualTo(Language.GERMAN);
         assertThat(response.getText()).isEqualTo("Impressum");
diff --git a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
index 8c40b6665b1b..83f74b5025da 100644
--- a/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/LtiIntegrationTest.java
@@ -4,9 +4,12 @@
 import static org.mockito.Mockito.*;
 
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -170,6 +173,23 @@ private void addJiraMocks(String email, String existingUser) throws Exception {
         jiraRequestMockProvider.mockAddUserToGroup("tumuser", false);
     }
 
+    private void addBitbucketMock(String requestBody) throws URISyntaxException {
+        bitbucketRequestMockProvider.enableMockingOfRequests();
+
+        String username = "prefix_";
+        Matcher matcher = Pattern.compile("lis_person_sourcedid=([^&#]+)").matcher(requestBody);
+        if (matcher.find() && !matcher.group(1).isEmpty()) {
+            username += matcher.group(1);
+        }
+        else {
+            matcher = Pattern.compile("ext_user_username=([^&#]+)").matcher(requestBody);
+            if (matcher.find()) {
+                username += matcher.group(1);
+            }
+        }
+        bitbucketRequestMockProvider.mockUserExists(username);
+    }
+
     @ParameterizedTest
     @ValueSource(strings = { EDX_REQUEST_BODY, MOODLE_REQUEST_BODY })
     @WithAnonymousUser
@@ -184,12 +204,13 @@ void launchAsAnonymousUser_noOnlineCourseConfigurationException(String requestBo
     }
 
     @ParameterizedTest
-    @ValueSource(strings = { EDX_REQUEST_BODY }) // To be readded when LtiUserId is removed, MOODLE_REQUEST_BODY })
+    @ValueSource(strings = { EDX_REQUEST_BODY, MOODLE_REQUEST_BODY })
     @WithAnonymousUser
     void launchAsAnonymousUser_WithoutExistingEmail(String requestBody) throws Exception {
         String email = generateEmail("launchAsAnonymousUser_WithoutExistingEmail");
         requestBody = replaceEmail(requestBody, email);
         addJiraMocks(email, null);
+        addBitbucketMock(requestBody);
 
         Long exerciseId = programmingExercise.getId();
         Long courseId = programmingExercise.getCourseViaExerciseGroupOrCourseMember().getId();
@@ -218,7 +239,7 @@ void launchAsAnonymousUser_WithExistingEmail(String requestBody) throws Exceptio
     }
 
     @ParameterizedTest
-    @ValueSource(strings = { EDX_REQUEST_BODY }) // To be readded when LtiUserId is removed, MOODLE_REQUEST_BODY })
+    @ValueSource(strings = { EDX_REQUEST_BODY, MOODLE_REQUEST_BODY })
     @WithAnonymousUser
     void launchAsAnonymousUser_RequireExistingUser(String requestBody) throws Exception {
         String email = generateEmail("launchAsAnonymousUser_RequireExistingUser");
diff --git a/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java
index 4f9ac9e54a5d..8bb40f27e639 100644
--- a/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/PrivacyStatementResourceIntegrationTest.java
@@ -5,10 +5,11 @@
 import static org.mockito.Mockito.mockStatic;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -53,10 +54,9 @@ void testGetPrivacyStatementForUpdate_cannotReadFileInternalServerError() throws
     @Test
     @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN")
     void testUpdatePrivacyStatement_cannotWriteFileInternalServerError() throws Exception {
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(argThat(path -> path.toString().contains("_de")))).thenReturn(true);
-            mockedFiles.when(
-                    () -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE), eq(StandardOpenOption.TRUNCATE_EXISTING)))
+            mockedFileUtils.when(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)))
                     .thenThrow(new IOException());
             request.putWithResponseBody("/api/admin/privacy-statement", new PrivacyStatement("text", Language.GERMAN), PrivacyStatement.class, HttpStatus.INTERNAL_SERVER_ERROR);
         }
@@ -67,14 +67,12 @@ void testUpdatePrivacyStatement_cannotWriteFileInternalServerError() throws Exce
     @WithMockUser(username = TEST_PREFIX + "admin", roles = "ADMIN")
     void testUpdatePrivacyStatement_directoryDoesntExist_createsDirectoryAndSavesFile() throws Exception {
         PrivacyStatement response;
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(any(Path.class))).thenReturn(false);
 
             response = request.putWithResponseBody("/api/admin/privacy-statement", new PrivacyStatement("updatedText", Language.GERMAN), PrivacyStatement.class, HttpStatus.OK);
             mockedFiles.verify(() -> Files.createDirectories(any()));
-            mockedFiles.verify(() -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE),
-                    eq(StandardOpenOption.TRUNCATE_EXISTING)));
-
+            mockedFileUtils.verify(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)));
         }
         assertThat(response.getText()).isEqualTo("updatedText");
         assertThat(response.getLanguage()).isEqualTo(Language.GERMAN);
@@ -205,16 +203,14 @@ void testUpdatePrivacyStatement_writesFile_ReturnsUpdatedFileContent() throws Ex
         PrivacyStatement response;
         PrivacyStatement requestBody = new PrivacyStatement(Language.GERMAN);
         requestBody.setText("Datenschutzerklärung");
-        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class)) {
+        try (MockedStatic<Files> mockedFiles = mockStatic(Files.class); MockedStatic<FileUtils> mockedFileUtils = mockStatic(FileUtils.class)) {
             mockedFiles.when(() -> Files.exists(any())).thenReturn(true);
 
             response = request.putWithResponseBody("/api/admin/privacy-statement", requestBody, PrivacyStatement.class, HttpStatus.OK);
-            mockedFiles.verify(() -> Files.writeString(argThat(path -> path.toString().contains("_de")), anyString(), eq(StandardOpenOption.CREATE),
-                    eq(StandardOpenOption.TRUNCATE_EXISTING)));
+            mockedFileUtils.verify(() -> FileUtils.writeStringToFile(argThat(file -> file.toString().contains("_de")), anyString(), eq(StandardCharsets.UTF_8)));
             // we explicitly check the method calls to ensure createDirectories is not called when the directory exists
             mockedFiles.verify(() -> Files.exists(any()));
             mockedFiles.verifyNoMoreInteractions();
-
         }
         assertThat(response.getLanguage()).isEqualTo(Language.GERMAN);
         assertThat(response.getText()).isEqualTo("Datenschutzerklärung");
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserBambooBitbucketJiraIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/UserBambooBitbucketJiraIntegrationTest.java
index 446160f03ece..1fb35562d582 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/UserBambooBitbucketJiraIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/UserBambooBitbucketJiraIntegrationTest.java
@@ -51,6 +51,12 @@ void updateUser_asAdmin_isSuccessful() throws Exception {
         userTestService.updateUser_asAdmin_isSuccessful();
     }
 
+    @Test
+    @WithMockUser(username = "admin", roles = "ADMIN")
+    void updateUserEmptyRoles() throws Exception {
+        userTestService.updateUserWithEmptyRoles();
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void updateUserInvalidId() throws Exception {
@@ -126,6 +132,15 @@ void createInternalUser_asAdmin_isSuccessful() throws Exception {
         userTestService.createInternalUser_asAdmin_isSuccessful();
     }
 
+    @Test
+    @WithMockUser(username = "admin", roles = "ADMIN")
+    void createInternalUserWithoutRoles_asAdmin_isSuccessful() throws Exception {
+        bitbucketRequestMockProvider.mockUserDoesNotExist("batman");
+        bitbucketRequestMockProvider.mockCreateUser("batman", "foobar1234", "batman@secret.invalid", TEST_PREFIX + "student1First " + TEST_PREFIX + "student1Last");
+        bitbucketRequestMockProvider.mockAddUserToGroups();
+        userTestService.createInternalUserWithoutRoles_asAdmin_isSuccessful();
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void createUser_asAdmin_hasId() throws Exception {
diff --git a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
index 8a2ec915317b..322427593291 100644
--- a/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/authentication/UserJenkinsGitlabIntegrationTest.java
@@ -177,6 +177,15 @@ void createInternalUser_asAdmin_with_vcsAccessToken_isSuccessful() throws Except
         ReflectionTestUtils.setField(gitLabUserManagementService, "versionControlAccessToken", false);
     }
 
+    @Test
+    @WithMockUser(username = "admin", roles = "ADMIN")
+    void createInternalUserWithoutRoles_isSuccessful() throws Exception {
+        gitlabRequestMockProvider.mockCreationOfUser("batman");
+        ReflectionTestUtils.setField(gitLabUserManagementService, "versionControlAccessToken", true);
+        userTestService.createInternalUserWithoutRoles_asAdmin_isSuccessful();
+        ReflectionTestUtils.setField(gitLabUserManagementService, "versionControlAccessToken", false);
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void createUser_asAdmin_hasId() throws Exception {
@@ -392,6 +401,12 @@ void updateUserLogin() throws Exception {
         userTestService.updateUserLogin();
     }
 
+    @Test
+    @WithMockUser(username = "admin", roles = "ADMIN")
+    void updateUserEmptyRoles() throws Exception {
+        userTestService.updateUserWithEmptyRoles();
+    }
+
     @Test
     @WithMockUser(username = "admin", roles = "ADMIN")
     void shouldFailIfCannotUpdateActivatedUserInGitlab() throws Exception {
diff --git a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java b/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
index 9f3332a8d751..452203bea36c 100644
--- a/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/config/MetricsBeanTest.java
@@ -3,9 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.ZonedDateTime;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -13,6 +11,7 @@
 
 import de.tum.in.www1.artemis.AbstractSpringIntegrationBambooBitbucketJiraTest;
 import de.tum.in.www1.artemis.course.CourseUtilService;
+import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.TextExercise;
 import de.tum.in.www1.artemis.domain.enumeration.ExerciseType;
 import de.tum.in.www1.artemis.domain.enumeration.QuizMode;
@@ -162,8 +161,7 @@ void testPublicMetricsActiveUsers() {
     @Test
     void testPublicMetricsCourses() {
         var activeCourse = courseUtilService.createCourse();
-        activeCourse.setStartDate(ZonedDateTime.now().minusDays(1));
-        activeCourse.setEndDate(ZonedDateTime.now().plusDays(1));
+        activateCourse(activeCourse);
         courseRepository.save(activeCourse);
 
         var inactiveCourse = courseUtilService.createCourse();
@@ -173,8 +171,8 @@ void testPublicMetricsCourses() {
 
         metricsBean.updatePublicArtemisMetrics();
 
-        var totalNumberOfCourses = courseRepository.count();
-        var numberOfActiveCourses = courseRepository.findAllActive(ZonedDateTime.now()).size();
+        long totalNumberOfCourses = courseRepository.count();
+        long numberOfActiveCourses = countActiveCourses();
 
         // Assert that there is at least one non-active course in the database so that the values returned from the metrics are different
         assertThat(numberOfActiveCourses).isNotEqualTo(totalNumberOfCourses);
@@ -183,6 +181,33 @@ void testPublicMetricsCourses() {
         assertMetricEquals(numberOfActiveCourses, "artemis.statistics.public.active_courses");
     }
 
+    @Test
+    void testPublicMetricsFilterTestCourses() {
+        var activeCourse = courseUtilService.createCourse();
+        activateCourse(activeCourse);
+        courseRepository.save(activeCourse);
+
+        var testCourse = courseUtilService.createCourse();
+        activateCourse(testCourse);
+        testCourse.setTestCourse(true);
+        courseRepository.save(testCourse);
+
+        metricsBean.updatePublicArtemisMetrics();
+
+        long totalNumberOfCourses = courseRepository.count();
+        long numberOfActiveCourses = countActiveCourses();
+
+        assertMetricEquals(totalNumberOfCourses, "artemis.statistics.public.courses");
+        assertMetricEquals(numberOfActiveCourses, "artemis.statistics.public.active_courses");
+    }
+
+    private long countActiveCourses() {
+        final List<Course> activeCourses = courseRepository.findAllActive(ZonedDateTime.now());
+        // the test courses are only filtered for the metrics since for instructors/tutors/editors using Artemis
+        // test courses count as active, but they never contain active students/exams relevant for the metrics
+        return activeCourses.stream().filter(course -> !course.isTestCourse()).count();
+    }
+
     @Test
     void testPublicMetricsExams() {
         var users = userUtilService.addUsers(TEST_PREFIX, 1, 0, 0, 0);
@@ -455,4 +480,9 @@ private void assertMetricEquals(double expectedValue, String metricName, String.
         var gauge = meterRegistry.get(metricName).tags(tags).gauge();
         assertThat(gauge.value()).isEqualTo(expectedValue);
     }
+
+    private void activateCourse(final Course course) {
+        course.setStartDate(ZonedDateTime.now().minusDays(1));
+        course.setEndDate(ZonedDateTime.now().plusDays(1));
+    }
 }
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 d59c2f991c4d..dd5d80795a2d 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
@@ -28,7 +28,9 @@
 import de.tum.in.www1.artemis.security.ArtemisAuthenticationProvider;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.security.jwt.JWTCookieService;
+import de.tum.in.www1.artemis.service.connectors.ci.CIUserManagementService;
 import de.tum.in.www1.artemis.service.connectors.lti.LtiService;
+import de.tum.in.www1.artemis.service.connectors.vcs.VcsUserManagementService;
 import de.tum.in.www1.artemis.service.user.UserCreationService;
 
 class LtiServiceTest {
@@ -45,6 +47,12 @@ class LtiServiceTest {
     @Mock
     private JWTCookieService jwtCookieService;
 
+    @Mock
+    private Optional<VcsUserManagementService> optionalVcsUserManagementService;
+
+    @Mock
+    private Optional<CIUserManagementService> optionalCIUserManagementService;
+
     private Exercise exercise;
 
     private LtiService ltiService;
@@ -61,7 +69,8 @@ class LtiServiceTest {
     void init() {
         closeable = MockitoAnnotations.openMocks(this);
         SecurityContextHolder.clearContext();
-        ltiService = new LtiService(userCreationService, userRepository, artemisAuthenticationProvider, jwtCookieService);
+        ltiService = new LtiService(userCreationService, userRepository, artemisAuthenticationProvider, jwtCookieService, optionalVcsUserManagementService,
+                optionalCIUserManagementService);
         Course course = new Course();
         course.setId(100L);
         course.setStudentGroupName(courseStudentGroupName);
diff --git a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java b/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
index 4bd3aca7e413..a3ab987be7fa 100644
--- a/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/course/CourseTestService.java
@@ -10,6 +10,7 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.IOException;
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.DayOfWeek;
@@ -133,7 +134,7 @@ public class CourseTestService {
     private CourseExamExportService courseExamExportService;
 
     @Autowired
-    private FileService fileService;
+    private FilePathService filePathService;
 
     @Autowired
     private FileUploadExerciseRepository fileUploadExerciseRepository;
@@ -1477,8 +1478,8 @@ public void testGetCourse() throws Exception {
             assertThat(courseOnly.getNumberOfInstructors()).as("Amount of instructors is correct").isEqualTo(1);
 
             // Assert that course properties on courseWithExercises and courseWithExercisesAndRelevantParticipations match those of courseOnly
-            String[] ignoringFields = { "exercises", "tutorGroups", "lectures", "exams", "fileService", "numberOfInstructorsTransient", "numberOfStudentsTransient",
-                    "numberOfTeachingAssistantsTransient", "numberOfEditorsTransient" };
+            String[] ignoringFields = { "exercises", "tutorGroups", "lectures", "exams", "fileService", "filePathService", "entityFileService", "numberOfInstructorsTransient",
+                    "numberOfStudentsTransient", "numberOfTeachingAssistantsTransient", "numberOfEditorsTransient" };
             assertThat(courseWithExercises).as("courseWithExercises same as courseOnly").usingRecursiveComparison().ignoringFields(ignoringFields).isEqualTo(courseOnly);
 
             // Verify presence of exercises in mock courses
@@ -3079,21 +3080,18 @@ public void testEditCourseRemoveExistingIcon() throws Exception {
         ZonedDateTime futureTimestamp = ZonedDateTime.now().plusDays(5);
 
         Course course = CourseFactory.generateCourse(null, pastTimestamp, futureTimestamp, new HashSet<>(), "tumuser", "tutor", "editor", "instructor");
+        Course savedCourse = courseRepo.save(course);
         byte[] iconBytes = "icon".getBytes();
         MockMultipartFile iconFile = new MockMultipartFile("file", "icon.png", MediaType.APPLICATION_JSON_VALUE, iconBytes);
-        String iconPath = fileService.handleSaveFile(iconFile, false, false);
-        iconPath = fileService.manageFilesForUpdatedFilePath(null, iconPath, FilePathService.getCourseIconFilePath(), course.getId());
-        course.setCourseIcon(iconPath);
-        course = courseRepo.save(course);
-        iconPath = iconPath.replace(Constants.FILEPATH_ID_PLACEHOLDER, course.getId().toString());
-        assertThat(course.getCourseIcon()).as("course icon was set correctly").isEqualTo(iconPath);
+        Course savedCourseWithFile = request.putWithMultipartFile("/api/courses/" + savedCourse.getId(), savedCourse, "course", iconFile, Course.class, HttpStatus.OK, null);
+        Path path = filePathService.actualPathForPublicPath(URI.create(savedCourseWithFile.getCourseIcon()));
 
-        course.setCourseIcon(null);
-        request.putWithMultipartFile("/api/courses/" + course.getId(), course, "course", null, Course.class, HttpStatus.OK, null);
+        savedCourseWithFile.setCourseIcon(null);
+        request.putWithMultipartFile("/api/courses/" + savedCourseWithFile.getId(), savedCourseWithFile, "course", null, Course.class, HttpStatus.OK, null);
 
         course = courseRepo.findByIdElseThrow(course.getId());
         assertThat(course.getCourseIcon()).as("course icon was deleted correctly").isNull();
-        assertThat(fileService.getFileForPath(fileService.actualPathForPublicPath(iconPath))).as("course icon file was deleted correctly").isNull();
+        assertThat(path.toFile()).as("course icon file was deleted correctly").doesNotExist();
     }
 
     private String getUpdateOnlineCourseConfigurationPath(String courseId) {
diff --git a/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java
index f9a7599e5eff..68f7ef85899e 100644
--- a/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/dataexport/DataExportResourceIntegrationTest.java
@@ -4,11 +4,11 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.Optional;
 
+import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -86,14 +86,14 @@ private DataExport prepareDataExportForDownload() throws IOException {
         dataExport.setCreationFinishedDate(ZonedDateTime.now().minusDays(1));
         // rename file to avoid duplicates in the temp directory
         var newFilePath = TEST_DATA_EXPORT_BASE_FILE_PATH + ZonedDateTime.now().toEpochSecond();
-        Files.move(Path.of(TEST_DATA_EXPORT_BASE_FILE_PATH), Path.of(newFilePath));
+        FileUtils.moveFile(Path.of(TEST_DATA_EXPORT_BASE_FILE_PATH).toFile(), Path.of(newFilePath).toFile());
         dataExport.setFilePath(newFilePath);
         return dataExportRepository.save(dataExport);
     }
 
     private void restoreTestDataInitState(DataExport dataExport) throws IOException {
         // undo file renaming
-        Files.move(Path.of(dataExport.getFilePath()), Path.of(TEST_DATA_EXPORT_BASE_FILE_PATH));
+        FileUtils.moveFile(Path.of(dataExport.getFilePath()).toFile(), Path.of(TEST_DATA_EXPORT_BASE_FILE_PATH).toFile());
     }
 
     @Test
@@ -296,7 +296,7 @@ void testRequestingDataExportCreatesCorrectDataExportObject() throws Exception {
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void testDeleteDataExportSchedulesDirectoryForDeletion_setsCorrectState(DataExportState state) {
         var dataExport = initDataExport(state);
-        doNothing().when(fileService).scheduleForDirectoryDeletion(any(Path.class), anyInt());
+        doNothing().when(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyInt());
         dataExportService.deleteDataExportAndSetDataExportState(dataExport);
         var dataExportFromDb = dataExportRepository.findByIdElseThrow(dataExport.getId());
         if (state == DataExportState.DOWNLOADED) {
@@ -305,7 +305,7 @@ void testDeleteDataExportSchedulesDirectoryForDeletion_setsCorrectState(DataExpo
         else {
             assertThat(dataExportFromDb.getDataExportState()).isEqualTo(DataExportState.DELETED);
         }
-        verify(fileService).scheduleForDeletion(Path.of(dataExportFromDb.getFilePath()), 2);
+        verify(fileService).schedulePathForDeletion(Path.of(dataExportFromDb.getFilePath()), 2);
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
index 9c93d719942a..79843172db90 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/ExamUserIntegrationTest.java
@@ -118,6 +118,9 @@ void initTestCase() throws Exception {
     @AfterEach
     void tearDown() throws Exception {
         programmingExerciseTestService.tearDown();
+        for (LocalRepository studentRepo : studentRepos) {
+            studentRepo.resetLocalRepo();
+        }
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
index ac6b8d9c783b..cfbf77cda095 100644
--- a/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exam/StudentExamIntegrationTest.java
@@ -473,6 +473,7 @@ void testGetStudentExamForConduction_testExam() throws Exception {
         // TODO: test the conduction / submission of the test exams, in particular that the summary includes all submissions
 
         deleteExamWithInstructor(testExam1);
+        repo.resetLocalRepo();
     }
 
     private void assertParticipationAndSubmissions(StudentExam response, User user) {
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java
index afb26d6a7cc4..ff3bcef043d2 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadExerciseUtilService.java
@@ -210,7 +210,7 @@ public void createFileUploadSubmissionWithFile(String loginPrefix, FileUploadExe
         fileUploadSubmission = addFileUploadSubmission(fileUploadExercise, fileUploadSubmission, loginPrefix + "student1");
 
         // Create a dummy file
-        var uploadedFileDir = Path.of("./", FileUploadSubmission.buildFilePath(fileUploadExercise.getId(), fileUploadSubmission.getId()));
+        var uploadedFileDir = Path.of("./").resolve(FileUploadSubmission.buildFilePath(fileUploadExercise.getId(), fileUploadSubmission.getId()));
         var uploadedFilePath = Path.of(uploadedFileDir.toString(), filename);
         if (!Files.exists(uploadedFilePath)) {
             Files.createDirectories(uploadedFileDir);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java
index c169d67f31c3..99c5e9065fad 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/fileuploadexercise/FileUploadSubmissionIntegrationTest.java
@@ -2,6 +2,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.net.URI;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
@@ -25,13 +26,13 @@
 import de.tum.in.www1.artemis.domain.modeling.ModelingSubmission;
 import de.tum.in.www1.artemis.domain.participation.Participation;
 import de.tum.in.www1.artemis.domain.participation.StudentParticipation;
-import de.tum.in.www1.artemis.exception.FilePathParsingException;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.modelingexercise.ModelingExerciseUtilService;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
 import de.tum.in.www1.artemis.participation.ParticipationUtilService;
 import de.tum.in.www1.artemis.repository.FileUploadSubmissionRepository;
 import de.tum.in.www1.artemis.repository.ParticipationRepository;
+import de.tum.in.www1.artemis.service.FilePathService;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.rest.errors.EntityNotFoundException;
 
@@ -60,6 +61,9 @@ class FileUploadSubmissionIntegrationTest extends AbstractSpringIntegrationIndep
     @Autowired
     private ModelingExerciseUtilService modelingExerciseUtilService;
 
+    @Autowired
+    private FilePathService filePathService;
+
     private FileUploadExercise releasedFileUploadExercise;
 
     private FileUploadExercise finishedFileUploadExercise;
@@ -146,27 +150,27 @@ private void submitFile(String filename, boolean differentFilePath) throws Excep
         }
         FileUploadSubmission returnedSubmission = performInitialSubmission(releasedFileUploadExercise.getId(), submission, filename);
 
-        String actualFilePath;
+        Path actualFilePath;
 
         if (differentFilePath) {
-            actualFilePath = Path.of(FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()), filename).toString();
+            actualFilePath = FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()).resolve(filename);
         }
         else {
             if (filename.length() < 5) {
-                actualFilePath = Path.of(FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()), "file" + filename).toString();
+                actualFilePath = FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()).resolve(Path.of("file" + filename));
             }
             else if (filename.contains("\\")) {
-                actualFilePath = Path.of(FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()), "file.png").toString();
+                actualFilePath = FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()).resolve("file.png");
             }
             else {
-                actualFilePath = Path.of(FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()), filename).toString();
+                actualFilePath = FileUploadSubmission.buildFilePath(releasedFileUploadExercise.getId(), returnedSubmission.getId()).resolve(filename);
             }
         }
 
-        String publicFilePath = fileService.publicPathForActualPath(actualFilePath, returnedSubmission.getId());
+        URI publicFilePath = filePathService.publicPathForActualPath(actualFilePath, returnedSubmission.getId());
         assertThat(returnedSubmission).as("submission correctly posted").isNotNull();
-        assertThat(returnedSubmission.getFilePath()).isEqualTo(publicFilePath);
-        var fileBytes = Files.readAllBytes(Path.of(actualFilePath));
+        assertThat(returnedSubmission.getFilePath()).isEqualTo(publicFilePath.toString());
+        var fileBytes = Files.readAllBytes(actualFilePath);
         assertThat(fileBytes.length > 0).as("Stored file has content").isTrue();
         checkDetailsHidden(returnedSubmission, true);
     }
@@ -301,7 +305,8 @@ void getSubmissionWithoutAssessment() throws Exception {
         FileUploadSubmission storedSubmission = request.get("/api/exercises/" + releasedFileUploadExercise.getId() + "/file-upload-submission-without-assessment", HttpStatus.OK,
                 FileUploadSubmission.class);
 
-        assertThat(storedSubmission).as("in-time submission was found").isEqualToIgnoringGivenFields(submission, "results", "submissionDate", "fileService");
+        assertThat(storedSubmission).as("in-time submission was found").isEqualToIgnoringGivenFields(submission, "results", "submissionDate", "fileService", "filePathService",
+                "entityFileService");
         assertThat(storedSubmission.getSubmissionDate()).as("submission date is correct").isEqualToIgnoringNanos(submission.getSubmissionDate());
         assertThat(storedSubmission.getLatestResult()).as("result is not set").isNull();
         checkDetailsHidden(storedSubmission, false);
@@ -322,7 +327,8 @@ void getLateSubmissionWithoutAssessment() throws Exception {
         FileUploadSubmission storedSubmission = request.get("/api/exercises/" + releasedFileUploadExercise.getId() + "/file-upload-submission-without-assessment", HttpStatus.OK,
                 FileUploadSubmission.class);
 
-        assertThat(storedSubmission).as("submission was found").isEqualToIgnoringGivenFields(lateSubmission, "result", "submissionDate", "fileService");
+        assertThat(storedSubmission).as("submission was found").isEqualToIgnoringGivenFields(lateSubmission, "result", "submissionDate", "fileService", "filePathService",
+                "entityFileService");
         assertThat(storedSubmission.getLatestResult()).as("result is not set").isNull();
         checkDetailsHidden(storedSubmission, false);
     }
@@ -343,7 +349,8 @@ void testGetLateSubmissionWithoutAssessmentLock() throws Exception {
         FileUploadSubmission storedSubmission = request.get("/api/exercises/" + releasedFileUploadExercise.getId() + "/file-upload-submission-without-assessment?lock=true",
                 HttpStatus.OK, FileUploadSubmission.class);
 
-        assertThat(storedSubmission).as("submission was found").isEqualToIgnoringGivenFields(lateSubmission, "results", "submissionDate", "fileService");
+        assertThat(storedSubmission).as("submission was found").isEqualToIgnoringGivenFields(lateSubmission, "results", "submissionDate", "fileService", "filePathService",
+                "entityFileService");
         assertThat(storedSubmission.getLatestResult()).as("result is set").isNotNull();
         checkDetailsHidden(storedSubmission, false);
     }
@@ -695,12 +702,4 @@ void testOnDeleteSubmission() {
         fileUploadSubmissionRepository.save(submittedFileUploadSubmission);
         assertThatNoException().isThrownBy(() -> submittedFileUploadSubmission.onDelete());
     }
-
-    @Test
-    @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
-    void testOnDeleteSubmissionWithException() {
-        submittedFileUploadSubmission.setFilePath("/api/files/file-upload-exercises");
-        fileUploadSubmissionRepository.save(submittedFileUploadSubmission);
-        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> submittedFileUploadSubmission.onDelete());
-    }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseBitbucketBambooJiraIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseBitbucketBambooJiraIntegrationTest.java
index ef5cf3a90efd..1b94cc3cdf81 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseBitbucketBambooJiraIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/CourseBitbucketBambooJiraIntegrationTest.java
@@ -678,7 +678,7 @@ void testArchiveCourseWithTestModelingAndFileUploadExercises() throws Exception
     void testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportModelingExercise() throws Exception {
         doThrow(new IOException("Error")).when(fileService).writeObjectToJsonFile(any(), any(ObjectMapper.class), any(Path.class));
         courseTestService.testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportModelingExercise();
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), anyLong());
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyLong());
     }
 
     @Test
@@ -687,7 +687,7 @@ void testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportFileUplo
         doThrow(new IOException("Error")).when(fileService).writeObjectToJsonFile(any(), any(ObjectMapper.class), any(Path.class));
         courseTestService.testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportFileUploadExercise();
         // the temp directory should be deleted
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), anyLong());
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyLong());
     }
 
     @Test
@@ -695,7 +695,7 @@ void testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportFileUplo
     void testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportTextExercise() throws Exception {
         doThrow(new IOException("Error")).when(fileService).writeObjectToJsonFile(any(), any(ObjectMapper.class), any(Path.class));
         courseTestService.testArchiveCourseWithTestModelingAndFileUploadExercisesFailToExportTextExercise();
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), anyLong());
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyLong());
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBitbucketBambooIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBitbucketBambooIntegrationTest.java
index 711baa4c219a..e92117ce8a58 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBitbucketBambooIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseBitbucketBambooIntegrationTest.java
@@ -322,7 +322,7 @@ void configureRepository_testBadRequestError() throws Exception {
     void exportInstructorRepositories() throws Exception {
         programmingExerciseTestService.exportInstructorRepositories_shouldReturnFile();
         // we export three repositories (template, solution, tests) and for each repository the temp directory and the directory with the zip file should be deleted
-        verify(fileService, times(6)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(6)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -330,7 +330,7 @@ void exportInstructorRepositories() throws Exception {
     void exportAuxiliaryRepository_shouldReturnFile() throws Exception {
         programmingExerciseTestService.exportInstructorAuxiliaryRepository_shouldReturnFile();
         // once for the temp directory and once for the directory with the zip file
-        verify(fileService, times(2)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(2)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -350,8 +350,8 @@ void exportInstructorRepositories_forbidden() throws Exception {
     void exportProgrammingExerciseInstructorMaterial() throws Exception {
         programmingExerciseTestService.exportProgrammingExerciseInstructorMaterial_shouldReturnFile(true);
         // we have a working directory and one directory for each repository
-        verify(fileService, times(4)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
-        verify(fileService).scheduleForDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(4)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
+        verify(fileService).schedulePathForDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -383,7 +383,7 @@ void importExerciseFromFileMissingExerciseDetailsJson_badRequest() throws Except
     void importExerciseFromFile_exception_directoryDeleted() throws Exception {
         doThrow(new RuntimeException("Error")).when(zipFileService).extractZipFileRecursively(any(Path.class));
         programmingExerciseTestService.importFromFile_exception_DirectoryDeleted();
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -525,7 +525,7 @@ void testExportSolutionRepository_shouldReturnFileOrForbidden() throws Exception
         programmingExerciseTestService.exportSolutionRepository_shouldReturnFileOrForbidden();
         // the test has two successful cases, the other times the operation is forbidden --> one successful case has one repository,
         // the other one has two because the tests repository is also included.
-        verify(fileService, times(3)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(3)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -534,7 +534,7 @@ void testExportExamSolutionRepository_shouldReturnFileOrForbidden() throws Excep
         programmingExerciseTestService.exportExamSolutionRepository_shouldReturnFileOrForbidden();
         // the test has two successful cases, the other times the operation is forbidden --> one successful case has one repository,
         // the other one has two because the tests repository is also included.
-        verify(fileService, times(3)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(3)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
index ce90007f3c9e..4afb801e464e 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseGitlabJenkinsIntegrationTest.java
@@ -205,7 +205,7 @@ void importExerciseFromFile_NoZip_badRequest() throws Exception {
     void importExerciseFromFile_exception_directoryDeleted() throws Exception {
         doThrow(new RuntimeException("Error")).when(zipFileService).extractZipFileRecursively(any(Path.class));
         programmingExerciseTestService.importFromFile_exception_DirectoryDeleted();
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -377,7 +377,7 @@ void configureRepository_testBadRequestError() throws Exception {
     void exportInstructorRepositories() throws Exception {
         programmingExerciseTestService.exportInstructorRepositories_shouldReturnFile();
         // we export three repositories (template, solution, tests) and for each repository the temp directory and the directory with the zip file should be deleted
-        verify(fileService, times(6)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(6)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -385,7 +385,7 @@ void exportInstructorRepositories() throws Exception {
     void exportAuxiliaryRepository_shouldReturnFile() throws Exception {
         programmingExerciseTestService.exportInstructorAuxiliaryRepository_shouldReturnFile();
         // once for the temp directory and once for the directory with the zip file
-        verify(fileService, times(2)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(2)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -405,8 +405,8 @@ void exportInstructorRepositories_forbidden() throws Exception {
     void exportProgrammingExerciseInstructorMaterial() throws Exception {
         programmingExerciseTestService.exportProgrammingExerciseInstructorMaterial_shouldReturnFile(true);
         // we have a working directory and one directory for each repository
-        verify(fileService, times(4)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
-        verify(fileService).scheduleForDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(4)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
+        verify(fileService).schedulePathForDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -508,7 +508,7 @@ void testExportSolutionRepository_shouldReturnFileOrForbidden() throws Exception
         programmingExerciseTestService.exportSolutionRepository_shouldReturnFileOrForbidden();
         // the test has two successful cases, the other times the operation is forbidden --> one successful case has one repository,
         // the other one has two because the tests repository is also included.
-        verify(fileService, times(3)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(3)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
@@ -517,7 +517,7 @@ void testExportExamSolutionRepository_shouldReturnFileOrForbidden() throws Excep
         programmingExerciseTestService.exportExamSolutionRepository_shouldReturnFileOrForbidden();
         // the test has two successful cases, the other times the operation is forbidden --> one successful case has one repository,
         // the other one has two because the tests repository is also included.
-        verify(fileService, times(3)).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService, times(3)).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     // TODO: add startProgrammingExerciseStudentSubmissionFailedWithBuildlog & copyRepository_testConflictError
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationBambooBitbucketJiraTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationBambooBitbucketJiraTest.java
index ef68076801af..d4eb0920f74a 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationBambooBitbucketJiraTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationBambooBitbucketJiraTest.java
@@ -809,8 +809,8 @@ void testCheckPlagiarism() throws Exception {
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void testCheckPlagiarismJplagReport() throws Exception {
         programmingExerciseIntegrationTestService.testCheckPlagiarismJplagReport();
-        verify(fileService).scheduleForDeletion(any(Path.class), eq(1L));
-        verify(fileService).scheduleForDirectoryDeletion(any(Path.class), eq(5L));
+        verify(fileService).schedulePathForDeletion(any(Path.class), eq(1L));
+        verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(5L));
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java
index fb1caea3f17a..70b9c8fd60ef 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseIntegrationTestService.java
@@ -1773,11 +1773,11 @@ private int calculateMagicNumber() {
 
         Files.createDirectories(jPlagReposDir.resolve(projectKey));
         Path file1 = Files.createFile(jPlagReposDir.resolve(projectKey).resolve("Submission-1.java"));
-        Files.writeString(file1, exampleProgram);
+        FileUtils.writeStringToFile(file1.toFile(), exampleProgram, StandardCharsets.UTF_8);
         Path file2 = Files.createFile(jPlagReposDir.resolve(projectKey).resolve("Submission-2.java"));
-        Files.writeString(file2, exampleProgram);
+        FileUtils.writeStringToFile(file2.toFile(), exampleProgram, StandardCharsets.UTF_8);
 
-        doReturn(jPlagReposDir).when(fileService).getTemporaryUniquePath(any(Path.class), eq(60L));
+        doReturn(jPlagReposDir).when(fileService).getTemporaryUniqueSubfolderPath(any(Path.class), eq(60L));
         doReturn(null).when(urlService).getRepositorySlugFromRepositoryUrl(any());
 
         var repository1 = gitService.getExistingCheckedOutRepositoryByLocalPath(localRepoFile.toPath(), null);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java
index 7b1798763457..6b546e374c79 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseScheduleServiceTest.java
@@ -109,6 +109,7 @@ void init() throws Exception {
     void tearDown() throws Exception {
         scheduleService.clearAllTasks();
         gitlabRequestMockProvider.reset();
+        studentRepository.resetLocalRepo();
     }
 
     private void verifyLockStudentRepositoryAndParticipationOperation(boolean wasCalled, long timeoutInMs) {
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java
index 38d22ca050d9..e8d86320e8f4 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTemplateIntegrationTest.java
@@ -13,6 +13,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.commons.io.FileUtils;
 import org.apache.maven.plugin.surefire.log.api.PrintStreamLogger;
 import org.apache.maven.plugins.surefire.report.ReportTestCase;
 import org.apache.maven.plugins.surefire.report.ReportTestSuite;
@@ -258,7 +259,7 @@ private void moveAssignmentSourcesOf(LocalRepository localRepository) throws IOE
         Path sourceSrc = localRepository.localRepoFile.toPath().resolve("src");
         Path assignment = testRepo.localRepoFile.toPath().resolve("assignment");
         Files.createDirectories(assignment);
-        Files.move(sourceSrc, assignment.resolve("src"));
+        FileUtils.moveDirectory(sourceSrc.toFile(), assignment.resolve("src").toFile());
     }
 
     private Map<TestResult, Integer> readTestReports(String testResultPath) {
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java
index 90b0c1e52785..5a416432e9c4 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/ProgrammingExerciseTestService.java
@@ -24,6 +24,7 @@
 
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.io.FileUtils;
 import org.awaitility.Awaitility;
 import org.eclipse.jgit.api.Git;
 import org.eclipse.jgit.api.errors.CanceledException;
@@ -490,8 +491,8 @@ void importFromFile_validExercise_isSuccessfullyImported(ProgrammingLanguage lan
     void importFromFile_embeddedFiles_embeddedFilesCopied() throws Exception {
         String embeddedFileName1 = "Markdown_2023-05-06T16-17-46-410_ad323711.jpg";
         String embeddedFileName2 = "Markdown_2023-05-06T16-17-46-822_b921f475.jpg";
-        Path fileSystemPathEmbeddedFile1 = Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName1);
-        Path fileSystemPathEmbeddedFile2 = Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName2);
+        Path fileSystemPathEmbeddedFile1 = FilePathService.getMarkdownFilePath().resolve(embeddedFileName1);
+        Path fileSystemPathEmbeddedFile2 = FilePathService.getMarkdownFilePath().resolve(embeddedFileName2);
         // clean up to make sure the test doesn't pass because it has passed previously
         if (Files.exists(fileSystemPathEmbeddedFile1)) {
             Files.delete(fileSystemPathEmbeddedFile1);
@@ -507,7 +508,7 @@ void importFromFile_embeddedFiles_embeddedFilesCopied() throws Exception {
 
         request.postWithMultipartFile(ROOT + "/courses/" + course.getId() + "/programming-exercises/import-from-file", exercise, "programmingExercise", file,
                 ProgrammingExercise.class, HttpStatus.OK);
-        assertThat(Path.of(FilePathService.getMarkdownFilePath())).isDirectoryContaining(path -> embeddedFileName1.equals(path.getFileName().toString()))
+        assertThat(FilePathService.getMarkdownFilePath()).isDirectoryContaining(path -> embeddedFileName1.equals(path.getFileName().toString()))
                 .isDirectoryContaining(path -> embeddedFileName2.equals(path.getFileName().toString()));
 
     }
@@ -1391,8 +1392,8 @@ void exportProgrammingExerciseInstructorMaterial_shouldReturnFile(boolean saveEm
         String embeddedFileName1 = "Markdown_2023-05-06T16-17-46-410_ad323711.jpg";
         String embeddedFileName2 = "Markdown_2023-05-06T16-17-46-822_b921f475.jpg";
         // delete the files to not only make a test pass because a previous test run succeeded
-        Path embeddedFilePath1 = Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName1);
-        Path embeddedFilePath2 = Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName2);
+        Path embeddedFilePath1 = FilePathService.getMarkdownFilePath().resolve(embeddedFileName1);
+        Path embeddedFilePath2 = FilePathService.getMarkdownFilePath().resolve(embeddedFileName2);
         if (Files.exists(embeddedFilePath1)) {
             Files.delete(embeddedFilePath1);
         }
@@ -1497,10 +1498,10 @@ private void generateProgrammingExerciseForExport(boolean saveEmbeddedFiles) thr
                 <img src="/api/files/markdown/%s" width="400">
                 """, embeddedFileName1, embeddedFileName2));
         if (saveEmbeddedFiles) {
-            Files.write(Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName1),
-                    new ClassPathResource("test-data/repository-export/" + embeddedFileName1).getInputStream().readAllBytes());
-            Files.write(Path.of(FilePathService.getMarkdownFilePath(), embeddedFileName2),
-                    new ClassPathResource("test-data/repository-export/" + embeddedFileName2).getInputStream().readAllBytes());
+            FileUtils.copyToFile(new ClassPathResource("test-data/repository-export/" + embeddedFileName1).getInputStream(),
+                    FilePathService.getMarkdownFilePath().resolve(embeddedFileName1).toFile());
+            FileUtils.copyToFile(new ClassPathResource("test-data/repository-export/" + embeddedFileName2).getInputStream(),
+                    FilePathService.getMarkdownFilePath().resolve(embeddedFileName2).toFile());
         }
         exercise = programmingExerciseRepository.save(exercise);
         exercise = programmingExerciseUtilService.addTemplateParticipationForProgrammingExercise(exercise);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java
index f2f2f9cc0494..23c82edaeec6 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/programmingexercise/RepositoryIntegrationTest.java
@@ -136,6 +136,8 @@ class RepositoryIntegrationTest extends AbstractSpringIntegrationBambooBitbucket
 
     private final LocalRepository studentRepository = new LocalRepository(defaultBranch);
 
+    private LocalRepository templateRepository;
+
     private final List<BuildLogEntry> logs = new ArrayList<>();
 
     private final BuildLogEntry buildLogEntry = new BuildLogEntry(ZonedDateTime.now(), "Checkout to revision e65aa77cc0380aeb9567ccceb78aca416d86085b has failed.");
@@ -184,7 +186,7 @@ void setup() throws Exception {
         programmingExercise.setTestRepositoryUrl(localRepoUrl.toString());
 
         // Create template repo
-        LocalRepository templateRepository = new LocalRepository(defaultBranch);
+        templateRepository = new LocalRepository(defaultBranch);
         templateRepository.configureRepos("templateLocalRepo", "templateOriginRepo");
 
         // add file to the template repo folder
@@ -240,6 +242,7 @@ void setup() throws Exception {
     void tearDown() throws IOException {
         reset(gitService);
         studentRepository.resetLocalRepo();
+        templateRepository.resetLocalRepo();
     }
 
     @Test
@@ -631,6 +634,7 @@ void testSaveFilesAfterDueDateAsInstructor() throws Exception {
                 .getOrCheckoutRepository(instructorAssignmentParticipation.getVcsRepositoryUrl(), true, defaultBranch);
 
         request.put(studentRepoBaseUrl + instructorAssignmentParticipation.getId() + "/files?commit=true", List.of(), HttpStatus.OK);
+        instructorAssignmentRepository.resetLocalRepo();
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java b/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java
index 3d542fa3e9d4..2b6fe03b6a68 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseFactory.java
@@ -1,7 +1,9 @@
 package de.tum.in.www1.artemis.exercise.quizexercise;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
 
+import java.io.IOException;
 import java.time.ZonedDateTime;
 import java.util.Set;
 import java.util.UUID;
@@ -9,6 +11,9 @@
 
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.io.FileUtils;
+import org.springframework.util.ResourceUtils;
+
 import de.tum.in.www1.artemis.domain.Course;
 import de.tum.in.www1.artemis.domain.enumeration.QuizMode;
 import de.tum.in.www1.artemis.domain.enumeration.ScoringType;
@@ -16,6 +21,7 @@
 import de.tum.in.www1.artemis.domain.quiz.*;
 import de.tum.in.www1.artemis.exercise.ExerciseFactory;
 import de.tum.in.www1.artemis.participation.ParticipationFactory;
+import de.tum.in.www1.artemis.service.FilePathService;
 
 /**
  * Factory for creating QuizExercises and related objects.
@@ -354,6 +360,13 @@ public static DragAndDropQuestion createDragAndDropQuestionWithAllTypesOfMapping
         dragItem3.setTempID(generateTempId());
         var dragItem4 = new DragItem().text("invalid drag item");
         dragItem4.setTempID(generateTempId());
+        try {
+            FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/attachment/placeholder.jpg"),
+                    FilePathService.getDragItemFilePath().resolve("10").resolve("drag_item.jpg").toFile());
+        }
+        catch (IOException ex) {
+            fail("Failed while copying test attachment files", ex);
+        }
         var dragItem5 = new DragItem().pictureFilePath("/api/files/drag-and-drop/drag-items/10/drag_item.jpg");
         dragItem4.setInvalid(true);
         dnd.addDragItem(dragItem1);
diff --git a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java b/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java
index 7d8efd6bf47b..909215386516 100644
--- a/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/exercise/quizexercise/QuizExerciseUtilService.java
@@ -4,16 +4,16 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.time.ZonedDateTime;
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.validation.constraints.NotNull;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ResourceUtils;
 
 import de.tum.in.www1.artemis.course.CourseFactory;
 import de.tum.in.www1.artemis.course.CourseUtilService;
@@ -290,16 +290,16 @@ public QuizSubmission addQuizExerciseToCourseWithParticipationAndSubmissionForUs
 
         var submittedDragAndDropAnswer = new DragAndDropSubmittedAnswer();
         DragAndDropQuestion dragAndDropQuestion = (DragAndDropQuestion) (quizExercise.getQuizQuestions().get(1));
-        var backgroundPathInFileSystem = Path.of(FilePathService.getDragAndDropBackgroundFilePath(), "drag_and_drop_background.jpg");
-        var dragItemPathInFileSystem = Path.of(FilePathService.getDragItemFilePath(), "drag_item.jpg");
+        var backgroundPathInFileSystem = FilePathService.getDragAndDropBackgroundFilePath().resolve("drag_and_drop_background.jpg");
+        var dragItemPathInFileSystem = FilePathService.getDragItemFilePath().resolve("drag_item.jpg");
         if (Files.exists(backgroundPathInFileSystem)) {
             Files.delete(backgroundPathInFileSystem);
         }
         if (Files.exists(dragItemPathInFileSystem)) {
             Files.delete(dragItemPathInFileSystem);
         }
-        Files.copy(new ClassPathResource("test-data/data-export/drag_and_drop_background.jpg").getInputStream(), backgroundPathInFileSystem);
-        Files.copy(new ClassPathResource("test-data/data-export/drag_item.jpg").getInputStream(), dragItemPathInFileSystem);
+        FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/data-export/drag_and_drop_background.jpg"), backgroundPathInFileSystem.toFile());
+        FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/data-export/drag_item.jpg"), dragItemPathInFileSystem.toFile());
         dragAndDropQuestion.setBackgroundFilePath("/api/files/drag-and-drop/backgrounds/3/drag_and_drop_background.jpg");
         submittedDragAndDropAnswer.setQuizQuestion(dragAndDropQuestion);
         dragAndDropQuestion.setExercise(quizExercise);
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
index 6d8250aa7c6d..a7a069d4b7a0 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportIntegrationTest.java
@@ -2,6 +2,7 @@
 
 import java.time.ZonedDateTime;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,6 +54,12 @@ void initTestCase() throws Exception {
         exercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now().minusDays(1), ZonedDateTime.now().plusDays(7), course);
     }
 
+    @AfterEach
+    void cleanup() throws Exception {
+        solutionRepo.resetLocalRepo();
+        templateRepo.resetLocalRepo();
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
     void getGitDiffAsAStudent() throws Exception {
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
index 459253e1f85b..c54eb20f1c49 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/ProgrammingExerciseGitDiffReportServiceTest.java
@@ -2,9 +2,11 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Comparator;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,6 +69,12 @@ void initTestCase() {
         exercise = exerciseUtilService.getFirstExerciseWithType(course, ProgrammingExercise.class);
     }
 
+    @AfterEach
+    void cleanup() throws IOException {
+        templateRepo.resetLocalRepo();
+        solutionRepo.resetLocalRepo();
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void updateGitDiffNoChanges() throws Exception {
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
index 8fd23c42138f..d82424a3d18f 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/StructuralTestCaseServiceTest.java
@@ -3,8 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
+import java.io.IOException;
 import java.time.ZonedDateTime;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -61,6 +63,12 @@ void initTestCase() {
         exercise = ProgrammingExerciseFactory.generateProgrammingExercise(ZonedDateTime.now().minusDays(1), ZonedDateTime.now().plusDays(7), course);
     }
 
+    @AfterEach
+    void cleanup() throws IOException {
+        solutionRepo.resetLocalRepo();
+        testRepo.resetLocalRepo();
+    }
+
     private void addTestCaseToExercise(String name) {
         var testCase = new ProgrammingExerciseTestCase();
         testCase.setTestName(name);
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
index 9b62ede865ba..59aa9be00e27 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/TestwiseCoverageReportServiceTest.java
@@ -2,9 +2,11 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -80,6 +82,11 @@ void setup() throws Exception {
         programmingExercise = programmingExerciseRepository.findByIdElseThrow(programmingExercise.getId());
     }
 
+    @AfterEach
+    void cleanup() throws IOException {
+        solutionRepo.resetLocalRepo();
+    }
+
     @Test
     @WithMockUser(username = TEST_PREFIX + "instructor1", roles = "INSTRUCTOR")
     void shouldCreateFullTestwiseCoverageReport() {
diff --git a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java b/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
index fcd475bebb72..4eece5351289 100644
--- a/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/hestia/behavioral/BehavioralTestCaseServiceTest.java
@@ -2,8 +2,10 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
 import java.util.HashSet;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +20,6 @@
 import de.tum.in.www1.artemis.domain.hestia.*;
 import de.tum.in.www1.artemis.exercise.ExerciseUtilService;
 import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
-import de.tum.in.www1.artemis.repository.ProgrammingExerciseRepository;
 import de.tum.in.www1.artemis.repository.ProgrammingExerciseTestCaseRepository;
 import de.tum.in.www1.artemis.repository.SolutionProgrammingExerciseParticipationRepository;
 import de.tum.in.www1.artemis.repository.hestia.*;
@@ -42,9 +43,6 @@ class BehavioralTestCaseServiceTest extends AbstractSpringIntegrationBambooBitbu
     @Autowired
     private ProgrammingExerciseTestCaseRepository testCaseRepository;
 
-    @Autowired
-    private ProgrammingExerciseRepository programmingExerciseRepository;
-
     @Autowired
     private ProgrammingExerciseGitDiffReportRepository programmingExerciseGitDiffReportRepository;
 
@@ -72,13 +70,18 @@ class BehavioralTestCaseServiceTest extends AbstractSpringIntegrationBambooBitbu
     private ProgrammingExercise exercise;
 
     @BeforeEach
-    void initTestCase() throws Exception {
+    void initTestCase() {
         userUtilService.addUsers(TEST_PREFIX, 0, 0, 0, 1);
         final Course course = programmingExerciseUtilService.addCourseWithOneProgrammingExercise(false, true, ProgrammingLanguage.JAVA);
         exercise = exerciseUtilService.getFirstExerciseWithType(course, ProgrammingExercise.class);
         exercise.setTestwiseCoverageEnabled(true);
     }
 
+    @AfterEach
+    void cleanup() throws IOException {
+        solutionRepo.resetLocalRepo();
+    }
+
     private ProgrammingExerciseTestCase addTestCaseToExercise(String name) {
         var testCase = new ProgrammingExerciseTestCase();
         testCase.setTestName(name);
diff --git a/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java
index 489f56518344..6ce1fea32261 100644
--- a/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/iris/IrisMessageIntegrationTest.java
@@ -51,6 +51,8 @@ class IrisMessageIntegrationTest extends AbstractIrisIntegrationTest {
 
     private ProgrammingExercise exercise;
 
+    private LocalRepository repository;
+
     @BeforeEach
     void initTestCase() {
         userUtilService.addUsers(TEST_PREFIX, 2, 0, 0, 0);
@@ -59,6 +61,7 @@ void initTestCase() {
         exercise = exerciseUtilService.getFirstExerciseWithType(course, ProgrammingExercise.class);
         activateIrisFor(course);
         activateIrisFor(exercise);
+        repository = new LocalRepository("main");
     }
 
     @Test
@@ -69,9 +72,9 @@ void sendOneMessage() throws Exception {
         messageToSend.setMessageDifferentiator(1453);
 
         irisRequestMockProvider.mockMessageResponse("Hello World");
-        var savedExercise = irisUtilTestService.setupTemplate(exercise, new LocalRepository("main"));
+        var savedExercise = irisUtilTestService.setupTemplate(exercise, repository);
         var exerciseParticipation = participationUtilService.addStudentParticipationForProgrammingExercise(savedExercise, TEST_PREFIX + "student1");
-        irisUtilTestService.setupStudentParticipation(exerciseParticipation, new LocalRepository("main"));
+        irisUtilTestService.setupStudentParticipation(exerciseParticipation, repository);
         activateIrisFor(savedExercise);
 
         var irisMessage = request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, IrisMessage.class, HttpStatus.CREATED);
@@ -113,9 +116,9 @@ void sendTwoMessages() throws Exception {
         var irisSession = irisSessionService.createChatSessionForProgrammingExercise(exercise, userUtilService.getUserByLogin(TEST_PREFIX + "student1"));
         IrisMessage messageToSend1 = createDefaultMockMessage(irisSession);
 
-        var savedExercise = irisUtilTestService.setupTemplate(exercise, new LocalRepository("main"));
+        var savedExercise = irisUtilTestService.setupTemplate(exercise, repository);
         var exerciseParticipation = participationUtilService.addStudentParticipationForProgrammingExercise(savedExercise, TEST_PREFIX + "student1");
-        irisUtilTestService.setupStudentParticipation(exerciseParticipation, new LocalRepository("main"));
+        irisUtilTestService.setupStudentParticipation(exerciseParticipation, repository);
         activateIrisFor(savedExercise);
 
         var irisMessage1 = request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend1, IrisMessage.class, HttpStatus.CREATED);
@@ -237,9 +240,9 @@ void sendOneMessageBadRequest() throws Exception {
         IrisMessage messageToSend = createDefaultMockMessage(irisSession);
 
         irisRequestMockProvider.mockMessageError();
-        var savedExercise = irisUtilTestService.setupTemplate(exercise, new LocalRepository("main"));
+        var savedExercise = irisUtilTestService.setupTemplate(exercise, repository);
         var exerciseParticipation = participationUtilService.addStudentParticipationForProgrammingExercise(savedExercise, TEST_PREFIX + "student1");
-        irisUtilTestService.setupStudentParticipation(exerciseParticipation, new LocalRepository("main"));
+        irisUtilTestService.setupStudentParticipation(exerciseParticipation, repository);
         activateIrisFor(savedExercise);
 
         request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, IrisMessage.class, HttpStatus.CREATED);
@@ -256,9 +259,9 @@ void sendOneMessageEmptyBody() throws Exception {
         IrisMessage messageToSend = createDefaultMockMessage(irisSession);
 
         irisRequestMockProvider.mockMessageResponse(null);
-        var savedExercise = irisUtilTestService.setupTemplate(exercise, new LocalRepository("main"));
+        var savedExercise = irisUtilTestService.setupTemplate(exercise, repository);
         var exerciseParticipation = participationUtilService.addStudentParticipationForProgrammingExercise(savedExercise, TEST_PREFIX + "student1");
-        irisUtilTestService.setupStudentParticipation(exerciseParticipation, new LocalRepository("main"));
+        irisUtilTestService.setupStudentParticipation(exerciseParticipation, repository);
         activateIrisFor(savedExercise);
 
         request.postWithResponseBody("/api/iris/sessions/" + irisSession.getId() + "/messages", messageToSend, IrisMessage.class, HttpStatus.CREATED);
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
index a6f24a17fd88..3cbe1a819a11 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentResourceIntegrationTest.java
@@ -54,7 +54,7 @@ void initTestCase() {
         userUtilService.addUsers(TEST_PREFIX, 0, 1, 0, 1);
 
         attachment = LectureFactory.generateAttachment(null);
-        attachment.setLink("files/temp/example.txt");
+        attachment.setLink("/api/files/temp/example.txt");
 
         var course = textExerciseUtilService.addCourseWithOneReleasedTextExercise();
         textExercise = exerciseUtilService.getFirstExerciseWithType(course, TextExercise.class);
@@ -96,7 +96,8 @@ void updateAttachment(boolean fileUpdate) throws Exception {
         var expectedAttachment = attachmentRepository.findById(actualAttachment.getId()).orElseThrow();
 
         assertThat(actualAttachment.getName()).isEqualTo("new name");
-        var ignoringFields = new String[] { "name", "fileService", "prevLink", "lecture.lectureUnits", "lecture.posts", "lecture.course", "lecture.attachments" };
+        var ignoringFields = new String[] { "name", "fileService", "filePathService", "entityFileService", "prevLink", "lecture.lectureUnits", "lecture.posts", "lecture.course",
+                "lecture.attachments" };
         assertThat(actualAttachment).usingRecursiveComparison().ignoringFields(ignoringFields).isEqualTo(expectedAttachment);
         verify(groupNotificationService).notifyStudentGroupAboutAttachmentChange(actualAttachment, notificationText);
     }
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java
index b4c95f36f5af..859e98c44c64 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/AttachmentUnitIntegrationTest.java
@@ -76,7 +76,7 @@ void initTestCase() {
         userUtilService.addUsers(TEST_PREFIX, 1, 1, 0, 1);
         this.attachment = LectureFactory.generateAttachment(null);
         this.attachment.setName("          LoremIpsum              ");
-        this.attachment.setLink("files/temp/example.txt");
+        this.attachment.setLink("/api/files/temp/example.txt");
         this.lecture1 = lectureUtilService.createCourseWithLecture(true);
         this.attachmentUnit = new AttachmentUnit();
         this.attachmentUnit.setDescription("Lorem Ipsum");
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LearningPathIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/LearningPathIntegrationTest.java
index e478eb07629c..c2bab0712b0e 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/LearningPathIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/LearningPathIntegrationTest.java
@@ -402,4 +402,54 @@ void testUpdateLearningPathProgress() throws Exception {
     void testGetHealthStatusForCourse() throws Exception {
         request.get("/api/courses/" + course.getId() + "/learning-path-health", HttpStatus.OK, LearningPathHealthDTO.class);
     }
+
+    @Test
+    @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER")
+    void testGetLearningPathNgxGraphForLearningPathsDisabled() throws Exception {
+        course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course);
+        final var student = userRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow();
+        final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId());
+        course.setLearningPathsEnabled(false);
+        courseRepository.save(course);
+        request.get("/api/learning-path/" + learningPath.getId() + "/graph", HttpStatus.BAD_REQUEST, NgxLearningPathDTO.class);
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student2", roles = "USER")
+    void testGetLearningPathNgxGraphForOtherStudent() throws Exception {
+        course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course);
+        final var student = userRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow();
+        final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId());
+        request.get("/api/learning-path/" + learningPath.getId() + "/graph", HttpStatus.FORBIDDEN, NgxLearningPathDTO.class);
+    }
+
+    /**
+     * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest.
+     *
+     * @throws Exception the request failed
+     * @see de.tum.in.www1.artemis.service.LearningPathServiceTest
+     */
+    @Test
+    @WithMockUser(username = STUDENT_OF_COURSE, roles = "USER")
+    void testGetLearningPathNgxGraphAsStudent() throws Exception {
+        course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course);
+        final var student = userRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow();
+        final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId());
+        request.get("/api/learning-path/" + learningPath.getId() + "/graph", HttpStatus.OK, NgxLearningPathDTO.class);
+    }
+
+    /**
+     * This only tests if the end point successfully retrieves the graph representation. The correctness of the response is tested in LearningPathServiceTest.
+     *
+     * @throws Exception the request failed
+     * @see de.tum.in.www1.artemis.service.LearningPathServiceTest
+     */
+    @Test
+    @WithMockUser(username = INSTRUCTOR_OF_COURSE, roles = "INSTRUCTOR")
+    void testGetLearningPathNgxGraphAsInstructor() throws Exception {
+        course = learningPathUtilService.enableAndGenerateLearningPathsForCourse(course);
+        final var student = userRepository.findOneByLogin(STUDENT_OF_COURSE).orElseThrow();
+        final var learningPath = learningPathRepository.findByCourseIdAndUserIdElseThrow(course.getId(), student.getId());
+        request.get("/api/learning-path/" + learningPath.getId() + "/graph", HttpStatus.OK, NgxLearningPathDTO.class);
+    }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java b/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java
index 378f795052c9..b61e4a6e5c6d 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/LectureFactory.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.fail;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.time.ZonedDateTime;
@@ -79,7 +78,7 @@ public static Attachment generateAttachmentWithFile(ZonedDateTime startDate) {
         Attachment attachment = generateAttachment(startDate);
         String testFileName = "test_" + UUID.randomUUID().toString().substring(0, 8) + ".jpg";
         try {
-            FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/attachment/placeholder.jpg"), new File(FilePathService.getTempFilePath(), testFileName));
+            FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/attachment/placeholder.jpg"), FilePathService.getTempFilePath().resolve(testFileName).toFile());
         }
         catch (IOException ex) {
             fail("Failed while copying test attachment files", ex);
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java
index 54ac8d761e72..39c7bad09090 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/LectureIntegrationTest.java
@@ -105,7 +105,7 @@ void initTestCase() throws Exception {
 
     private void addAttachmentToLecture() {
         this.attachmentDirectOfLecture = LectureFactory.generateAttachment(null);
-        this.attachmentDirectOfLecture.setLink("files/temp/example2.txt");
+        this.attachmentDirectOfLecture.setLink("/api/files/temp/example2.txt");
         this.attachmentDirectOfLecture.setLecture(this.lecture1);
         this.attachmentDirectOfLecture = attachmentRepository.save(this.attachmentDirectOfLecture);
         this.lecture1.addAttachments(this.attachmentDirectOfLecture);
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java
index b1784948c5d5..4a89a196cbdd 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/LectureUnitIntegrationTest.java
@@ -21,6 +21,7 @@
 import de.tum.in.www1.artemis.domain.lecture.*;
 import de.tum.in.www1.artemis.repository.*;
 import de.tum.in.www1.artemis.user.UserUtilService;
+import de.tum.in.www1.artemis.web.rest.dto.lectureunit.LectureUnitForLearningPathNodeDetailsDTO;
 
 class LectureUnitIntegrationTest extends AbstractSpringIntegrationIndependentTest {
 
@@ -275,4 +276,16 @@ void setLectureUnitCompletion_shouldReturnForbidden() throws Exception {
                 HttpStatus.FORBIDDEN, null);
     }
 
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student1", roles = "USER")
+    void testGetLectureUnitForLearningPathNodeDetailsAsStudentOfCourse() throws Exception {
+        final var result = request.get("/api/lecture-units/" + textUnit.getId() + "/for-learning-path-node-details", HttpStatus.OK, LectureUnitForLearningPathNodeDetailsDTO.class);
+        assertThat(result).isEqualTo(LectureUnitForLearningPathNodeDetailsDTO.of(textUnit));
+    }
+
+    @Test
+    @WithMockUser(username = TEST_PREFIX + "student42", roles = "USER")
+    void testGetLectureUnitForLearningPathNodeDetailsAsStudentNotInCourse() throws Exception {
+        request.get("/api/lecture-units/" + textUnit.getId() + "/for-learning-path-node-details", HttpStatus.FORBIDDEN, LectureUnitForLearningPathNodeDetailsDTO.class);
+    }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java b/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java
index 7d17446b858f..95160ce2893e 100644
--- a/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/lecture/LectureUtilService.java
@@ -1,10 +1,15 @@
 package de.tum.in.www1.artemis.lecture;
 
+import static org.assertj.core.api.Assertions.fail;
+
+import java.io.IOException;
 import java.time.ZonedDateTime;
 import java.util.*;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ResourceUtils;
 
 import de.tum.in.www1.artemis.course.CourseFactory;
 import de.tum.in.www1.artemis.course.CourseUtilService;
@@ -15,6 +20,7 @@
 import de.tum.in.www1.artemis.post.ConversationFactory;
 import de.tum.in.www1.artemis.repository.*;
 import de.tum.in.www1.artemis.repository.metis.conversation.ConversationRepository;
+import de.tum.in.www1.artemis.service.FilePathService;
 
 /**
  * Service responsible for initializing the database with specific testdata related to lectures for use in integration tests.
@@ -157,7 +163,14 @@ public AttachmentUnit createAttachmentUnitWithSlides(int numberOfSlides) {
         for (int i = 1; i <= numberOfSlides; i++) {
             Slide slide = new Slide();
             slide.setSlideNumber(i);
-            slide.setSlideImagePath("path/to/slide" + i + ".png");
+            String testFileName = "slide" + i + ".png";
+            try {
+                FileUtils.copyFile(ResourceUtils.getFile("classpath:test-data/attachment/placeholder.jpg"), FilePathService.getTempFilePath().resolve(testFileName).toFile());
+            }
+            catch (IOException ex) {
+                fail("Failed while copying test attachment files", ex);
+            }
+            slide.setSlideImagePath("/api/files/temp/" + testFileName);
             slide.setAttachmentUnit(attachmentUnit);
             slideRepository.save(slide);
         }
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java
index 6d91ed555d30..658901c776d0 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCIntegrationTest.java
@@ -86,8 +86,7 @@ void testFetchPush_repositoryDoesNotExist() throws IOException, GitAPIException,
         localVCLocalCITestService.testPushReturnsError(someRepository.localGit, student1Login, projectKey, repositorySlug, NOT_FOUND);
 
         // Cleanup
-        someRepository.localGit.close();
-        FileUtils.deleteDirectory(someRepository.localRepoFile);
+        someRepository.resetLocalRepo();
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
index 2b763da0c2fc..059efcea2e4b 100644
--- a/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/localvcci/LocalVCLocalCIIntegrationTest.java
@@ -369,6 +369,7 @@ void testFetch_studentAssignmentRepository_teamMode_afterDueDate() throws Except
         // Instructor should be able to read and write.
         localVCLocalCITestService.testFetchSuccessful(teamLocalRepository.localGit, instructor1Login, projectKey1, teamRepositorySlug);
         localVCLocalCITestService.testPushSuccessful(teamLocalRepository.localGit, instructor1Login, projectKey1, teamRepositorySlug);
+        teamLocalRepository.resetLocalRepo();
     }
 
     private LocalRepository prepareTeamExerciseAndRepository() throws GitAPIException, IOException, URISyntaxException {
diff --git a/src/test/java/de/tum/in/www1/artemis/metis/PostIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/metis/PostIntegrationTest.java
index 69adb8b71b78..2565bbae5729 100644
--- a/src/test/java/de/tum/in/www1/artemis/metis/PostIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/metis/PostIntegrationTest.java
@@ -7,10 +7,8 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import javax.mail.internet.MimeMessage;
+import javax.validation.*;
 import javax.validation.constraints.NotNull;
 
 import org.junit.jupiter.api.AfterEach;
@@ -25,18 +23,12 @@
 import org.springframework.util.MultiValueMap;
 
 import de.tum.in.www1.artemis.AbstractSpringIntegrationLocalCILocalVCTest;
-import de.tum.in.www1.artemis.domain.Course;
-import de.tum.in.www1.artemis.domain.Exercise;
-import de.tum.in.www1.artemis.domain.Lecture;
-import de.tum.in.www1.artemis.domain.User;
+import de.tum.in.www1.artemis.domain.*;
 import de.tum.in.www1.artemis.domain.enumeration.CourseInformationSharingConfiguration;
 import de.tum.in.www1.artemis.domain.enumeration.DisplayPriority;
 import de.tum.in.www1.artemis.domain.enumeration.SortingOrder;
 import de.tum.in.www1.artemis.domain.exam.Exam;
-import de.tum.in.www1.artemis.domain.metis.CourseWideContext;
-import de.tum.in.www1.artemis.domain.metis.Post;
-import de.tum.in.www1.artemis.domain.metis.PostSortCriterion;
-import de.tum.in.www1.artemis.domain.metis.UserRole;
+import de.tum.in.www1.artemis.domain.metis.*;
 import de.tum.in.www1.artemis.domain.plagiarism.PlagiarismCase;
 import de.tum.in.www1.artemis.exam.ExamUtilService;
 import de.tum.in.www1.artemis.post.ConversationUtilService;
@@ -303,9 +295,10 @@ void testCreateAnnouncement() throws Exception {
         postToSave.setDisplayPriority(DisplayPriority.PINNED);
         checkCreatedPost(postToSave, createdPost);
 
-        List<Post> updatedCourseWidePosts = postRepository.findPosts(postContextFilter, null, false, null).stream().filter(post -> post.getCourseWideContext() != null).toList();
+        postRepository.findPosts(postContextFilter, null, false, null).stream().filter(post -> post.getCourseWideContext() != null).toList();
         assertThat(postRepository.findPosts(postContextFilter, null, false, null)).hasSize(numberOfPostsBefore + 1);
         verify(groupNotificationService).notifyAllGroupsAboutNewAnnouncement(createdPost, course);
+        verify(javaMailSender, timeout(4000).times(4)).send(any(MimeMessage.class));
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
index 4b8faf9363eb..4a3a054f64cc 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/ParticipationIntegrationTest.java
@@ -368,6 +368,7 @@ private void prepareMocksForProgrammingExercise(String userLogin, boolean practi
         var repo = new LocalRepository(defaultBranch);
         repo.configureRepos("studentRepo", "studentOriginRepo");
         programmingExerciseTestService.setupRepositoryMocksParticipant(programmingExercise, userLogin, repo, practiceMode);
+        repo.resetLocalRepo();
     }
 
     @Test
@@ -487,6 +488,7 @@ void requestFeedbackScoreNotFull() throws Exception {
 
         request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/request-feedback", null, ProgrammingExerciseStudentParticipation.class,
                 HttpStatus.BAD_REQUEST);
+        localRepo.resetLocalRepo();
     }
 
     @Test
@@ -542,6 +544,7 @@ void requestFeedbackSuccess() throws Exception {
         assertThat(response.getIndividualDueDate()).isNotNull().isBefore(ZonedDateTime.now());
 
         verify(programmingExerciseParticipationService).lockStudentRepositoryAndParticipation(programmingExercise, participation);
+        localRepo.resetLocalRepo();
     }
 
     @Test
@@ -557,6 +560,7 @@ void resumeProgrammingExerciseParticipation() throws Exception {
         var updatedParticipation = request.putWithResponseBody("/api/exercises/" + programmingExercise.getId() + "/resume-programming-participation/" + participation.getId(), null,
                 ProgrammingExerciseStudentParticipation.class, HttpStatus.OK);
         assertThat(updatedParticipation.getInitializationState()).isEqualTo(InitializationState.INITIALIZED);
+        localRepo.resetLocalRepo();
     }
 
     @Test
diff --git a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
index aad7129eedef..aed64f17d927 100644
--- a/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/participation/SubmissionExportIntegrationTest.java
@@ -5,8 +5,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
 import java.time.ZonedDateTime;
+import java.util.regex.Pattern;
 import java.util.zip.ZipFile;
 
 import org.junit.jupiter.api.AfterEach;
@@ -139,7 +139,9 @@ else if (exercise instanceof FileUploadExercise) {
 
     private void saveEmptySubmissionFile(Exercise exercise, FileUploadSubmission submission) throws IOException {
 
-        File file = Path.of(FileUploadSubmission.buildFilePath(exercise.getId(), submission.getId()), submission.getFilePath()).toFile();
+        String[] parts = submission.getFilePath().split(Pattern.quote(File.separator));
+        String fileName = parts[parts.length - 1];
+        File file = FileUploadSubmission.buildFilePath(exercise.getId(), submission.getId()).resolve(fileName).toFile();
 
         File parent = file.getParentFile();
         if (!parent.exists() && !parent.mkdirs()) {
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 d5ddd2c30e30..942f96a169f3 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
@@ -528,7 +528,7 @@ private void addOnlyAnswerPostInCourse(Course course) {
     void testDataExportCreationError_handlesErrorAndInformsUserAndAdmin() {
         var dataExport = initDataExport();
         Exception exception = new RuntimeException("error");
-        doThrow(exception).when(fileService).scheduleForDirectoryDeletion(any(Path.class), anyLong());
+        doThrow(exception).when(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyLong());
         doNothing().when(mailService).sendDataExportFailedEmailToAdmin(any(), any(), any());
         doNothing().when(singleUserNotificationService).notifyUserAboutDataExportCreation(any(DataExport.class));
         dataExportCreationService.createDataExport(dataExport);
diff --git a/src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java
new file mode 100644
index 000000000000..477d35feb7e4
--- /dev/null
+++ b/src/test/java/de/tum/in/www1/artemis/service/FilePathServiceTest.java
@@ -0,0 +1,80 @@
+package de.tum.in.www1.artemis.service;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.net.URI;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import de.tum.in.www1.artemis.AbstractSpringIntegrationBambooBitbucketJiraTest;
+import de.tum.in.www1.artemis.exception.FilePathParsingException;
+
+class FilePathServiceTest extends AbstractSpringIntegrationBambooBitbucketJiraTest {
+
+    @Autowired
+    private FilePathService filePathService;
+
+    @Test
+    void testActualPathForPublicPath() {
+        Path actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/drag-and-drop/backgrounds/background.jpeg"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "drag-and-drop", "backgrounds", "background.jpeg"));
+
+        actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/drag-and-drop/drag-items/image.jpeg"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "drag-and-drop", "drag-items", "image.jpeg"));
+
+        actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/course/icons/icon.png"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "course", "icons", "icon.png"));
+
+        actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/attachments/lecture/4/slides.pdf"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "attachments", "lecture", "4", "slides.pdf"));
+
+        actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/attachments/attachment-unit/4/download.pdf"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "attachments", "attachment-unit", "4", "download.pdf"));
+
+        actualPath = filePathService.actualPathForPublicPath(URI.create("/api/files/attachments/attachment-unit/4/slide/1/1.jpg"));
+        assertThat(actualPath).isEqualTo(Path.of("uploads", "attachments", "attachment-unit", "4", "slide", "1", "1.jpg"));
+    }
+
+    @Test
+    void testActualPathForPublicFileUploadExercisePath_shouldReturnNull() {
+        Path path = filePathService.actualPathForPublicPath(URI.create("/api/unknown-path/unknown-file.pdf"));
+        assertThat(path).isNull();
+    }
+
+    @Test
+    void testActualPathForPublicFileUploadExercisePathOrThrow_shouldThrowException() {
+        assertThatExceptionOfType(FilePathParsingException.class)
+                .isThrownBy(() -> filePathService.actualPathForPublicPathOrThrow(URI.create("/api/files/file-upload-exercises/file.pdf")))
+                .withMessageStartingWith("Public path does not contain correct exerciseId or submissionId:");
+
+        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> filePathService.actualPathForPublicPathOrThrow(URI.create("/api/unknown-path/unknown-file.pdf")))
+                .withMessageStartingWith("Unknown Filepath:");
+    }
+
+    @Test
+    void testPublicPathForActualTempFilePath() {
+        Path actualPath = FilePathService.getTempFilePath().resolve("test");
+        URI publicPath = filePathService.publicPathForActualPath(actualPath, 1L);
+        assertThat(publicPath).isEqualTo(URI.create(FileService.DEFAULT_FILE_SUBPATH + actualPath.getFileName()));
+    }
+
+    @Test
+    void testPublicPathForActualPath_shouldReturnNull() {
+        URI otherPath = filePathService.publicPathForActualPath(Path.of("unknown-path", "unknown-file.pdf"), 1L);
+        assertThat(otherPath).isNull();
+    }
+
+    @Test
+    void testPublicPathForActualPath_shouldThrowException() {
+        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> {
+            Path actualFileUploadPath = FilePathService.getFileUploadExercisesFilePath();
+            filePathService.publicPathForActualPathOrThrow(actualFileUploadPath, 1L);
+
+        }).withMessageStartingWith("Unexpected String in upload file path. Exercise ID should be present here:");
+
+        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> filePathService.publicPathForActualPathOrThrow(Path.of("unknown-path", "unknown-file.pdf"), 1L))
+                .withMessageStartingWith("Unknown Filepath:");
+    }
+}
diff --git a/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java
index df903482c30e..c38321adb4a1 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/FileServiceTest.java
@@ -3,9 +3,11 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.*;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -23,15 +25,18 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
 import org.springframework.util.ResourceUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import de.tum.in.www1.artemis.AbstractSpringIntegrationIndependentTest;
-import de.tum.in.www1.artemis.exception.FilePathParsingException;
 
 class FileServiceTest extends AbstractSpringIntegrationIndependentTest {
 
     @Autowired
     private ResourceLoaderService resourceLoaderService;
 
+    @Autowired
+    private FileService fileService;
+
     private final Path javaPath = Path.of("templates", "java", "java.txt");
 
     // the resource loader allows to load resources from the file system for this prefix
@@ -101,6 +106,54 @@ void deleteFiles() throws IOException {
         FileUtils.deleteDirectory(Path.of(".", "exportTest").toFile());
     }
 
+    @Test
+    void testGetFileForPath() throws IOException {
+        writeFile("testFile.txt", FILE_WITH_UNIX_LINE_ENDINGS);
+        byte[] result = fileService.getFileForPath(Path.of(".", "exportTest", "testFile.txt"));
+        assertThat(result).containsExactly(FILE_WITH_UNIX_LINE_ENDINGS.getBytes(StandardCharsets.UTF_8));
+    }
+
+    @Test
+    void testGetFileFOrPath_notFound() throws IOException {
+        writeFile("testFile.txt", FILE_WITH_UNIX_LINE_ENDINGS);
+        byte[] result = fileService.getFileForPath(Path.of(".", "exportTest", UUID.randomUUID() + ".txt"));
+        assertThat(result).isNull();
+    }
+
+    @Test
+    void testHandleSaveFile_noOriginalFilename() {
+        MultipartFile file = mock(MultipartFile.class);
+        doAnswer(invocation -> null).when(file).getOriginalFilename();
+        assertThatThrownBy(() -> fileService.handleSaveFile(file, false, false)).isInstanceOf(IllegalArgumentException.class);
+        verify(file, times(1)).getOriginalFilename();
+    }
+
+    @Test
+    void testCopyExistingFileToTarget() throws IOException {
+        String payload = "test";
+        Path filePath = Path.of(".", "exportTest", "testFile.txt");
+        FileUtils.writeStringToFile(filePath.toFile(), payload, StandardCharsets.UTF_8);
+        Path newFolder = Path.of(".", "exportTest", "newFolder");
+
+        Path newPath = fileService.copyExistingFileToTarget(filePath, newFolder);
+        assertThat(newPath).isNotNull();
+
+        assertThat(FileUtils.readFileToString(newPath.toFile(), StandardCharsets.UTF_8)).isEqualTo(payload);
+    }
+
+    @Test
+    void testCopyExistingFileToTarget_newFile() {
+        assertThat(fileService.copyExistingFileToTarget(null, Path.of(".", "exportTest"))).isNull();
+    }
+
+    @Test
+    void testCopyExistingFileToTarget_temporaryFile() {
+        // We don't need to create a file here as we expect the method to terminate early
+        Path tempPath = Path.of(".", "uploads", "files", "temp", "testFile.txt");
+        Path newPath = Path.of(".", "exportTest");
+        assertThat(fileService.copyExistingFileToTarget(tempPath, newPath)).isNull();
+    }
+
     @Test
     void normalizeFileEndingsUnix_noChange() throws IOException {
         writeFile("LineEndingsUnix.java", FILE_WITH_UNIX_LINE_ENDINGS);
@@ -233,70 +286,6 @@ void testMergePdf() throws IOException {
         assertThat(mergedDoc.getNumberOfPages()).isEqualTo(5);
     }
 
-    @Test
-    void testManageFilesForUpdatedFilePath_shouldNotThrowException() {
-        assertThatNoException().isThrownBy(() -> fileService.manageFilesForUpdatedFilePath("oldFilePath", "newFilePath", "targetFolder", 1L, true));
-    }
-
-    @Test
-    void testActualPathForPublicPath() {
-        String actualPath = fileService.actualPathForPublicPath("asdasdfiles/drag-and-drop/backgrounds");
-        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "drag-and-drop", "backgrounds", "backgrounds").toString());
-
-        actualPath = fileService.actualPathForPublicPath("asdasdfiles/drag-and-drop/drag-items");
-        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "drag-and-drop", "drag-items", "drag-items").toString());
-
-        actualPath = fileService.actualPathForPublicPath("asdasdfiles/course/icons");
-        assertThat(actualPath).isEqualTo(Path.of("uploads", "images", "course", "icons", "icons").toString());
-
-        actualPath = fileService.actualPathForPublicPath("asdasdfiles/attachments/lecture");
-        assertThat(actualPath).isEqualTo(Path.of("uploads", "attachments", "lecture", "asdasdfiles", "attachments", "lecture").toString());
-
-        actualPath = fileService.actualPathForPublicPath("asdasdfiles/attachments/attachment-unit");
-        assertThat(actualPath).isEqualTo(Path.of("uploads", "attachments", "attachment-unit", "asdasdfiles", "attachments", "attachment-unit").toString());
-    }
-
-    @Test
-    void testActualPathForPublicFileUploadExercisePath_shouldReturnNull() {
-        String path = fileService.actualPathForPublicPath("asdasdfiles/file-asd-exercises");
-        assertThat(path).isNull();
-    }
-
-    @Test
-    void testActualPathForPublicFileUploadExercisePathOrThrow_shouldThrowException() {
-        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> fileService.actualPathForPublicPathOrThrow("asdasdfiles/file-upload-exercises"))
-                .withMessageStartingWith("Public path does not contain correct exerciseId or submissionId:");
-
-        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> fileService.actualPathForPublicPathOrThrow("asdasdfiles/file-asd-exercises"))
-                .withMessageStartingWith("Unknown Filepath:");
-    }
-
-    @Test
-    void testPublicPathForActualTempFilePath() {
-        Path actualPath = Path.of(FilePathService.getTempFilePath(), "test");
-        String publicPath = fileService.publicPathForActualPath(actualPath.toString(), 1L);
-        assertThat(publicPath).isEqualTo(FileService.DEFAULT_FILE_SUBPATH + actualPath.getFileName());
-    }
-
-    @Test
-    void testPublicPathForActualPath_shouldReturnNull() {
-        String otherPath = fileService.publicPathForActualPath(Path.of("asdasdfiles", "file-asd-exercises").toString(), 1L);
-        assertThat(otherPath).isNull();
-    }
-
-    @Test
-    void testPublicPathForActualPathOrThrow_shouldThrowException() {
-        assertThatExceptionOfType(FilePathParsingException.class).isThrownBy(() -> {
-            Path actualFileUploadPath = Path.of(FilePathService.getFileUploadExercisesFilePath());
-            fileService.publicPathForActualPathOrThrow(actualFileUploadPath.toString(), 1L);
-
-        }).withMessageStartingWith("Unexpected String in upload file path. Exercise ID should be present here:");
-
-        assertThatExceptionOfType(FilePathParsingException.class)
-                .isThrownBy(() -> fileService.publicPathForActualPathOrThrow(Path.of("asdasdfiles", "file-asd-exercises").toString(), 1L))
-                .withMessageStartingWith("Unknown Filepath:");
-    }
-
     @Test
     void testReplaceVariablesInFileRecursive_shouldThrowException() {
         assertThatRuntimeException().isThrownBy(() -> fileService.replaceVariablesInFileRecursive(Path.of("some-path"), new HashMap<>()))
@@ -311,7 +300,7 @@ void testNormalizeLineEndingsDirectory_shouldThrowException() {
 
     @Test
     void testConvertToUTF8Directory_shouldThrowException() {
-        assertThatRuntimeException().isThrownBy(() -> fileService.convertToUTF8Directory(Path.of("some-path")))
+        assertThatRuntimeException().isThrownBy(() -> fileService.convertFilesInDirectoryToUtf8(Path.of("some-path")))
                 .withMessageEndingWith("should be converted to UTF-8 but the directory does not exist.");
     }
 
@@ -319,18 +308,12 @@ void testConvertToUTF8Directory_shouldThrowException() {
     @Test
     void testGetUniqueTemporaryPath_shouldNotThrowException() {
         assertThatNoException().isThrownBy(() -> {
-            var uniquePath = fileService.getTemporaryUniquePath(Path.of("some-random-path-which-does-not-exist"), 1);
+            var uniquePath = fileService.getTemporaryUniqueSubfolderPath(Path.of("some-random-path-which-does-not-exist"), 1);
             assertThat(uniquePath.toString()).isNotEmpty();
-            verify(fileService).scheduleForDirectoryDeletion(any(Path.class), eq(1L));
+            verify(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), eq(1L));
         });
     }
 
-    @Test
-    void testCreateDirectory_shouldNotThrowException() {
-        Path path = Path.of("some-random-path-which-does-not-exist");
-        assertThatNoException().isThrownBy(() -> fileService.createDirectory(path));
-    }
-
     @Test
     void testDeleteFiles_shouldNotThrowException() {
         Path path = Path.of("some-random-path-which-does-not-exist");
diff --git a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
index f33149e252c9..0783a9e28b63 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/LearningPathServiceTest.java
@@ -3,7 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.time.ZonedDateTime;
-import java.util.HashSet;
+import java.util.*;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -11,14 +11,24 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import de.tum.in.www1.artemis.AbstractSpringIntegrationBambooBitbucketJiraTest;
+import de.tum.in.www1.artemis.competency.CompetencyUtilService;
 import de.tum.in.www1.artemis.competency.LearningPathUtilService;
 import de.tum.in.www1.artemis.course.CourseFactory;
 import de.tum.in.www1.artemis.course.CourseUtilService;
 import de.tum.in.www1.artemis.domain.Course;
+import de.tum.in.www1.artemis.domain.Exercise;
+import de.tum.in.www1.artemis.domain.competency.Competency;
+import de.tum.in.www1.artemis.domain.competency.CompetencyRelation;
+import de.tum.in.www1.artemis.domain.competency.LearningPath;
+import de.tum.in.www1.artemis.domain.lecture.LectureUnit;
+import de.tum.in.www1.artemis.exercise.programmingexercise.ProgrammingExerciseUtilService;
+import de.tum.in.www1.artemis.lecture.LectureUtilService;
 import de.tum.in.www1.artemis.repository.CourseRepository;
+import de.tum.in.www1.artemis.repository.LearningPathRepository;
 import de.tum.in.www1.artemis.security.SecurityUtils;
 import de.tum.in.www1.artemis.user.UserUtilService;
 import de.tum.in.www1.artemis.web.rest.dto.competency.LearningPathHealthDTO;
+import de.tum.in.www1.artemis.web.rest.dto.competency.NgxLearningPathDTO;
 
 class LearningPathServiceTest extends AbstractSpringIntegrationBambooBitbucketJiraTest {
 
@@ -39,6 +49,18 @@ class LearningPathServiceTest extends AbstractSpringIntegrationBambooBitbucketJi
     @Autowired
     private CourseRepository courseRepository;
 
+    @Autowired
+    private CompetencyUtilService competencyUtilService;
+
+    @Autowired
+    private LectureUtilService lectureUtilService;
+
+    @Autowired
+    private ProgrammingExerciseUtilService programmingExerciseUtilService;
+
+    @Autowired
+    private LearningPathRepository learningPathRepository;
+
     private Course course;
 
     @BeforeEach
@@ -84,4 +106,192 @@ void testHealthStatusMissing() {
             assertThat(healthStatus.missingLearningPaths()).isEqualTo(1);
         }
     }
+
+    @Nested
+    class GenerateNgxRepresentationBaseTest {
+
+        @Test
+        void testEmptyLearningPath() {
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(Set.of(), Set.of());
+            generateAndAssert(expected);
+        }
+
+        @Test
+        void testEmptyCompetency() {
+            final var competency = competencyUtilService.createCompetency(course);
+            final var startNodeId = LearningPathService.getCompetencyStartNodeId(competency.getId());
+            final var endNodeId = LearningPathService.getCompetencyEndNodeId(competency.getId());
+            Set<NgxLearningPathDTO.Node> expectedNodes = getExpectedNodesOfEmptyCompetency(competency);
+            Set<NgxLearningPathDTO.Edge> expectedEdges = Set.of(new NgxLearningPathDTO.Edge(LearningPathService.getDirectEdgeId(competency.getId()), startNodeId, endNodeId));
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+
+        @Test
+        void testCompetencyWithLectureUnitAndExercise() {
+            var competency = competencyUtilService.createCompetency(course);
+            var lecture = lectureUtilService.createLecture(course, ZonedDateTime.now());
+            final var lectureUnit = lectureUtilService.createTextUnit();
+            lectureUtilService.addLectureUnitsToLecture(lecture, List.of(lectureUnit));
+            competencyUtilService.linkLectureUnitToCompetency(competency, lectureUnit);
+            final var exercise = programmingExerciseUtilService.addProgrammingExerciseToCourse(course, false);
+            competencyUtilService.linkExerciseToCompetency(competency, exercise);
+            final var startNodeId = LearningPathService.getCompetencyStartNodeId(competency.getId());
+            final var endNodeId = LearningPathService.getCompetencyEndNodeId(competency.getId());
+            Set<NgxLearningPathDTO.Node> expectedNodes = getExpectedNodesOfEmptyCompetency(competency);
+            expectedNodes.add(getNodeForLectureUnit(competency, lectureUnit));
+            expectedNodes.add(getNodeForExercise(competency, exercise));
+            Set<NgxLearningPathDTO.Edge> expectedEdges = Set.of(
+                    new NgxLearningPathDTO.Edge(LearningPathService.getLectureUnitInEdgeId(competency.getId(), lectureUnit.getId()), startNodeId,
+                            LearningPathService.getLectureUnitNodeId(competency.getId(), lectureUnit.getId())),
+                    new NgxLearningPathDTO.Edge(LearningPathService.getLectureUnitOutEdgeId(competency.getId(), lectureUnit.getId()),
+                            LearningPathService.getLectureUnitNodeId(competency.getId(), lectureUnit.getId()), endNodeId),
+                    new NgxLearningPathDTO.Edge(LearningPathService.getExerciseInEdgeId(competency.getId(), exercise.getId()), startNodeId,
+                            LearningPathService.getExerciseNodeId(competency.getId(), exercise.getId())),
+                    new NgxLearningPathDTO.Edge(LearningPathService.getExerciseOutEdgeId(competency.getId(), exercise.getId()),
+                            LearningPathService.getExerciseNodeId(competency.getId(), exercise.getId()), endNodeId));
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+
+        @Test
+        void testMultipleCompetencies() {
+            Competency[] competencies = { competencyUtilService.createCompetency(course), competencyUtilService.createCompetency(course),
+                    competencyUtilService.createCompetency(course) };
+            String[] startNodeIds = Arrays.stream(competencies).map(Competency::getId).map(LearningPathService::getCompetencyStartNodeId).toArray(String[]::new);
+            String[] endNodeIds = Arrays.stream(competencies).map(Competency::getId).map(LearningPathService::getCompetencyEndNodeId).toArray(String[]::new);
+            Set<NgxLearningPathDTO.Node> expectedNodes = new HashSet<>();
+            Set<NgxLearningPathDTO.Edge> expectedEdges = new HashSet<>();
+            for (int i = 0; i < competencies.length; i++) {
+                expectedNodes.addAll(getExpectedNodesOfEmptyCompetency(competencies[i]));
+                expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getDirectEdgeId(competencies[i].getId()), startNodeIds[i], endNodeIds[i]));
+            }
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+    }
+
+    @Nested
+    class GenerateNgxRepresentationRelationTest {
+
+        private Competency competency1;
+
+        private Competency competency2;
+
+        private Set<NgxLearningPathDTO.Node> expectedNodes;
+
+        Set<NgxLearningPathDTO.Edge> expectedEdges;
+
+        @BeforeEach
+        void setup() {
+            competency1 = competencyUtilService.createCompetency(course);
+            competency2 = competencyUtilService.createCompetency(course);
+            expectedNodes = new HashSet<>();
+            expectedEdges = new HashSet<>();
+            addExpectedComponentsForEmptyCompetencies(competency1, competency2);
+        }
+
+        void testSimpleRelation(CompetencyRelation.RelationType type) {
+            competencyUtilService.addRelation(competency1, type, competency2);
+            final var sourceNodeId = LearningPathService.getCompetencyEndNodeId(competency2.getId());
+            final var targetNodeId = LearningPathService.getCompetencyStartNodeId(competency1.getId());
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getRelationEdgeId(sourceNodeId, targetNodeId), sourceNodeId, targetNodeId));
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+
+        @Test
+        void testSingleRelates() {
+            testSimpleRelation(CompetencyRelation.RelationType.RELATES);
+        }
+
+        @Test
+        void testSingleAssumes() {
+            testSimpleRelation(CompetencyRelation.RelationType.ASSUMES);
+        }
+
+        @Test
+        void testSingleExtends() {
+            testSimpleRelation(CompetencyRelation.RelationType.EXTENDS);
+        }
+
+        @Test
+        void testSingleMatches() {
+            competencyUtilService.addRelation(competency1, CompetencyRelation.RelationType.MATCHES, competency2);
+            expectedNodes.add(new NgxLearningPathDTO.Node(LearningPathService.getMatchingClusterStartNodeId(0), NgxLearningPathDTO.NodeType.MATCH_START, null, ""));
+            expectedNodes.add(new NgxLearningPathDTO.Node(LearningPathService.getMatchingClusterEndNodeId(0), NgxLearningPathDTO.NodeType.MATCH_END, null, ""));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getInEdgeId(competency1.getId()), LearningPathService.getMatchingClusterStartNodeId(0),
+                    LearningPathService.getCompetencyStartNodeId(competency1.getId())));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getOutEdgeId(competency1.getId()), LearningPathService.getCompetencyEndNodeId(competency1.getId()),
+                    LearningPathService.getMatchingClusterEndNodeId(0)));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getInEdgeId(competency2.getId()), LearningPathService.getMatchingClusterStartNodeId(0),
+                    LearningPathService.getCompetencyStartNodeId(competency2.getId())));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getOutEdgeId(competency2.getId()), LearningPathService.getCompetencyEndNodeId(competency2.getId()),
+                    LearningPathService.getMatchingClusterEndNodeId(0)));
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+
+        @Test
+        void testMatchesTransitive() {
+            var competency3 = competencyUtilService.createCompetency(course);
+            addExpectedComponentsForEmptyCompetencies(competency3);
+
+            competencyUtilService.addRelation(competency1, CompetencyRelation.RelationType.MATCHES, competency2);
+            competencyUtilService.addRelation(competency2, CompetencyRelation.RelationType.MATCHES, competency3);
+            expectedNodes.add(new NgxLearningPathDTO.Node(LearningPathService.getMatchingClusterStartNodeId(0), NgxLearningPathDTO.NodeType.MATCH_START, null, ""));
+            expectedNodes.add(new NgxLearningPathDTO.Node(LearningPathService.getMatchingClusterEndNodeId(0), NgxLearningPathDTO.NodeType.MATCH_END, null, ""));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getInEdgeId(competency1.getId()), LearningPathService.getMatchingClusterStartNodeId(0),
+                    LearningPathService.getCompetencyStartNodeId(competency1.getId())));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getOutEdgeId(competency1.getId()), LearningPathService.getCompetencyEndNodeId(competency1.getId()),
+                    LearningPathService.getMatchingClusterEndNodeId(0)));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getInEdgeId(competency2.getId()), LearningPathService.getMatchingClusterStartNodeId(0),
+                    LearningPathService.getCompetencyStartNodeId(competency2.getId())));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getOutEdgeId(competency2.getId()), LearningPathService.getCompetencyEndNodeId(competency2.getId()),
+                    LearningPathService.getMatchingClusterEndNodeId(0)));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getInEdgeId(competency3.getId()), LearningPathService.getMatchingClusterStartNodeId(0),
+                    LearningPathService.getCompetencyStartNodeId(competency3.getId())));
+            expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getOutEdgeId(competency3.getId()), LearningPathService.getCompetencyEndNodeId(competency3.getId()),
+                    LearningPathService.getMatchingClusterEndNodeId(0)));
+            NgxLearningPathDTO expected = new NgxLearningPathDTO(expectedNodes, expectedEdges);
+            generateAndAssert(expected);
+        }
+
+        private void addExpectedComponentsForEmptyCompetencies(Competency... competencies) {
+            for (var competency : competencies) {
+                expectedNodes.addAll(getExpectedNodesOfEmptyCompetency(competency));
+                expectedEdges.add(new NgxLearningPathDTO.Edge(LearningPathService.getDirectEdgeId(competency.getId()),
+                        LearningPathService.getCompetencyStartNodeId(competency.getId()), LearningPathService.getCompetencyEndNodeId(competency.getId())));
+            }
+        }
+    }
+
+    private void generateAndAssert(NgxLearningPathDTO expected) {
+        LearningPath learningPath = learningPathUtilService.createLearningPathInCourse(course);
+        learningPath = learningPathRepository.findWithEagerCompetenciesAndLearningObjectsAndCompletedUsersByIdElseThrow(learningPath.getId());
+        NgxLearningPathDTO actual = learningPathService.generateNgxGraphRepresentation(learningPath);
+        assertThat(actual).isNotNull();
+        assertNgxRepEquals(actual, expected);
+    }
+
+    private void assertNgxRepEquals(NgxLearningPathDTO was, NgxLearningPathDTO expected) {
+        assertThat(was.nodes()).as("correct nodes").containsExactlyInAnyOrderElementsOf(expected.nodes());
+        assertThat(was.edges()).as("correct edges").containsExactlyInAnyOrderElementsOf(expected.edges());
+    }
+
+    private static Set<NgxLearningPathDTO.Node> getExpectedNodesOfEmptyCompetency(Competency competency) {
+        return new HashSet<>(Set.of(
+                new NgxLearningPathDTO.Node(LearningPathService.getCompetencyStartNodeId(competency.getId()), NgxLearningPathDTO.NodeType.COMPETENCY_START, competency.getId(), ""),
+                new NgxLearningPathDTO.Node(LearningPathService.getCompetencyEndNodeId(competency.getId()), NgxLearningPathDTO.NodeType.COMPETENCY_END, competency.getId(), "")));
+    }
+
+    private static NgxLearningPathDTO.Node getNodeForLectureUnit(Competency competency, LectureUnit lectureUnit) {
+        return new NgxLearningPathDTO.Node(LearningPathService.getLectureUnitNodeId(competency.getId(), lectureUnit.getId()), NgxLearningPathDTO.NodeType.LECTURE_UNIT,
+                lectureUnit.getId(), lectureUnit.getLecture().getId(), false, lectureUnit.getName());
+    }
+
+    private static NgxLearningPathDTO.Node getNodeForExercise(Competency competency, Exercise exercise) {
+        return new NgxLearningPathDTO.Node(LearningPathService.getExerciseNodeId(competency.getId(), exercise.getId()), NgxLearningPathDTO.NodeType.EXERCISE, exercise.getId(),
+                exercise.getTitle());
+    }
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java
index bbfc7d0d45e7..549d78dd50c6 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ResourceLoaderServiceTest.java
@@ -132,9 +132,8 @@ void testGetResourceFilePathFromJar() throws IOException, URISyntaxException {
         // Mock the getResource() method.
         doReturn(true).when(resource).exists();
         doReturn(resourceUrl).when(resource).getURL();
-        doReturn(mock(InputStream.class)).when(resource).getInputStream();
+        doReturn(InputStream.nullInputStream()).when(resource).getInputStream();
 
-        // ResourcePatternResolver resourcePatternResolver = ResourcePatternUtils.getResourcePatternResolver(resourceLoader);
         doReturn(resource).when(resourceLoader).getResource(anyString());
 
         // Instantiate the class under test and invoke the method.
diff --git a/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java
index 480c171f15c7..b296f3eb4e9c 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/ZipFileServiceTest.java
@@ -50,7 +50,7 @@ void testCreateTemporaryZipFileSchedulesFileForDeletion() throws IOException {
         var tempZipFile = Files.createTempFile("test", ".zip");
         zipFileService.createTemporaryZipFile(tempZipFile, List.of(), 5);
         assertThat(tempZipFile).exists();
-        verify(fileService).scheduleForDeletion(tempZipFile, 5L);
+        verify(fileService).schedulePathForDeletion(tempZipFile, 5L);
     }
 
 }
diff --git a/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java b/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java
index 196f0ac906d2..e3e98a1a9a40 100644
--- a/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java
+++ b/src/test/java/de/tum/in/www1/artemis/service/scheduled/DataExportScheduleServiceTest.java
@@ -75,7 +75,7 @@ void testScheduledCronTaskSendsEmailToAdminAboutSuccessfulDataExports() throws I
         createDataExportWithState(DataExportState.REQUESTED);
         createDataExportWithState(DataExportState.REQUESTED);
         // first data export creation should fail, the subsequent ones should succeed
-        doThrow(new RuntimeException("error")).doNothing().doNothing().when(fileService).scheduleForDirectoryDeletion(any(Path.class), anyLong());
+        doThrow(new RuntimeException("error")).doNothing().doNothing().when(fileService).scheduleDirectoryPathForRecursiveDeletion(any(Path.class), anyLong());
         dataExportScheduleService.createDataExportsAndDeleteOldOnes();
         var dataExportsAfterCreation = dataExportRepository.findAllSuccessfullyCreatedDataExports();
         verify(mailService).sendSuccessfulDataExportsEmailToAdmin(any(User.class), anyString(), anyString(), eq(Set.copyOf(dataExportsAfterCreation)));
@@ -91,7 +91,7 @@ private static Stream<Arguments> provideDataExportStatesAndExpectedToBeCreated()
     @MethodSource("provideCreationDatesAndExpectedToDelete")
     void testScheduledCronTaskDeletesOldDataExports(ZonedDateTime creationDate, DataExportState state, boolean shouldDelete) throws InterruptedException {
         var dataExport = createDataExportWithCreationDateAndState(creationDate, state);
-        doNothing().when(fileService).scheduleForDeletion(any(), anyLong());
+        doNothing().when(fileService).schedulePathForDeletion(any(), anyLong());
         var dataExportId = dataExport.getId();
         dataExportScheduleService.createDataExportsAndDeleteOldOnes();
         var dataExportFromDb = dataExportRepository.findByIdElseThrow(dataExportId);
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 ee48ff136114..d07485179853 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
@@ -19,6 +19,7 @@
 
 import de.tum.in.www1.artemis.config.Constants;
 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.User;
 import de.tum.in.www1.artemis.exercise.programmingexercise.MockDelegate;
@@ -120,8 +121,8 @@ private void assertThatUserWasSoftDeleted(User originalUser, User deletedUser) t
         assertThat(deletedUser.getLogin()).isNotEqualTo(originalUser.getLogin());
         assertThat(deletedUser.getPassword()).isNotEqualTo(originalUser.getPassword());
         assertThat(deletedUser.getEmail()).endsWith(Constants.USER_EMAIL_DOMAIN_AFTER_SOFT_DELETE);
-        assertThat(deletedUser.getRegistrationNumber()).isEqualTo(null);
-        assertThat(deletedUser.getImageUrl()).isEqualTo(null);
+        assertThat(deletedUser.getRegistrationNumber()).isNull();
+        assertThat(deletedUser.getImageUrl()).isNull();
         assertThat(deletedUser.getActivated()).isFalse();
     }
 
@@ -221,6 +222,23 @@ public void updateUser_asAdmin_isSuccessful() throws Exception {
         assertThat(student).as("Updated user in DB is equal to sent update").isEqualTo(updatedUserIndDB);
     }
 
+    // Test
+    public void updateUserWithEmptyRoles() throws Exception {
+        student.setInternal(true);
+        student.setAuthorities(null);
+
+        mockDelegate.mockUpdateUserInUserManagement(student.getLogin(), student, "foobar1234", student.getGroups());
+
+        var managedUserVM = new ManagedUserVM(student, "foobar1234");
+
+        final var response = request.putWithResponseBody("/api/admin/users", managedUserVM, User.class, HttpStatus.OK);
+        assertThat(response).isNotNull();
+
+        // do not allow empty authorities
+        final var updatedUserInDB = userRepository.findOneWithGroupsAndAuthoritiesByLogin(student.getLogin()).orElseThrow();
+        assertThat(updatedUserInDB.getAuthorities()).containsExactly(new Authority(Role.STUDENT.getAuthority()));
+    }
+
     // Test
     public void updateUser_withNullPassword_oldPasswordNotChanged() throws Exception {
         student.setPassword(null);
@@ -341,6 +359,15 @@ public void createExternalUser_asAdmin_withVcsToken_isSuccessful() throws Except
 
     // Test
     public void createInternalUser_asAdmin_isSuccessful() throws Exception {
+        createInternalUserIsSuccessful(Set.of(Role.STUDENT));
+    }
+
+    // Test
+    public void createInternalUserWithoutRoles_asAdmin_isSuccessful() throws Exception {
+        createInternalUserIsSuccessful(Collections.emptySet());
+    }
+
+    private void createInternalUserIsSuccessful(final Set<Role> roles) throws Exception {
         String password = "foobar1234";
         student.setId(null);
         student.setLogin("batman");
@@ -348,6 +375,9 @@ public void createInternalUser_asAdmin_isSuccessful() throws Exception {
         student.setEmail("batman@secret.invalid");
         student.setInternal(true);
 
+        final Set<Authority> authorities = roles.stream().map(Role::getAuthority).map(auth -> authorityRepository.findById(auth).orElseThrow()).collect(Collectors.toSet());
+        student.setAuthorities(authorities);
+
         mockDelegate.mockCreateUserInUserManagement(student, false);
 
         final var response = request.postWithResponseBody("/api/admin/users", new ManagedUserVM(student, student.getPassword()), User.class, HttpStatus.CREATED);
diff --git a/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java b/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java
index 1f3fe7254ca9..bc47080491ca 100644
--- a/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java
+++ b/src/test/java/de/tum/in/www1/artemis/util/RequestUtilService.java
@@ -14,6 +14,7 @@
 
 import javax.annotation.Nullable;
 
+import org.apache.commons.io.FileUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -355,7 +356,7 @@ public File postWithResponseBodyFile(String path, Object body, HttpStatus expect
             return null;
         }
         final var tmpFile = File.createTempFile(res.getResponse().getHeader("filename"), null);
-        Files.write(tmpFile.toPath(), res.getResponse().getContentAsByteArray());
+        FileUtils.writeByteArrayToFile(tmpFile, res.getResponse().getContentAsByteArray());
 
         return tmpFile;
     }
@@ -573,7 +574,7 @@ public File getFile(String path, HttpStatus expectedStatus, MultiValueMap<String
         String tmpDirectory = System.getProperty("java.io.tmpdir");
         var filename = res.getResponse().getHeader("filename");
         var tmpFile = Files.createFile(Path.of(tmpDirectory, filename));
-        Files.write(tmpFile, res.getResponse().getContentAsByteArray());
+        FileUtils.writeByteArrayToFile(tmpFile.toFile(), res.getResponse().getContentAsByteArray());
         return tmpFile.toFile();
     }
 
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 5848c452146d..83bc1e617eb7 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
@@ -117,11 +117,11 @@ describe('Course LTI Configuration Component', () => {
             expect(findWithExercisesStub).toHaveBeenCalledOnce();
 
             expect(comp.getDynamicRegistrationUrl()).toBe(`${location.origin}/lti/dynamic-registration/${course.id}`);
-            expect(comp.getDeepLinkingUrl()).toBe(`${location.origin}/api/lti13/deep-linking/${course.id}`);
+            expect(comp.getDeepLinkingUrl()).toBe(`${location.origin}/api/public/lti13/deep-linking/${course.id}`);
             expect(comp.getToolUrl()).toBe(`${location.origin}/courses/${course.id}`);
             expect(comp.getKeysetUrl()).toBe(`${location.origin}/.well-known/jwks.json`);
-            expect(comp.getInitiateLoginUrl()).toBe(`${location.origin}/api/lti13/initiate-login/${course.onlineCourseConfiguration?.registrationId}`);
-            expect(comp.getRedirectUri()).toBe(`${location.origin}/api/lti13/auth-callback`);
+            expect(comp.getInitiateLoginUrl()).toBe(`${location.origin}/api/public/lti13/initiate-login/${course.onlineCourseConfiguration?.registrationId}`);
+            expect(comp.getRedirectUri()).toBe(`${location.origin}/api/public/lti13/auth-callback`);
         });
     });
 
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 ce6488144644..31aa300beba3 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
@@ -293,11 +293,11 @@ describe('Exam Exercise Import Component', () => {
     });
 
     it('should correctly return the Exercise Icon', () => {
-        expect(component.getExerciseIcon(modelingExercise)).toEqual(faProjectDiagram);
-        expect(component.getExerciseIcon(textExercise)).toEqual(faFont);
-        expect(component.getExerciseIcon(programmingExercise)).toEqual(faKeyboard);
-        expect(component.getExerciseIcon(quizExercise)).toEqual(faCheckDouble);
-        expect(component.getExerciseIcon(fileUploadExercise)).toEqual(faFileUpload);
+        expect(component.getExerciseIcon(modelingExercise.type)).toEqual(faProjectDiagram);
+        expect(component.getExerciseIcon(textExercise.type)).toEqual(faFont);
+        expect(component.getExerciseIcon(programmingExercise.type)).toEqual(faKeyboard);
+        expect(component.getExerciseIcon(quizExercise.type)).toEqual(faCheckDouble);
+        expect(component.getExerciseIcon(fileUploadExercise.type)).toEqual(faFileUpload);
     });
 
     describe('Programming exercise import validation', () => {
diff --git a/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph-node.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph-node.component.spec.ts
new file mode 100644
index 000000000000..8371428d66ed
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph-node.component.spec.ts
@@ -0,0 +1,46 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../test.module';
+import { MockDirective } from 'ng-mocks';
+import { By } from '@angular/platform-browser';
+import { LearningPathGraphNodeComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph-node.component';
+import { NgxLearningPathNode, NodeType } from 'app/entities/competency/learning-path.model';
+import { StickyPopoverDirective } from 'app/shared/sticky-popover/sticky-popover.directive';
+
+describe('LearningPathGraphNodeComponent', () => {
+    let fixture: ComponentFixture<LearningPathGraphNodeComponent>;
+    let comp: LearningPathGraphNodeComponent;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule],
+            declarations: [LearningPathGraphNodeComponent, MockDirective(StickyPopoverDirective)],
+            providers: [],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(LearningPathGraphNodeComponent);
+                comp = fixture.componentInstance;
+            });
+    });
+
+    it.each([NodeType.EXERCISE, NodeType.LECTURE_UNIT])('should display correct icon for completed learning object', (type: NodeType) => {
+        comp.node = { id: '1', type: type, completed: true } as NgxLearningPathNode;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('#completed')).nativeElement).toBeTruthy();
+    });
+
+    it.each([NodeType.EXERCISE, NodeType.LECTURE_UNIT])('should display correct icon for not completed learning object', (type: NodeType) => {
+        comp.node = { id: '1', type: type, completed: false } as NgxLearningPathNode;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('#not-completed')).nativeElement).toBeTruthy();
+    });
+
+    it.each([NodeType.COMPETENCY_START, NodeType.COMPETENCY_END, NodeType.COMPETENCY_START, NodeType.COMPETENCY_END])(
+        'should display correct icon for generic node',
+        (type: NodeType) => {
+            comp.node = { id: '1', type: type } as NgxLearningPathNode;
+            fixture.detectChanges();
+            expect(fixture.debugElement.query(By.css('#generic')).nativeElement).toBeTruthy();
+        },
+    );
+});
diff --git a/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph.component.spec.ts
new file mode 100644
index 000000000000..42f707efb83c
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/graph/learning-path-graph.component.spec.ts
@@ -0,0 +1,61 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../test.module';
+import { LearningPathGraphComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph.component';
+import { LearningPathService } from 'app/course/learning-paths/learning-path.service';
+
+describe('LearningPathGraphComponent', () => {
+    let fixture: ComponentFixture<LearningPathGraphComponent>;
+    let comp: LearningPathGraphComponent;
+    let learningPathService: LearningPathService;
+    let getLearningPathNgxGraphStub: jest.SpyInstance;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule],
+            declarations: [LearningPathGraphComponent],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(LearningPathGraphComponent);
+                comp = fixture.componentInstance;
+                learningPathService = TestBed.inject(LearningPathService);
+                getLearningPathNgxGraphStub = jest.spyOn(learningPathService, 'getLearningPathNgxGraph');
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should load learning path from service', () => {
+        comp.learningPathId = 1;
+        fixture.detectChanges();
+        expect(getLearningPathNgxGraphStub).toHaveBeenCalledOnce();
+        expect(getLearningPathNgxGraphStub).toHaveBeenCalledWith(1);
+    });
+
+    it('should update, center, and zoom to fit on resize', () => {
+        const updateStub = jest.spyOn(comp.update$, 'next');
+        const centerStub = jest.spyOn(comp.center$, 'next');
+        const zoomToFitStub = jest.spyOn(comp.zoomToFit$, 'next');
+        fixture.detectChanges();
+        comp.onResize();
+        expect(updateStub).toHaveBeenCalledOnce();
+        expect(updateStub).toHaveBeenCalledWith(true);
+        expect(centerStub).toHaveBeenCalledOnce();
+        expect(centerStub).toHaveBeenCalledWith(true);
+        expect(zoomToFitStub).toHaveBeenCalledOnce();
+        expect(zoomToFitStub).toHaveBeenCalledWith(true);
+    });
+
+    it('should zoom to fit and center on resize', () => {
+        const zoomToFitStub = jest.spyOn(comp.zoomToFit$, 'next');
+        const centerStub = jest.spyOn(comp.center$, 'next');
+        fixture.detectChanges();
+        comp.onCenterView();
+        expect(zoomToFitStub).toHaveBeenCalledOnce();
+        expect(zoomToFitStub).toHaveBeenCalledWith(true);
+        expect(centerStub).toHaveBeenCalledOnce();
+        expect(centerStub).toHaveBeenCalledWith(true);
+    });
+});
diff --git a/src/test/javascript/spec/component/learning-paths/graph/node-details/competency-node-details.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/node-details/competency-node-details.component.spec.ts
new file mode 100644
index 000000000000..f68f77d41183
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/graph/node-details/competency-node-details.component.spec.ts
@@ -0,0 +1,75 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../../test.module';
+import { MockComponent, MockPipe } from 'ng-mocks';
+import { of } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+import { CompetencyNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/competency-node-details.component';
+import { Competency, CompetencyProgress, CompetencyTaxonomy } from 'app/entities/competency.model';
+import { CompetencyService } from 'app/course/competencies/competency.service';
+import { CompetencyRingsComponent } from 'app/course/competencies/competency-rings/competency-rings.component';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module';
+
+describe('CompetencyNodeDetailsComponent', () => {
+    let fixture: ComponentFixture<CompetencyNodeDetailsComponent>;
+    let comp: CompetencyNodeDetailsComponent;
+    let competencyService: CompetencyService;
+    let findByIdStub: jest.SpyInstance;
+    let competency: Competency;
+    let competencyProgress: CompetencyProgress;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, NgbTooltipMocksModule],
+            declarations: [CompetencyNodeDetailsComponent, MockComponent(CompetencyRingsComponent), MockPipe(ArtemisTranslatePipe)],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(CompetencyNodeDetailsComponent);
+                comp = fixture.componentInstance;
+                competency = new Competency();
+                competency.id = 2;
+                competency.title = 'Some arbitrary title';
+                competency.description = 'Some description';
+                competency.taxonomy = CompetencyTaxonomy.ANALYZE;
+                competency.masteryThreshold = 50;
+                competencyProgress = new CompetencyProgress();
+                competencyProgress.progress = 80;
+                competencyProgress.confidence = 70;
+                competency.userProgress = [competencyProgress];
+
+                competencyService = TestBed.inject(CompetencyService);
+                findByIdStub = jest.spyOn(competencyService, 'findById').mockReturnValue(of(new HttpResponse({ body: competency })));
+                comp.courseId = 1;
+                comp.competencyId = competency.id;
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should load competency on init if not present', () => {
+        fixture.detectChanges();
+        expect(findByIdStub).toHaveBeenCalledOnce();
+        expect(findByIdStub).toHaveBeenCalledWith(competency.id, 1);
+        expect(comp.competency).toEqual(competency);
+        expect(comp.competencyProgress).toEqual(competencyProgress);
+    });
+
+    it('should not load competency on init if already present', () => {
+        comp.competency = competency;
+        comp.competencyProgress = competencyProgress;
+        fixture.detectChanges();
+        expect(findByIdStub).not.toHaveBeenCalled();
+    });
+
+    it('should default progress to zero if empty', () => {
+        competency.userProgress = undefined;
+        fixture.detectChanges();
+        expect(findByIdStub).toHaveBeenCalledOnce();
+        expect(findByIdStub).toHaveBeenCalledWith(competency.id, 1);
+        expect(comp.competency).toEqual(competency);
+        expect(comp.competencyProgress).toEqual({ confidence: 0, progress: 0 } as CompetencyProgress);
+    });
+});
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
new file mode 100644
index 000000000000..7469f93f790d
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/graph/node-details/exercise-node-details.component.spec.ts
@@ -0,0 +1,55 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../../test.module';
+import { MockPipe } from 'ng-mocks';
+import { of } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module';
+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';
+
+describe('ExerciseNodeDetailsComponent', () => {
+    let fixture: ComponentFixture<ExerciseNodeDetailsComponent>;
+    let comp: ExerciseNodeDetailsComponent;
+    let exerciseService: ExerciseService;
+    let findStub: jest.SpyInstance;
+    let exercise: Exercise;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, NgbTooltipMocksModule],
+            declarations: [ExerciseNodeDetailsComponent, MockPipe(ArtemisTranslatePipe)],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(ExerciseNodeDetailsComponent);
+                comp = fixture.componentInstance;
+                exercise = new TextExercise(undefined, undefined);
+                exercise.id = 1;
+                exercise.title = 'Some arbitrary title';
+
+                exerciseService = TestBed.inject(ExerciseService);
+                findStub = jest.spyOn(exerciseService, 'find').mockReturnValue(of(new HttpResponse({ body: exercise })));
+                comp.exerciseId = exercise.id;
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should load exercise on init if not present', () => {
+        fixture.detectChanges();
+        expect(findStub).toHaveBeenCalledOnce();
+        expect(findStub).toHaveBeenCalledWith(exercise.id);
+        expect(comp.exercise).toEqual(exercise);
+    });
+
+    it('should not load exercise on init if already present', () => {
+        comp.exercise = exercise;
+        fixture.detectChanges();
+        expect(findStub).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/test/javascript/spec/component/learning-paths/graph/node-details/lecture-unit-node-details.component.spec.ts b/src/test/javascript/spec/component/learning-paths/graph/node-details/lecture-unit-node-details.component.spec.ts
new file mode 100644
index 000000000000..13f47328ff5d
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/graph/node-details/lecture-unit-node-details.component.spec.ts
@@ -0,0 +1,57 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../../test.module';
+import { MockPipe } from 'ng-mocks';
+import { of } from 'rxjs';
+import { HttpResponse } from '@angular/common/http';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { NgbTooltipMocksModule } from '../../../../helpers/mocks/directive/ngbTooltipMocks.module';
+import { LectureUnitNodeDetailsComponent } from 'app/course/learning-paths/learning-path-graph/node-details/lecture-unit-node-details.component';
+import { LectureUnitForLearningPathNodeDetailsDTO, LectureUnitType } from 'app/entities/lecture-unit/lectureUnit.model';
+import { LectureUnitService } from 'app/lecture/lecture-unit/lecture-unit-management/lectureUnit.service';
+
+describe('LectureUnitNodeDetailsComponent', () => {
+    let fixture: ComponentFixture<LectureUnitNodeDetailsComponent>;
+    let comp: LectureUnitNodeDetailsComponent;
+    let lectureUnitService: LectureUnitService;
+    let getLectureUnitForLearningPathNodeDetailsStub: jest.SpyInstance;
+    let lectureUnit: LectureUnitForLearningPathNodeDetailsDTO;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, NgbTooltipMocksModule],
+            declarations: [LectureUnitNodeDetailsComponent, MockPipe(ArtemisTranslatePipe)],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(LectureUnitNodeDetailsComponent);
+                comp = fixture.componentInstance;
+                lectureUnit = new LectureUnitForLearningPathNodeDetailsDTO();
+                lectureUnit.id = 1;
+                lectureUnit.name = 'Some arbitrary name';
+                lectureUnit.type = LectureUnitType.TEXT;
+
+                lectureUnitService = TestBed.inject(LectureUnitService);
+                getLectureUnitForLearningPathNodeDetailsStub = jest
+                    .spyOn(lectureUnitService, 'getLectureUnitForLearningPathNodeDetails')
+                    .mockReturnValue(of(new HttpResponse({ body: lectureUnit })));
+                comp.lectureUnitId = lectureUnit.id;
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should load lecture unit on init if not present', () => {
+        fixture.detectChanges();
+        expect(getLectureUnitForLearningPathNodeDetailsStub).toHaveBeenCalledOnce();
+        expect(getLectureUnitForLearningPathNodeDetailsStub).toHaveBeenCalledWith(lectureUnit.id);
+        expect(comp.lectureUnit).toEqual(lectureUnit);
+    });
+
+    it('should not load lecture unit on init if already present', () => {
+        comp.lectureUnit = lectureUnit;
+        fixture.detectChanges();
+        expect(getLectureUnitForLearningPathNodeDetailsStub).not.toHaveBeenCalled();
+    });
+});
diff --git a/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-modal.component.spec.ts b/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-modal.component.spec.ts
new file mode 100644
index 000000000000..f0fc95d2572b
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-modal.component.spec.ts
@@ -0,0 +1,47 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../test.module';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { MockComponent } from 'ng-mocks';
+import { LearningPathProgressModalComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-modal.component';
+import { LearningPathGraphComponent } from 'app/course/learning-paths/learning-path-graph/learning-path-graph.component';
+import { By } from '@angular/platform-browser';
+import { LearningPathProgressNavComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-nav.component';
+import { LearningPathPageableSearchDTO } from 'app/entities/competency/learning-path.model';
+
+describe('LearningPathProgressModalComponent', () => {
+    let fixture: ComponentFixture<LearningPathProgressModalComponent>;
+    let comp: LearningPathProgressModalComponent;
+    let activeModal: NgbActiveModal;
+    let closeStub: jest.SpyInstance;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, MockComponent(LearningPathGraphComponent), MockComponent(LearningPathProgressNavComponent)],
+            declarations: [LearningPathProgressModalComponent],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(LearningPathProgressModalComponent);
+                comp = fixture.componentInstance;
+                activeModal = TestBed.inject(NgbActiveModal);
+                closeStub = jest.spyOn(activeModal, 'close');
+                fixture.detectChanges();
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should display learning path graph if learning path is present', () => {
+        comp.courseId = 2;
+        comp.learningPath = { id: 1 } as LearningPathPageableSearchDTO;
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.graph')).nativeElement).toBeTruthy();
+    });
+
+    it('should correctly close modal', () => {
+        comp.close();
+        expect(closeStub).toHaveBeenCalledOnce();
+    });
+});
diff --git a/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-nav.component.spec.ts b/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-nav.component.spec.ts
new file mode 100644
index 000000000000..f579a9163537
--- /dev/null
+++ b/src/test/javascript/spec/component/learning-paths/management/learning-path-progress-nav.component.spec.ts
@@ -0,0 +1,72 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ArtemisTestModule } from '../../../test.module';
+import { By } from '@angular/platform-browser';
+import { LearningPathProgressNavComponent } from 'app/course/learning-paths/learning-path-management/learning-path-progress-nav.component';
+import { LearningPathPageableSearchDTO } from 'app/entities/competency/learning-path.model';
+import { UserNameAndLoginDTO } from 'app/core/user/user.model';
+import { MockPipe } from 'ng-mocks';
+import { ArtemisTranslatePipe } from 'app/shared/pipes/artemis-translate.pipe';
+import { NgbTooltipMocksModule } from '../../../helpers/mocks/directive/ngbTooltipMocks.module';
+
+describe('LearningPathProgressNavComponent', () => {
+    let fixture: ComponentFixture<LearningPathProgressNavComponent>;
+    let comp: LearningPathProgressNavComponent;
+    let onRefreshStub: jest.SpyInstance;
+    let onCenterViewStub: jest.SpyInstance;
+    let onCloseStub: jest.SpyInstance;
+    let learningPath: LearningPathPageableSearchDTO;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule, NgbTooltipMocksModule],
+            declarations: [LearningPathProgressNavComponent, MockPipe(ArtemisTranslatePipe)],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(LearningPathProgressNavComponent);
+                comp = fixture.componentInstance;
+                onRefreshStub = jest.spyOn(comp.onRefresh, 'emit');
+                onCenterViewStub = jest.spyOn(comp.onCenterView, 'emit');
+                onCloseStub = jest.spyOn(comp.onClose, 'emit');
+                learningPath = new LearningPathPageableSearchDTO();
+                learningPath.user = new UserNameAndLoginDTO();
+                learningPath.user.name = 'some arbitrary name';
+                learningPath.user.login = 'somearbitrarylogin';
+                comp.learningPath = learningPath;
+                fixture.detectChanges();
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should create', () => {
+        expect(fixture).toBeTruthy();
+        expect(comp).toBeTruthy();
+    });
+
+    it('should emit refresh on click', () => {
+        const button = fixture.debugElement.query(By.css('#refresh-button'));
+        expect(button).not.toBeNull();
+
+        button.nativeElement.click();
+        expect(onRefreshStub).toHaveBeenCalledOnce();
+    });
+
+    it('should emit center view on click', () => {
+        const button = fixture.debugElement.query(By.css('#center-button'));
+        expect(button).not.toBeNull();
+
+        button.nativeElement.click();
+        expect(onCenterViewStub).toHaveBeenCalledOnce();
+    });
+
+    it('should emit close on click', () => {
+        const button = fixture.debugElement.query(By.css('#close-button'));
+        expect(button).not.toBeNull();
+
+        button.nativeElement.click();
+        expect(onCloseStub).toHaveBeenCalledOnce();
+    });
+});
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 2a69069e42da..56bd1c1bd962 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
@@ -92,4 +92,9 @@ describe('LectureUnitService', () => {
         expect(service.getLectureUnitReleaseDate(textUnit)).toEqual(textUnit.releaseDate);
         expect(service.getLectureUnitReleaseDate(videoUnit)).toEqual(videoUnit.releaseDate);
     });
+
+    it('should send a request to the server to get ngx representation of learning path', fakeAsync(() => {
+        service.getLectureUnitForLearningPathNodeDetails(1).subscribe();
+        httpMock.expectOne({ method: 'GET', url: 'api/lecture-units/1/for-learning-path-node-details' });
+    }));
 });
diff --git a/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts b/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts
index 1d756fbe3eb7..d6a84e31ae72 100644
--- a/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts
+++ b/src/test/javascript/spec/component/lti/lti13-exercise-launch.component.spec.ts
@@ -90,7 +90,7 @@ describe('Lti13ExerciseLaunchComponent', () => {
         expect(consoleSpy).toHaveBeenCalledOnce();
         expect(consoleSpy).toHaveBeenCalledWith('No LTI targetLinkUri received for a successful launch');
         expect(httpStub).toHaveBeenCalledOnce();
-        expect(httpStub).toHaveBeenCalledWith('api/lti13/auth-login', expect.anything(), expect.anything());
+        expect(httpStub).toHaveBeenCalledWith('api/public/lti13/auth-login', expect.anything(), expect.anything());
 
         expect(comp.isLaunching).toBeFalse();
     });
@@ -104,7 +104,7 @@ describe('Lti13ExerciseLaunchComponent', () => {
         comp.ngOnInit();
 
         expect(httpStub).toHaveBeenCalledOnce();
-        expect(httpStub).toHaveBeenCalledWith('api/lti13/auth-login', expect.anything(), expect.anything());
+        expect(httpStub).toHaveBeenCalledWith('api/public/lti13/auth-login', expect.anything(), expect.anything());
     });
 
     it('onInit launch fails on error', () => {
@@ -118,7 +118,7 @@ describe('Lti13ExerciseLaunchComponent', () => {
         comp.ngOnInit();
 
         expect(httpStub).toHaveBeenCalledOnce();
-        expect(httpStub).toHaveBeenCalledWith('api/lti13/auth-login', expect.anything(), expect.anything());
+        expect(httpStub).toHaveBeenCalledWith('api/public/lti13/auth-login', expect.anything(), expect.anything());
 
         expect(comp.isLaunching).toBeFalse();
     });
diff --git a/src/test/javascript/spec/directive/sticky-popover.directive.spec.ts b/src/test/javascript/spec/directive/sticky-popover.directive.spec.ts
new file mode 100644
index 000000000000..fb62f9d6c7af
--- /dev/null
+++ b/src/test/javascript/spec/directive/sticky-popover.directive.spec.ts
@@ -0,0 +1,74 @@
+import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { Component, DebugElement } from '@angular/core';
+import { ArtemisTestModule } from '../test.module';
+import { By } from '@angular/platform-browser';
+import { StickyPopoverDirective } from 'app/shared/sticky-popover/sticky-popover.directive';
+
+@Component({
+    template: '<div [jhiStickyPopover]="content" placement="right" triggers="manual"></div><ng-template #content><span>some content</span></ng-template>',
+})
+class StickyPopoverComponent {
+    pattern: string;
+}
+
+describe('StickyPopoverDirective', () => {
+    let fixture: ComponentFixture<StickyPopoverComponent>;
+    let debugDirective: DebugElement;
+    let directive: StickyPopoverDirective;
+    let openStub: jest.SpyInstance;
+
+    beforeEach(() => {
+        TestBed.configureTestingModule({
+            imports: [ArtemisTestModule],
+            declarations: [StickyPopoverDirective, StickyPopoverComponent],
+        })
+            .compileComponents()
+            .then(() => {
+                fixture = TestBed.createComponent(StickyPopoverComponent);
+                debugDirective = fixture.debugElement.query(By.directive(StickyPopoverDirective));
+                directive = debugDirective.injector.get(StickyPopoverDirective);
+                openStub = jest.spyOn(directive, 'open');
+                fixture.detectChanges();
+            });
+    });
+
+    afterEach(() => {
+        jest.restoreAllMocks();
+    });
+
+    it('should open on hover', fakeAsync(() => {
+        fixture.whenStable();
+        const div = fixture.debugElement.query(By.css('div'));
+        expect(div).not.toBeNull();
+        div.nativeElement.dispatchEvent(new MouseEvent('pointerenter'));
+        tick(10);
+        expect(openStub).toHaveBeenCalledOnce();
+        expect(directive.isOpen()).toBeTruthy();
+        const span = fixture.debugElement.query(By.css('span'));
+        expect(span).not.toBeNull();
+    }));
+
+    it('should display content on hover', fakeAsync(() => {
+        fixture.whenStable();
+        const div = fixture.debugElement.query(By.css('div'));
+        expect(div).not.toBeNull();
+        div.nativeElement.dispatchEvent(new MouseEvent('pointerenter'));
+        tick(10);
+        const span = fixture.debugElement.query(By.css('span'));
+        expect(span).not.toBeNull();
+    }));
+
+    it('should close on leave', fakeAsync(() => {
+        fixture.whenStable();
+        const div = fixture.debugElement.query(By.css('div'));
+        expect(div).not.toBeNull();
+        div.nativeElement.dispatchEvent(new MouseEvent('pointerenter'));
+        tick(10);
+        let span = fixture.debugElement.query(By.css('span'));
+        expect(span).not.toBeNull();
+        div.nativeElement.dispatchEvent(new MouseEvent('pointerleave'));
+        tick(100);
+        span = fixture.debugElement.query(By.css('span'));
+        expect(span).toBeNull();
+    }));
+});
diff --git a/src/test/javascript/spec/service/learning-path.service.spec.ts b/src/test/javascript/spec/service/learning-path.service.spec.ts
index cbd2601a8266..2375b8c0d377 100644
--- a/src/test/javascript/spec/service/learning-path.service.spec.ts
+++ b/src/test/javascript/spec/service/learning-path.service.spec.ts
@@ -45,4 +45,10 @@ describe('LearningPathService', () => {
         expect(getStub).toHaveBeenCalledOnce();
         expect(getStub).toHaveBeenCalledWith('api/courses/1/learning-path-health', { observe: 'response' });
     });
+
+    it('should send a request to the server to get ngx representation of learning path', () => {
+        learningPathService.getLearningPathNgxGraph(1).subscribe();
+        expect(getStub).toHaveBeenCalledOnce();
+        expect(getStub).toHaveBeenCalledWith('api/learning-path/1/graph', { observe: 'response' });
+    });
 });