diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAccount.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt
similarity index 92%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAccount.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt
index b62b402..6185b99 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAccount.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAccount.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 class EmailAccount(
     val username: String,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAttachmentWithEInvoice.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt
similarity index 91%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAttachmentWithEInvoice.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt
index 5bbd759..759baac 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailAttachmentWithEInvoice.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailAttachmentWithEInvoice.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 import net.codinux.invoicing.model.Invoice
 import java.io.File
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailWithInvoice.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt
similarity index 96%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailWithInvoice.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt
index 56d8192..12a147c 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailWithInvoice.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailWithInvoice.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 import java.time.Instant
 import java.time.ZoneId
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailsFetcher.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
similarity index 99%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailsFetcher.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
index 873fc53..a000e85 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/EmailsFetcher.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/EmailsFetcher.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 import jakarta.mail.Folder
 import jakarta.mail.Message
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsError.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsError.kt
similarity index 76%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsError.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsError.kt
index e39c29b..d37ebc7 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsError.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsError.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 data class FetchEmailsError(
     val type: FetchEmailsErrorType,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsErrorType.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsErrorType.kt
similarity index 78%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsErrorType.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsErrorType.kt
index da1ce6b..16b3c56 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsErrorType.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsErrorType.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 enum class FetchEmailsErrorType {
     GetEmail,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsOptions.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
similarity index 67%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsOptions.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
index 3e05f00..161dab0 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsOptions.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsOptions.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 data class FetchEmailsOptions(
     val downloadMessageBody: Boolean = false
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsResult.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
similarity index 82%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsResult.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
index 2c504d6..0b99307 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsResult.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsResult.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 data class FetchEmailsResult(
     val emails: List<EmailWithInvoice>,
diff --git a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsStatus.kt b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsStatus.kt
similarity index 96%
rename from e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsStatus.kt
rename to e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsStatus.kt
index a1a0abd..5f40b72 100644
--- a/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/mail/FetchEmailsStatus.kt
+++ b/e-invoice-domain/src/main/kotlin/net/codinux/invoicing/email/FetchEmailsStatus.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 import jakarta.mail.BodyPart
 import jakarta.mail.Message
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 875ef98..3f9eefd 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,8 +1,8 @@
 package net.codinux.invoicing
 
 import net.codinux.invoicing.creation.EInvoiceCreator
-import net.codinux.invoicing.mail.EmailAccount
-import net.codinux.invoicing.mail.EmailsFetcher
+import net.codinux.invoicing.email.EmailAccount
+import net.codinux.invoicing.email.EmailsFetcher
 import net.codinux.invoicing.model.Invoice
 import net.codinux.invoicing.model.InvoiceItem
 import net.codinux.invoicing.model.Party
diff --git a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/mail/EmailsFetcherTest.kt b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
similarity index 96%
rename from e-invoice-domain/src/test/kotlin/net/codinux/invoicing/mail/EmailsFetcherTest.kt
rename to e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
index ff2f0a5..f3e984a 100644
--- a/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/mail/EmailsFetcherTest.kt
+++ b/e-invoice-domain/src/test/kotlin/net/codinux/invoicing/email/EmailsFetcherTest.kt
@@ -1,4 +1,4 @@
-package net.codinux.invoicing.mail
+package net.codinux.invoicing.email
 
 import assertk.assertThat
 import assertk.assertions.isEmpty