diff --git a/rqes-ui-sdk/build.gradle.kts b/rqes-ui-sdk/build.gradle.kts
index adf92f2..d1219d9 100644
--- a/rqes-ui-sdk/build.gradle.kts
+++ b/rqes-ui-sdk/build.gradle.kts
@@ -138,19 +138,17 @@ koverReport {
             packages(
                 "*.ksp.*",
                 "*.di",
-                "*.router",
                 "*.serializer",
                 "*.config",
                 "*.config.*",
+                "*.provider.*",
+                "*.provider",
+                "*.localization.*",
+                "*.localization",
                 "*.infrastructure.*",
                 "*.infrastructure",
-                "*.ui.component.*",
-                "*.ui.component",
-                "*.ui.container",
-                "*.ui.container.*",
-            )
-            classes(
-                "*Screen*",
+                "*.presentation.*",
+                "*.presentation",
             )
         }
     }
diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/extension/UriExtensions.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/extension/UriExtensions.kt
similarity index 97%
rename from rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/extension/UriExtensions.kt
rename to rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/extension/UriExtensions.kt
index d683a1a..40e02c2 100644
--- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/presentation/extension/UriExtensions.kt
+++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/extension/UriExtensions.kt
@@ -14,7 +14,7 @@
  * governing permissions and limitations under the Licence.
  */
 
-package eu.europa.ec.eudi.rqesui.presentation.extension
+package eu.europa.ec.eudi.rqesui.domain.extension
 
 import android.content.Context
 import android.net.Uri
diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/interactor/SuccessInteractor.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/interactor/SuccessInteractor.kt
index 16b87e3..1de11fa 100644
--- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/interactor/SuccessInteractor.kt
+++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/domain/interactor/SuccessInteractor.kt
@@ -23,10 +23,10 @@ import eu.europa.ec.eudi.rqesui.domain.controller.EudiRqesSaveSignedDocumentsPar
 import eu.europa.ec.eudi.rqesui.domain.controller.EudiRqesSignDocumentsPartialState
 import eu.europa.ec.eudi.rqesui.domain.controller.RqesController
 import eu.europa.ec.eudi.rqesui.domain.entities.error.EudiRQESUiError
+import eu.europa.ec.eudi.rqesui.domain.extension.getFileName
 import eu.europa.ec.eudi.rqesui.infrastructure.config.data.DocumentData
 import eu.europa.ec.eudi.rqesui.infrastructure.config.data.QtspData
 import eu.europa.ec.eudi.rqesui.infrastructure.provider.ResourceProvider
-import eu.europa.ec.eudi.rqesui.presentation.extension.getFileName
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
diff --git a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/infrastructure/EudiRQESUi.kt b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/infrastructure/EudiRQESUi.kt
index edee39a..68f5518 100644
--- a/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/infrastructure/EudiRQESUi.kt
+++ b/rqes-ui-sdk/src/main/java/eu/europa/ec/eudi/rqesui/infrastructure/EudiRQESUi.kt
@@ -25,11 +25,11 @@ import android.os.Parcelable
 import eu.europa.ec.eudi.rqes.core.RQESService
 import eu.europa.ec.eudi.rqesui.domain.di.base.EudiRQESUIModule
 import eu.europa.ec.eudi.rqesui.domain.entities.error.EudiRQESUiError
+import eu.europa.ec.eudi.rqesui.domain.extension.getFileName
 import eu.europa.ec.eudi.rqesui.domain.util.Constants.SDK_STATE
 import eu.europa.ec.eudi.rqesui.infrastructure.config.EudiRQESUiConfig
 import eu.europa.ec.eudi.rqesui.infrastructure.config.data.DocumentData
 import eu.europa.ec.eudi.rqesui.infrastructure.config.data.QtspData
-import eu.europa.ec.eudi.rqesui.presentation.extension.getFileName
 import eu.europa.ec.eudi.rqesui.presentation.ui.container.EudiRQESContainer
 import kotlinx.parcelize.Parcelize
 import org.koin.android.ext.koin.androidContext
diff --git a/rqes-ui-sdk/src/test/java/eu/europa/ec/eudi/rqesui/presentation/extension/TestUriExtensionsKt.kt b/rqes-ui-sdk/src/test/java/eu/europa/ec/eudi/rqesui/presentation/extension/TestUriExtensionsKt.kt
index b0e6169..ad94ae2 100644
--- a/rqes-ui-sdk/src/test/java/eu/europa/ec/eudi/rqesui/presentation/extension/TestUriExtensionsKt.kt
+++ b/rqes-ui-sdk/src/test/java/eu/europa/ec/eudi/rqesui/presentation/extension/TestUriExtensionsKt.kt
@@ -21,6 +21,7 @@ import android.content.Context
 import android.database.Cursor
 import android.net.Uri
 import android.provider.OpenableColumns
+import eu.europa.ec.eudi.rqesui.domain.extension.getFileName
 import eu.europa.ec.eudi.rqesui.util.mockedDocumentName
 import junit.framework.TestCase.assertEquals
 import org.junit.After