diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
index 7f30cd69e3740f35f18f1d6423e9eb902c757b0d..8b408752c98f61d9a05e9f1804cb3843a4ff7f3f 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/gitlab/service/OpenCodeGitlabApi.kt
@@ -6,7 +6,7 @@ import de.fraunhofer.iem.app.gitlab.dto.MemberDto
 import de.fraunhofer.iem.app.gitlab.enumeration.AccessLevel
 import de.fraunhofer.iem.app.logger.getLogger
 import de.fraunhofer.iem.app.repository.dto.RepositoryCreateDto
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
 import kotlinx.coroutines.*
 import org.gitlab4j.api.GitLabApi
 import org.gitlab4j.api.models.Commit
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
index 0dc3b48972b841cd1d63f92bb3d592162de30397..197622825b15aaaf18d99a3d21fd8ad1d27003e6 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tool/enumeration/ToolType.kt
@@ -4,6 +4,7 @@ import de.fraunhofer.iem.app.kpi.enumeration.getName
 import de.fraunhofer.iem.app.tool.dto.ToolDto
 import de.fraunhofer.iem.kpiCalculator.model.kpi.KpiId
 
+//XXX: this can be refactored once we have a list of supported tools in the library
 enum class ToolType {
     ORT {
         override fun toViewModel(): ToolDto {
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
index ea1ae18174fc59bb645c53b56265f74ef9ee77c6..05336fa470a90d5d1fa204dab936b1c8859b504b 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/toolRun/service/ToolRunService.kt
@@ -148,7 +148,6 @@ class ToolRunService(
             repositoryService.getToolRunByProjectId(projectId = projectId)
         }
 
-
         val apiJobs: MutableList<Job> = mutableListOf()
 
         if (includeFindings) {
@@ -181,6 +180,4 @@ class ToolRunService(
 
         return toolRun
     }
-
-
 }
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
index 9abf37e2a9d28c786dd280df1f7f23c6be1fa730..866165b49724ea7e3f1ec5db907596b40bd7f215 100644
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
+++ b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/gitlab/service/RepositoryDetailsService.kt
@@ -1,9 +1,9 @@
 package de.fraunhofer.iem.app.tools.gitlab.service
 
 import de.fraunhofer.iem.app.gitlab.service.OpenCodeGitlabApi
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
 import de.fraunhofer.iem.app.tool.dto.CreateToolDto
 import de.fraunhofer.iem.app.tool.enumeration.ToolType
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
 import org.springframework.stereotype.Service
 
 @Service
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt
deleted file mode 100644
index 511401a6936858d604ab03253fb6fd3757973f40..0000000000000000000000000000000000000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/SecretResultsJson.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class SecretResultsJson(
-    @SerialName("tool_secrets")
-    val toolSecrets: List<ToolSecretJson> = listOf()
-)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt
deleted file mode 100644
index 9f0f065365f9a8c3f081089179517f259ba73586..0000000000000000000000000000000000000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretJson.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ToolSecretJson(
-    @SerialName("name")
-    val name: String,
-    @SerialName("secrets")
-    val secrets: List<String> = mutableListOf()
-)
diff --git a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt b/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt
deleted file mode 100644
index 4be785412a85ee8b7a15dc7249f2200bc57b1d0a..0000000000000000000000000000000000000000
--- a/app/backend/src/main/kotlin/de/fraunhofer/iem/app/tools/occmd/json/ToolSecretResultJson.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.fraunhofer.iem.app.tools.occmd.json
-
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ToolSecretResultJson(
-    @SerialName("name")
-    val name: String,
-    @SerialName("secrets")
-    val toolSecrets: List<ToolSecretJson> = listOf()
-)
diff --git a/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt b/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
index 4d79696714eb16cfdccde00638c229c3ae958649..b87799fbd92682ee75f724f7216cc370bb85aee8 100644
--- a/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
+++ b/kpi-calculator/adapter/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/adapter/vcs/VcsAdapter.kt
@@ -1,9 +1,9 @@
 package de.fraunhofer.iem.kpiCalculator.adapter.vcs
 
-import de.fraunhofer.iem.app.repository.dto.RepositoryDetailsDto
 import de.fraunhofer.iem.kpiCalculator.adapter.KpiAdapter
 import de.fraunhofer.iem.kpiCalculator.model.adapter.AdapterResult
 import de.fraunhofer.iem.kpiCalculator.model.adapter.ErrorType
+import de.fraunhofer.iem.kpiCalculator.model.adapter.vcs.RepositoryDetailsDto
 import de.fraunhofer.iem.kpiCalculator.model.kpi.KpiId
 import de.fraunhofer.iem.kpiCalculator.model.kpi.RawValueKpi
 
diff --git a/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt b/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
index 117285279a7245c94eda2cd3d6805bfc40fee397..7966827d75aee4a9e4a6a9e2647045db925036c0 100644
--- a/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
+++ b/kpi-calculator/model/src/main/kotlin/de/fraunhofer/iem/kpiCalculator/model/adapter/vcs/RepositoryDetailsDto.kt
@@ -1,4 +1,4 @@
-package de.fraunhofer.iem.app.repository.dto
+package de.fraunhofer.iem.kpiCalculator.model.adapter.vcs
 
 data class RepositoryDetailsDto(
     val projectId: Long,