diff --git a/core/src/main/java/dev/kske/undoredo/Change.java b/core/src/main/java/dev/kske/undoredo/core/Change.java
similarity index 95%
rename from core/src/main/java/dev/kske/undoredo/Change.java
rename to core/src/main/java/dev/kske/undoredo/core/Change.java
index 6f88984..4252e03 100644
--- a/core/src/main/java/dev/kske/undoredo/Change.java
+++ b/core/src/main/java/dev/kske/undoredo/core/Change.java
@@ -1,4 +1,4 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 /**
  * Base interface for changes to be registered in an undo manager.
diff --git a/core/src/main/java/dev/kske/undoredo/ChangeManager.java b/core/src/main/java/dev/kske/undoredo/core/ChangeManager.java
similarity index 97%
rename from core/src/main/java/dev/kske/undoredo/ChangeManager.java
rename to core/src/main/java/dev/kske/undoredo/core/ChangeManager.java
index 25e73f6..7b887e7 100644
--- a/core/src/main/java/dev/kske/undoredo/ChangeManager.java
+++ b/core/src/main/java/dev/kske/undoredo/core/ChangeManager.java
@@ -1,4 +1,4 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 import java.util.List;
 
diff --git a/core/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java b/core/src/main/java/dev/kske/undoredo/core/UnlimitedChangeManager.java
similarity index 97%
rename from core/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java
rename to core/src/main/java/dev/kske/undoredo/core/UnlimitedChangeManager.java
index db958ac..8a0ff35 100644
--- a/core/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java
+++ b/core/src/main/java/dev/kske/undoredo/core/UnlimitedChangeManager.java
@@ -1,4 +1,4 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 import java.util.*;
 
diff --git a/core/src/main/java/dev/kske/undoredo/package-info.java b/core/src/main/java/dev/kske/undoredo/core/package-info.java
similarity index 83%
rename from core/src/main/java/dev/kske/undoredo/package-info.java
rename to core/src/main/java/dev/kske/undoredo/core/package-info.java
index 1cda98b..b4cc131 100644
--- a/core/src/main/java/dev/kske/undoredo/package-info.java
+++ b/core/src/main/java/dev/kske/undoredo/core/package-info.java
@@ -5,4 +5,4 @@
  * @author Kai S. K. Engelbart
  * @since 0.0.1
  */
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java
index d8d1033..3ae73e7 100644
--- a/core/src/main/java/module-info.java
+++ b/core/src/main/java/module-info.java
@@ -7,5 +7,5 @@
  */
 module dev.kske.undoredo {
 
-	exports dev.kske.undoredo;
+	exports dev.kske.undoredo.core;
 }
diff --git a/core/src/test/java/dev/kske/undoredo/ChangeManagerTest.java b/core/src/test/java/dev/kske/undoredo/core/ChangeManagerTest.java
similarity index 98%
rename from core/src/test/java/dev/kske/undoredo/ChangeManagerTest.java
rename to core/src/test/java/dev/kske/undoredo/core/ChangeManagerTest.java
index db18ba5..4643970 100644
--- a/core/src/test/java/dev/kske/undoredo/ChangeManagerTest.java
+++ b/core/src/test/java/dev/kske/undoredo/core/ChangeManagerTest.java
@@ -1,4 +1,4 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -33,7 +33,7 @@ class ChangeManagerTest {
 		manager.addChange(change);
 		assertSame(1, wrapper.value);
 	}
-	
+
 	/**
 	 * Tests the consistency of the change list.
 	 *
diff --git a/core/src/test/java/dev/kske/undoredo/IntChange.java b/core/src/test/java/dev/kske/undoredo/core/IntChange.java
similarity index 70%
rename from core/src/test/java/dev/kske/undoredo/IntChange.java
rename to core/src/test/java/dev/kske/undoredo/core/IntChange.java
index 76299a4..f6e8a32 100644
--- a/core/src/test/java/dev/kske/undoredo/IntChange.java
+++ b/core/src/test/java/dev/kske/undoredo/core/IntChange.java
@@ -1,17 +1,17 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 /**
  * @author Kai S. K. Engelbart
  * @since 0.0.1
  */
 class IntChange implements Change {
-	
-	private final IntWrapper wrapper;
-	private final int value;
-	
+
+	private final IntWrapper	wrapper;
+	private final int			value;
+
 	IntChange(IntWrapper wrapper, int value) {
-		this.wrapper = wrapper;
-		this.value = value;
+		this.wrapper	= wrapper;
+		this.value		= value;
 	}
 
 	@Override
diff --git a/core/src/test/java/dev/kske/undoredo/IntWrapper.java b/core/src/test/java/dev/kske/undoredo/core/IntWrapper.java
similarity index 72%
rename from core/src/test/java/dev/kske/undoredo/IntWrapper.java
rename to core/src/test/java/dev/kske/undoredo/core/IntWrapper.java
index bae74ef..2b6907d 100644
--- a/core/src/test/java/dev/kske/undoredo/IntWrapper.java
+++ b/core/src/test/java/dev/kske/undoredo/core/IntWrapper.java
@@ -1,10 +1,10 @@
-package dev.kske.undoredo;
+package dev.kske.undoredo.core;
 
 /**
  * @author Kai S. K. Engelbart
  * @since 0.0.1
  */
 class IntWrapper {
-	
+
 	int value;
 }