diff --git a/.gitignore b/.gitignore
index 731eb43..6cfda9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,5 @@
-/target/
-/.settings/
+# Maven build directories
+target/
+
+# Eclipse settings directories
+.settings/
diff --git a/.project b/.project
index 9c30c27..1f09710 100644
--- a/.project
+++ b/.project
@@ -5,11 +5,6 @@
 	<projects>
 	</projects>
 	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
@@ -17,7 +12,6 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/.classpath b/core/.classpath
similarity index 100%
rename from .classpath
rename to core/.classpath
diff --git a/core/.project b/core/.project
new file mode 100644
index 0000000..49781d8
--- /dev/null
+++ b/core/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>undo-redo-core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000..4cfd653
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>undo-redo-core</artifactId>
+	<name>Undo-Redo Core</name>
+	
+	<parent>
+		<groupId>dev.kske</groupId>
+		<artifactId>undo-redo</artifactId>
+		<version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+</project>
diff --git a/src/main/java/dev/kske/undoredo/Change.java b/core/src/main/java/dev/kske/undoredo/Change.java
similarity index 100%
rename from src/main/java/dev/kske/undoredo/Change.java
rename to core/src/main/java/dev/kske/undoredo/Change.java
diff --git a/src/main/java/dev/kske/undoredo/ChangeManager.java b/core/src/main/java/dev/kske/undoredo/ChangeManager.java
similarity index 100%
rename from src/main/java/dev/kske/undoredo/ChangeManager.java
rename to core/src/main/java/dev/kske/undoredo/ChangeManager.java
diff --git a/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java b/core/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java
similarity index 100%
rename from src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java
rename to core/src/main/java/dev/kske/undoredo/UnlimitedChangeManager.java
diff --git a/src/main/java/dev/kske/undoredo/package-info.java b/core/src/main/java/dev/kske/undoredo/package-info.java
similarity index 100%
rename from src/main/java/dev/kske/undoredo/package-info.java
rename to core/src/main/java/dev/kske/undoredo/package-info.java
diff --git a/src/main/java/module-info.java b/core/src/main/java/module-info.java
similarity index 100%
rename from src/main/java/module-info.java
rename to core/src/main/java/module-info.java
diff --git a/src/test/java/dev/kske/undoredo/ChangeManagerTest.java b/core/src/test/java/dev/kske/undoredo/ChangeManagerTest.java
similarity index 100%
rename from src/test/java/dev/kske/undoredo/ChangeManagerTest.java
rename to core/src/test/java/dev/kske/undoredo/ChangeManagerTest.java
diff --git a/src/test/java/dev/kske/undoredo/IntChange.java b/core/src/test/java/dev/kske/undoredo/IntChange.java
similarity index 100%
rename from src/test/java/dev/kske/undoredo/IntChange.java
rename to core/src/test/java/dev/kske/undoredo/IntChange.java
diff --git a/src/test/java/dev/kske/undoredo/IntWrapper.java b/core/src/test/java/dev/kske/undoredo/IntWrapper.java
similarity index 100%
rename from src/test/java/dev/kske/undoredo/IntWrapper.java
rename to core/src/test/java/dev/kske/undoredo/IntWrapper.java
diff --git a/pom.xml b/pom.xml
index 8fce4ef..f04ca06 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,10 +6,15 @@
 	<groupId>dev.kske</groupId>
 	<artifactId>undo-redo</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
 
 	<name>Undo-Redo</name>
 	<description>A Java library for managing changes in an editor history.</description>
 	<url>https://git.kske.dev/kske/event-bus</url>
+	
+	<modules>
+		<module>core</module>
+	</modules>
 
 	<licenses>
 		<license>
@@ -169,7 +174,8 @@
 					<argLine>--add-opens dev.kske.undoredo/dev.kske.undoredo=ALL-UNNAMED</argLine>
 				</configuration>
 			</plugin>
-			
+
 		</plugins>
 	</build>
 </project>
+