diff --git a/.gitignore b/.gitignore
index 6efb847..976a0e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,8 @@ Package.resolved
 fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots/**/*.png
-fastlane/test_output
\ No newline at end of file
+fastlane/test_output
+fastlane/*.xcresult
+
+#XCOV
+xcov_output
\ No newline at end of file
diff --git a/Sources/Presentation/Entities/DocumentData.swift b/Sources/Domain/Entities/DocumentData.swift
similarity index 100%
rename from Sources/Presentation/Entities/DocumentData.swift
rename to Sources/Domain/Entities/DocumentData.swift
diff --git a/Sources/Presentation/Entities/QTSPData.swift b/Sources/Domain/Entities/QTSPData.swift
similarity index 100%
rename from Sources/Presentation/Entities/QTSPData.swift
rename to Sources/Domain/Entities/QTSPData.swift
diff --git a/Tests/Mock/GeneratedMocks.swift b/Tests/Mock/GeneratedMocks.swift
index 3997de2..7a5f75d 100644
--- a/Tests/Mock/GeneratedMocks.swift
+++ b/Tests/Mock/GeneratedMocks.swift
@@ -704,6 +704,13 @@ class DIGraphTypeStub:DIGraphType, @unchecked Sendable {
 
 
 
+// MARK: - Mocks generated from file: 'Sources/Domain/Entities/DocumentData.swift'
+
+import Cuckoo
+@testable import EudiRQESUi
+
+
+
 // MARK: - Mocks generated from file: 'Sources/Domain/Entities/Error/EudiRQESUiError.swift'
 
 import Cuckoo
@@ -719,6 +726,13 @@ import Cuckoo
 
 
 
+// MARK: - Mocks generated from file: 'Sources/Domain/Entities/QTSPData.swift'
+
+import Cuckoo
+@testable import EudiRQESUi
+
+
+
 // MARK: - Mocks generated from file: 'Sources/Domain/Extension/Document+Extensions.swift'
 
 import Cuckoo
@@ -2218,20 +2232,6 @@ import RqesKit
 
 
 
-// MARK: - Mocks generated from file: 'Sources/Presentation/Entities/DocumentData.swift'
-
-import Cuckoo
-@testable import EudiRQESUi
-
-
-
-// MARK: - Mocks generated from file: 'Sources/Presentation/Entities/QTSPData.swift'
-
-import Cuckoo
-@testable import EudiRQESUi
-
-
-
 // MARK: - Mocks generated from file: 'Sources/Presentation/Extension/UIApplication+Extensions.swift'
 
 import Cuckoo
diff --git a/fastlane/.env.dev b/fastlane/.env.dev
index 2655ebe..d742d55 100644
--- a/fastlane/.env.dev
+++ b/fastlane/.env.dev
@@ -1 +1,2 @@
-DEV_REMOTE_REPO = https://github.com/niscy-eudiw/eudi-lib-ios-rqes-ui.git
\ No newline at end of file
+DEV_REMOTE_REPO = https://github.com/niscy-eudiw/eudi-lib-ios-rqes-ui.git
+SCHEME = EudiRQESUi
\ No newline at end of file
diff --git a/fastlane/.env.release b/fastlane/.env.release
index ad0f525..06c4214 100644
--- a/fastlane/.env.release
+++ b/fastlane/.env.release
@@ -1,2 +1,3 @@
 PROD_REMOTE_REPO = https://github.com/eu-digital-identity-wallet/eudi-lib-ios-rqes-ui.git
-DEV_REMOTE_REPO = https://github.com/niscy-eudiw/eudi-lib-ios-rqes-ui.git
\ No newline at end of file
+DEV_REMOTE_REPO = https://github.com/niscy-eudiw/eudi-lib-ios-rqes-ui.git
+SCHEME = EudiRQESUi
\ No newline at end of file
diff --git a/fastlane/.xcovignore b/fastlane/.xcovignore
new file mode 100644
index 0000000..547f004
--- /dev/null
+++ b/fastlane/.xcovignore
@@ -0,0 +1,33 @@
+# Tests
+- GeneratedMocks.swift
+- Test.*.swift
+
+# Config
+- .*Config.*.swift
+- Config.*.swift
+
+# Views/Components
+- ViewModel.swift
+- .*View.swift
+- .*ViewController.swift
+- .*ViewModel.swift
+- .*Shape.swift
+- .*Style.swift
+- .*Styles.swift
+- .*Modifier.swift
+- .*Content.swift
+- .*UIModel.swift
+
+# Logic
+- .*Manager.swift
+- .*Graph.swift
+- .*Assembly.swift
+
+# Controller
+- LogController.swift
+
+# Entry
+- EudiRQESUi.swift
+
+# Extensions
+- .*Extensions.swift
\ No newline at end of file
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1192878..c93c2ee 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -19,9 +19,12 @@ platform :ios do
 
 desc "Run package tests with coverage"
 lane :test do
+
+  FileUtils.remove_dir "../xcov_output", true
+
   params = {
     package_path: '.',
-    scheme: 'EudiRQESUi',
+    scheme: ENV['SCHEME'],
     devices: ['iPhone 16 Pro Max'], 
     result_bundle: true
   }
@@ -31,6 +34,17 @@ lane :test do
   end
 
   run_tests(params)
+
+  xcov(
+    scheme: ENV['SCHEME'],
+    output_directory: "xcov_output",
+    is_swift_package: true
+  )
+
+  if ENV['CI'] != 'true'
+    sh 'open ../xcov_output/index.html'
+  end
+
 end
 
 desc "Deploy tags"