diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/Invoice.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/Invoice.java
similarity index 66%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/Invoice.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/Invoice.java
index 10de121..1d16733 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/Invoice.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/Invoice.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.api;
+package io.reflectoring.boundaries.billing.api;
 
 import lombok.Value;
 
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/InvoiceCalculator.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/InvoiceCalculator.java
similarity index 73%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/InvoiceCalculator.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/InvoiceCalculator.java
index ad49eac..5841cc1 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/api/InvoiceCalculator.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/api/InvoiceCalculator.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.api;
+package io.reflectoring.boundaries.billing.api;
 
 import java.time.LocalDate;
 
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/BillingService.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/BillingService.java
similarity index 62%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/BillingService.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/BillingService.java
index a15f8fd..5ca050c 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/BillingService.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/BillingService.java
@@ -1,9 +1,9 @@
-package io.reflectoring.boundaries.billingmodule.internal;
+package io.reflectoring.boundaries.billing.internal;
 
-import io.reflectoring.boundaries.billingmodule.api.Invoice;
-import io.reflectoring.boundaries.billingmodule.api.InvoiceCalculator;
-import io.reflectoring.boundaries.billingmodule.internal.database.api.LineItem;
-import io.reflectoring.boundaries.billingmodule.internal.database.api.ReadLineItems;
+import io.reflectoring.boundaries.billing.api.Invoice;
+import io.reflectoring.boundaries.billing.api.InvoiceCalculator;
+import io.reflectoring.boundaries.billing.internal.database.api.LineItem;
+import io.reflectoring.boundaries.billing.internal.database.api.ReadLineItems;
 import java.time.LocalDate;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/BatchJobConfiguration.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/BatchJobConfiguration.java
similarity index 77%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/BatchJobConfiguration.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/BatchJobConfiguration.java
index 0ad9267..37e1384 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/BatchJobConfiguration.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/BatchJobConfiguration.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.batchjob.internal;
+package io.reflectoring.boundaries.billing.internal.batchjob.internal;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/LoadInvoiceDataBatchJob.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/LoadInvoiceDataBatchJob.java
similarity index 82%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/LoadInvoiceDataBatchJob.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/LoadInvoiceDataBatchJob.java
index 8ea386a..aeb882c 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/LoadInvoiceDataBatchJob.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/LoadInvoiceDataBatchJob.java
@@ -1,7 +1,7 @@
-package io.reflectoring.boundaries.billingmodule.internal.batchjob.internal;
+package io.reflectoring.boundaries.billing.internal.batchjob.internal;
 
-import io.reflectoring.boundaries.billingmodule.internal.database.api.WriteLineItems;
-import io.reflectoring.boundaries.billingmodule.internal.database.api.LineItem;
+import io.reflectoring.boundaries.billing.internal.database.api.WriteLineItems;
+import io.reflectoring.boundaries.billing.internal.database.api.LineItem;
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.List;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/package-info.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/package-info.java
new file mode 100644
index 0000000..e179488
--- /dev/null
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/batchjob/internal/package-info.java
@@ -0,0 +1,4 @@
+@InternalPackage
+package io.reflectoring.boundaries.billing.internal.batchjob.internal;
+
+import io.reflectoring.boundaries.InternalPackage;
\ No newline at end of file
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/LineItem.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/LineItem.java
similarity index 74%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/LineItem.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/LineItem.java
index a9f9566..233298d 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/LineItem.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/LineItem.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.api;
+package io.reflectoring.boundaries.billing.internal.database.api;
 
 import java.time.LocalDate;
 import lombok.Value;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/ReadLineItems.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/ReadLineItems.java
similarity index 71%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/ReadLineItems.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/ReadLineItems.java
index c2084a9..32419d7 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/ReadLineItems.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/ReadLineItems.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.api;
+package io.reflectoring.boundaries.billing.internal.database.api;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/WriteLineItems.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/WriteLineItems.java
similarity index 60%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/WriteLineItems.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/WriteLineItems.java
index 60138a0..3516587 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/api/WriteLineItems.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/api/WriteLineItems.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.api;
+package io.reflectoring.boundaries.billing.internal.database.api;
 
 import java.util.List;
 
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabase.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabase.java
similarity index 71%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabase.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabase.java
index 7a8b53a..a7e2a57 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabase.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabase.java
@@ -1,8 +1,8 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.internal;
+package io.reflectoring.boundaries.billing.internal.database.internal;
 
-import io.reflectoring.boundaries.billingmodule.internal.database.api.LineItem;
-import io.reflectoring.boundaries.billingmodule.internal.database.api.ReadLineItems;
-import io.reflectoring.boundaries.billingmodule.internal.database.api.WriteLineItems;
+import io.reflectoring.boundaries.billing.internal.database.api.LineItem;
+import io.reflectoring.boundaries.billing.internal.database.api.ReadLineItems;
+import io.reflectoring.boundaries.billing.internal.database.api.WriteLineItems;
 import java.time.LocalDate;
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabaseConfiguration.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabaseConfiguration.java
similarity index 79%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabaseConfiguration.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabaseConfiguration.java
index b907fb7..06b0b92 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/BillingDatabaseConfiguration.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/BillingDatabaseConfiguration.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.internal;
+package io.reflectoring.boundaries.billing.internal.database.internal;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemJpaEntity.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemJpaEntity.java
similarity index 83%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemJpaEntity.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemJpaEntity.java
index c9f9207..19674bd 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemJpaEntity.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemJpaEntity.java
@@ -1,6 +1,6 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.internal;
+package io.reflectoring.boundaries.billing.internal.database.internal;
 
-import io.reflectoring.boundaries.billingmodule.internal.database.api.LineItem;
+import io.reflectoring.boundaries.billing.internal.database.api.LineItem;
 import java.time.LocalDate;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemRepository.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemRepository.java
similarity index 79%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemRepository.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemRepository.java
index 088a5ff..a825f65 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/LineItemRepository.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/LineItemRepository.java
@@ -1,4 +1,4 @@
-package io.reflectoring.boundaries.billingmodule.internal.database.internal;
+package io.reflectoring.boundaries.billing.internal.database.internal;
 
 import java.time.LocalDate;
 import java.util.List;
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/package-info.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/package-info.java
new file mode 100644
index 0000000..cb42152
--- /dev/null
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/database/internal/package-info.java
@@ -0,0 +1,4 @@
+@InternalPackage
+package io.reflectoring.boundaries.billing.internal.database.internal;
+
+import io.reflectoring.boundaries.InternalPackage;
\ No newline at end of file
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/package-info.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/package-info.java
similarity index 53%
rename from spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/package-info.java
rename to spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/package-info.java
index 22da6f8..283101b 100644
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/package-info.java
+++ b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billing/internal/package-info.java
@@ -1,4 +1,4 @@
 @InternalPackage
-package io.reflectoring.boundaries.billingmodule.internal;
+package io.reflectoring.boundaries.billing.internal;
 
 import io.reflectoring.boundaries.InternalPackage;
\ No newline at end of file
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/package-info.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/package-info.java
deleted file mode 100644
index 7fc8c2f..0000000
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/batchjob/internal/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@InternalPackage
-package io.reflectoring.boundaries.billingmodule.internal.batchjob.internal;
-
-import io.reflectoring.boundaries.InternalPackage;
\ No newline at end of file
diff --git a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/package-info.java b/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/package-info.java
deleted file mode 100644
index ce88c5b..0000000
--- a/spring-boot/boundaries/src/main/java/io/reflectoring/boundaries/billingmodule/internal/database/internal/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@InternalPackage
-package io.reflectoring.boundaries.billingmodule.internal.database.internal;
-
-import io.reflectoring.boundaries.InternalPackage;
\ No newline at end of file