diff --git a/pom.xml b/pom.xml
index a2da2cd1..0c71d711 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 	<properties>
 		<dev>/dev</dev>
 		<java.version>11</java.version>
-		<moduliths.version>1.0.0.RC2</moduliths.version>
+		<moduliths.version>1.0.0.BUILD-SNAPSHOT</moduliths.version>
 	</properties>
 
 	<profiles>
@@ -140,20 +140,20 @@
 		</dependency>
 
 		<dependency>
-			<groupId>de.olivergierke.moduliths</groupId>
+			<groupId>org.moduliths</groupId>
 			<artifactId>moduliths-core</artifactId>
 			<version>${moduliths.version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>de.olivergierke.moduliths</groupId>
+			<groupId>org.moduliths</groupId>
 			<artifactId>moduliths-test</artifactId>
 			<version>${moduliths.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>de.olivergierke.moduliths</groupId>
+			<groupId>org.moduliths</groupId>
 			<artifactId>moduliths-docs</artifactId>
 			<version>${moduliths.version}</version>
 			<scope>test</scope>
diff --git a/src/main/java/org/salespointframework/EnableSalespoint.java b/src/main/java/org/salespointframework/EnableSalespoint.java
index bd7f10ba..97886e56 100644
--- a/src/main/java/org/salespointframework/EnableSalespoint.java
+++ b/src/main/java/org/salespointframework/EnableSalespoint.java
@@ -15,14 +15,13 @@
  */
 package org.salespointframework;
 
-import de.olivergierke.moduliths.Modulithic;
-
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.moduliths.Modulithic;
 import org.salespointframework.EnableSalespoint.SalespointSecurityAutoConfiguration;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/src/main/java/org/salespointframework/accountancy/package-info.java b/src/main/java/org/salespointframework/accountancy/package-info.java
index dbdb1263..af93de1e 100644
--- a/src/main/java/org/salespointframework/accountancy/package-info.java
+++ b/src/main/java/org/salespointframework/accountancy/package-info.java
@@ -4,5 +4,5 @@
  * @see http://en.wikipedia.org/wiki/Accounting
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Accountancy")
+@org.moduliths.Module(displayName = "Salespoint :: Accountancy")
 package org.salespointframework.accountancy;
diff --git a/src/main/java/org/salespointframework/catalog/package-info.java b/src/main/java/org/salespointframework/catalog/package-info.java
index 576751f2..57953a75 100644
--- a/src/main/java/org/salespointframework/catalog/package-info.java
+++ b/src/main/java/org/salespointframework/catalog/package-info.java
@@ -2,5 +2,5 @@
  * A {@link org.salespointframework.catalog.Catalog} maintaining {@link org.salespointframework.catalog.Product}s.
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Catalog")
+@org.moduliths.Module(displayName = "Salespoint :: Catalog")
 package org.salespointframework.catalog;
diff --git a/src/main/java/org/salespointframework/core/package-info.java b/src/main/java/org/salespointframework/core/package-info.java
index 31e9e8da..803979fb 100644
--- a/src/main/java/org/salespointframework/core/package-info.java
+++ b/src/main/java/org/salespointframework/core/package-info.java
@@ -2,5 +2,5 @@
  * Core Salespoint types.
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Core")
+@org.moduliths.Module(displayName = "Salespoint :: Core")
 package org.salespointframework.core;
diff --git a/src/main/java/org/salespointframework/inventory/package-info.java b/src/main/java/org/salespointframework/inventory/package-info.java
index ed96e157..e8e3c531 100644
--- a/src/main/java/org/salespointframework/inventory/package-info.java
+++ b/src/main/java/org/salespointframework/inventory/package-info.java
@@ -5,5 +5,5 @@
  * @see org.salespointframework.inventory.UniqueInventory
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Inventory")
+@org.moduliths.Module(displayName = "Salespoint :: Inventory")
 package org.salespointframework.inventory;
diff --git a/src/main/java/org/salespointframework/order/package-info.java b/src/main/java/org/salespointframework/order/package-info.java
index 4fee1db1..24721c8a 100644
--- a/src/main/java/org/salespointframework/order/package-info.java
+++ b/src/main/java/org/salespointframework/order/package-info.java
@@ -4,5 +4,5 @@
  * @see org.salespointframework.order.OrderManager
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Order")
+@org.moduliths.Module(displayName = "Salespoint :: Order")
 package org.salespointframework.order;
diff --git a/src/main/java/org/salespointframework/payment/package-info.java b/src/main/java/org/salespointframework/payment/package-info.java
index 978ef1ba..899fff0d 100644
--- a/src/main/java/org/salespointframework/payment/package-info.java
+++ b/src/main/java/org/salespointframework/payment/package-info.java
@@ -2,5 +2,5 @@
  * The payment subsystem with domain types to capture payment information (credit cards etc.).
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Payment")
+@org.moduliths.Module(displayName = "Salespoint :: Payment")
 package org.salespointframework.payment;
diff --git a/src/main/java/org/salespointframework/quantity/package-info.java b/src/main/java/org/salespointframework/quantity/package-info.java
index 47aa959d..ad9ab852 100644
--- a/src/main/java/org/salespointframework/quantity/package-info.java
+++ b/src/main/java/org/salespointframework/quantity/package-info.java
@@ -4,5 +4,5 @@
  * @see org.salespointframework.quantity.Quantity
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Quantity")
+@org.moduliths.Module(displayName = "Salespoint :: Quantity")
 package org.salespointframework.quantity;
diff --git a/src/main/java/org/salespointframework/support/package-info.java b/src/main/java/org/salespointframework/support/package-info.java
index 777ad582..648ba235 100644
--- a/src/main/java/org/salespointframework/support/package-info.java
+++ b/src/main/java/org/salespointframework/support/package-info.java
@@ -2,5 +2,5 @@
  * Infrastrcuture support classes. Usually not intended to be used by application code.
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Support")
+@org.moduliths.Module(displayName = "Salespoint :: Support")
 package org.salespointframework.support;
diff --git a/src/main/java/org/salespointframework/time/package-info.java b/src/main/java/org/salespointframework/time/package-info.java
index a419bb6d..0554df5d 100644
--- a/src/main/java/org/salespointframework/time/package-info.java
+++ b/src/main/java/org/salespointframework/time/package-info.java
@@ -4,5 +4,5 @@
  * @see org.salespointframework.time.BusinessTime
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: Time")
+@org.moduliths.Module(displayName = "Salespoint :: Time")
 package org.salespointframework.time;
diff --git a/src/main/java/org/salespointframework/useraccount/package-info.java b/src/main/java/org/salespointframework/useraccount/package-info.java
index b856b51a..a350d78f 100644
--- a/src/main/java/org/salespointframework/useraccount/package-info.java
+++ b/src/main/java/org/salespointframework/useraccount/package-info.java
@@ -4,5 +4,5 @@
  * @see org.salespointframework.useraccount.UserAccountManager
  */
 @org.springframework.lang.NonNullApi
-@de.olivergierke.moduliths.Module(displayName = "Salespoint :: User Account")
+@org.moduliths.Module(displayName = "Salespoint :: User Account")
 package org.salespointframework.useraccount;
diff --git a/src/test/java/org/salespointframework/SalespointApplicationConfigurationTests.java b/src/test/java/org/salespointframework/SalespointApplicationConfigurationTests.java
index d25173ce..eb8b3bdb 100644
--- a/src/test/java/org/salespointframework/SalespointApplicationConfigurationTests.java
+++ b/src/test/java/org/salespointframework/SalespointApplicationConfigurationTests.java
@@ -20,14 +20,13 @@
 import static org.hamcrest.Matchers.not;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
-import de.olivergierke.modulith.docs.Documenter;
-import de.olivergierke.modulith.docs.Documenter.Options;
-import de.olivergierke.moduliths.model.Modules;
-
 import java.io.IOException;
 import java.util.List;
 
 import org.junit.jupiter.api.Test;
+import org.modulith.docs.Documenter;
+import org.modulith.docs.Documenter.Options;
+import org.moduliths.model.Modules;
 import org.salespointframework.catalog.Catalog;
 import org.salespointframework.catalog.Product;
 import org.salespointframework.core.DataInitializer;
diff --git a/src/test/java/org/salespointframework/accountancy/AccountancyRepositoryTests.java b/src/test/java/org/salespointframework/accountancy/AccountancyRepositoryTests.java
index 660febe7..e4020130 100644
--- a/src/test/java/org/salespointframework/accountancy/AccountancyRepositoryTests.java
+++ b/src/test/java/org/salespointframework/accountancy/AccountancyRepositoryTests.java
@@ -17,13 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
-
 import java.time.LocalDateTime;
 
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
+import org.moduliths.test.ModuleTest.BootstrapMode;
 import org.salespointframework.core.Currencies;
 import org.salespointframework.time.Interval;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +30,7 @@
 
 /**
  * Integration tests for {@link AccountancyEntryRepository}.
- * 
+ *
  * @author Oliver Gierke
  */
 @Transactional
diff --git a/src/test/java/org/salespointframework/accountancy/AccountancyTests.java b/src/test/java/org/salespointframework/accountancy/AccountancyTests.java
index 19fa92dc..f8acb73f 100644
--- a/src/test/java/org/salespointframework/accountancy/AccountancyTests.java
+++ b/src/test/java/org/salespointframework/accountancy/AccountancyTests.java
@@ -15,14 +15,13 @@
  */
 package org.salespointframework.accountancy;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
-
 import java.time.LocalDateTime;
 
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
+import org.moduliths.test.ModuleTest.BootstrapMode;
 import org.salespointframework.core.Currencies;
 import org.salespointframework.order.Order;
 import org.salespointframework.order.OrderIdentifier;
diff --git a/src/test/java/org/salespointframework/catalog/CatalogIntegrationTests.java b/src/test/java/org/salespointframework/catalog/CatalogIntegrationTests.java
index 27ac0dce..2eaaa7f5 100644
--- a/src/test/java/org/salespointframework/catalog/CatalogIntegrationTests.java
+++ b/src/test/java/org/salespointframework/catalog/CatalogIntegrationTests.java
@@ -19,14 +19,13 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import java.util.Optional;
 
 import org.hamcrest.Matchers;
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.core.Currencies;
 import org.salespointframework.quantity.Metric;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/salespointframework/inventory/InventoryTests.java b/src/test/java/org/salespointframework/inventory/InventoryTests.java
index c7e33642..7dbeeee1 100644
--- a/src/test/java/org/salespointframework/inventory/InventoryTests.java
+++ b/src/test/java/org/salespointframework/inventory/InventoryTests.java
@@ -20,8 +20,6 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import java.util.Map;
 import java.util.function.Function;
 
@@ -34,6 +32,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.catalog.Catalog;
 import org.salespointframework.catalog.Cookie;
 import org.salespointframework.catalog.Product;
diff --git a/src/test/java/org/salespointframework/order/CartIntegrationTests.java b/src/test/java/org/salespointframework/order/CartIntegrationTests.java
index 688a8688..2a3865fc 100644
--- a/src/test/java/org/salespointframework/order/CartIntegrationTests.java
+++ b/src/test/java/org/salespointframework/order/CartIntegrationTests.java
@@ -18,11 +18,10 @@
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.junit.MatcherAssert.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
-
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
+import org.moduliths.test.ModuleTest.BootstrapMode;
 import org.salespointframework.catalog.Product;
 import org.salespointframework.core.Currencies;
 import org.salespointframework.quantity.Quantity;
diff --git a/src/test/java/org/salespointframework/order/OrderCustomizationTests.java b/src/test/java/org/salespointframework/order/OrderCustomizationTests.java
index e36395fb..054918b0 100644
--- a/src/test/java/org/salespointframework/order/OrderCustomizationTests.java
+++ b/src/test/java/org/salespointframework/order/OrderCustomizationTests.java
@@ -17,11 +17,11 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
 import lombok.RequiredArgsConstructor;
 
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
+import org.moduliths.test.ModuleTest.BootstrapMode;
 import org.salespointframework.useraccount.Password.UnencryptedPassword;
 import org.salespointframework.useraccount.UserAccount;
 import org.salespointframework.useraccount.UserAccountManager;
diff --git a/src/test/java/org/salespointframework/order/OrderTests.java b/src/test/java/org/salespointframework/order/OrderTests.java
index 6aa24a4a..7cc38626 100644
--- a/src/test/java/org/salespointframework/order/OrderTests.java
+++ b/src/test/java/org/salespointframework/order/OrderTests.java
@@ -20,12 +20,11 @@
 import static org.salespointframework.core.Currencies.*;
 import static org.salespointframework.order.OrderStatus.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-import de.olivergierke.moduliths.test.ModuleTest.BootstrapMode;
-
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
+import org.moduliths.test.ModuleTest.BootstrapMode;
 import org.salespointframework.catalog.Catalog;
 import org.salespointframework.catalog.Product;
 import org.salespointframework.order.ChargeLine.AttachedChargeLine;
diff --git a/src/test/java/org/salespointframework/support/JpaEntityConverterIntegrationTests.java b/src/test/java/org/salespointframework/support/JpaEntityConverterIntegrationTests.java
index dabd4aa6..e83818f2 100644
--- a/src/test/java/org/salespointframework/support/JpaEntityConverterIntegrationTests.java
+++ b/src/test/java/org/salespointframework/support/JpaEntityConverterIntegrationTests.java
@@ -18,10 +18,9 @@
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.junit.MatcherAssert.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.catalog.Catalog;
 import org.salespointframework.catalog.Product;
 import org.salespointframework.core.Currencies;
diff --git a/src/test/java/org/salespointframework/support/MonetaryAmountAttributeConverterTest.java b/src/test/java/org/salespointframework/support/MonetaryAmountAttributeConverterTest.java
index 5104c684..060c8cde 100644
--- a/src/test/java/org/salespointframework/support/MonetaryAmountAttributeConverterTest.java
+++ b/src/test/java/org/salespointframework/support/MonetaryAmountAttributeConverterTest.java
@@ -22,7 +22,6 @@
 
 import org.javamoney.moneta.Money;
 import org.junit.jupiter.api.Test;
-import org.salespointframework.support.MonetaryAmountAttributeConverter;
 
 /**
  * Unit tests for {@link MonetaryAmountAttributeConverter}
diff --git a/src/test/java/org/salespointframework/time/IntervalIntegrationTests.java b/src/test/java/org/salespointframework/time/IntervalIntegrationTests.java
index 372766c8..99ec44fc 100644
--- a/src/test/java/org/salespointframework/time/IntervalIntegrationTests.java
+++ b/src/test/java/org/salespointframework/time/IntervalIntegrationTests.java
@@ -17,7 +17,6 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -30,6 +29,7 @@
 import javax.persistence.Id;
 
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
diff --git a/src/test/java/org/salespointframework/useraccount/NonTransactionalUserAccountManagerIntegrationTests.java b/src/test/java/org/salespointframework/useraccount/NonTransactionalUserAccountManagerIntegrationTests.java
index ee2c7a06..1c68849b 100644
--- a/src/test/java/org/salespointframework/useraccount/NonTransactionalUserAccountManagerIntegrationTests.java
+++ b/src/test/java/org/salespointframework/useraccount/NonTransactionalUserAccountManagerIntegrationTests.java
@@ -17,10 +17,9 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.useraccount.Password.UnencryptedPassword;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.TestPropertySource;
diff --git a/src/test/java/org/salespointframework/useraccount/UserAccountManagerIntegrationTests.java b/src/test/java/org/salespointframework/useraccount/UserAccountManagerIntegrationTests.java
index 8c342180..d82e3881 100644
--- a/src/test/java/org/salespointframework/useraccount/UserAccountManagerIntegrationTests.java
+++ b/src/test/java/org/salespointframework/useraccount/UserAccountManagerIntegrationTests.java
@@ -17,11 +17,10 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import java.util.Optional;
 
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.useraccount.Password.EncryptedPassword;
 import org.salespointframework.useraccount.Password.UnencryptedPassword;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/test/java/org/salespointframework/useraccount/UserAccountRepositoryIntegrationTests.java b/src/test/java/org/salespointframework/useraccount/UserAccountRepositoryIntegrationTests.java
index 905531e6..772bd1a6 100644
--- a/src/test/java/org/salespointframework/useraccount/UserAccountRepositoryIntegrationTests.java
+++ b/src/test/java/org/salespointframework/useraccount/UserAccountRepositoryIntegrationTests.java
@@ -17,12 +17,11 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.olivergierke.moduliths.test.ModuleTest;
-
 import java.util.UUID;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.moduliths.test.ModuleTest;
 import org.salespointframework.useraccount.Password.EncryptedPassword;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataIntegrityViolationException;