diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
index dc9ac3d..524b56d 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
@@ -9,6 +9,9 @@ import jakarta.mail.Store
 import jakarta.mail.event.MessageCountAdapter
 import jakarta.mail.event.MessageCountEvent
 import kotlinx.coroutines.*
+import net.codinux.invoicing.email.model.EmailAccount
+import net.codinux.invoicing.email.model.EmailAttachmentWithEInvoice
+import net.codinux.invoicing.email.model.EmailWithInvoice
 import net.codinux.invoicing.model.Invoice
 import net.codinux.invoicing.reader.EInvoiceReader
 import net.codinux.log.logger
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
index 2159aa9..878b5e4 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
@@ -1,5 +1,7 @@
 package net.codinux.invoicing.email
 
+import net.codinux.invoicing.email.model.EmailWithInvoice
+
 open class FetchEmailsOptions(
     val downloadMessageBody: Boolean = false,
     val emailFolderName: String = "INBOX",
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
index 0b99307..9bb30a7 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
@@ -1,5 +1,7 @@
 package net.codinux.invoicing.email
 
+import net.codinux.invoicing.email.model.EmailWithInvoice
+
 data class FetchEmailsResult(
     val emails: List<EmailWithInvoice>,
     val overallError: Throwable?,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
index b56be09..faf8c7b 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/ListenForNewMailsOptions.kt
@@ -1,5 +1,7 @@
 package net.codinux.invoicing.email
 
+import net.codinux.invoicing.email.model.EmailWithInvoice
+
 open class ListenForNewMailsOptions(
     downloadMessageBody: Boolean = false,
     emailFolderName: String = "INBOX",
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAccount.kt
similarity index 91%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAccount.kt
index 6185b99..785f90f 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAccount.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.email
+package net.codinux.invoicing.email.model
 
 class EmailAccount(
     val username: String,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAttachmentWithEInvoice.kt
similarity index 90%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAttachmentWithEInvoice.kt
index 759baac..e83dd52 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailAttachmentWithEInvoice.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.email
+package net.codinux.invoicing.email.model
 
 import net.codinux.invoicing.model.Invoice
 import java.io.File
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailWithInvoice.kt
similarity index 95%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailWithInvoice.kt
index 12a147c..7ae85c1 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/model/EmailWithInvoice.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.email
+package net.codinux.invoicing.email.model
 
 import java.time.Instant
 import java.time.ZoneId
diff --git a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/Demonstration.kt b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/Demonstration.kt
index 3f9eefd..2009aac 100644
--- a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/Demonstration.kt
+++ b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/Demonstration.kt
@@ -1,7 +1,7 @@
 package net.codinux.invoicing
 
 import net.codinux.invoicing.creation.EInvoiceCreator
-import net.codinux.invoicing.email.EmailAccount
+import net.codinux.invoicing.email.model.EmailAccount
 import net.codinux.invoicing.email.EmailsFetcher
 import net.codinux.invoicing.model.Invoice
 import net.codinux.invoicing.model.InvoiceItem
diff --git a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
index 63f9c52..9bb1414 100644
--- a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
+++ b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
@@ -3,6 +3,7 @@ package net.codinux.invoicing.email
 import assertk.assertThat
 import assertk.assertions.isEmpty
 import assertk.assertions.isNotEmpty
+import net.codinux.invoicing.email.model.EmailAccount
 import org.junit.jupiter.api.Test
 import kotlin.test.Ignore