diff --git a/.project b/.project
new file mode 100644
index 0000000..65850dd
--- /dev/null
+++ b/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>event-bus</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/event-bus-ap/.classpath b/event-bus-ap/.classpath
new file mode 100644
index 0000000..0fb79cf
--- /dev/null
+++ b/event-bus-ap/.classpath
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/event-bus/.project b/event-bus-ap/.project
similarity index 95%
rename from event-bus/.project
rename to event-bus-ap/.project
index 2acd4d0..7976120 100644
--- a/event-bus/.project
+++ b/event-bus-ap/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>event-bus</name>
+	<name>event-bus-ap</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/event-bus-ap/pom.xml b/event-bus-ap/pom.xml
new file mode 100644
index 0000000..b9207fb
--- /dev/null
+++ b/event-bus-ap/pom.xml
@@ -0,0 +1,16 @@
+<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>event-bus-ap</artifactId>
+
+	<name>Event Bus Annotation Processor</name>
+	<description>Annotation processor checking for errors related to the @Event annotation from Event Bus.</description>
+
+	<parent>
+		<groupId>dev.kske</groupId>
+		<artifactId>event-bus</artifactId>
+		<version>0.1.0</version>
+	</parent>
+</project>
\ No newline at end of file
diff --git a/event-bus/.classpath b/event-bus-core/.classpath
similarity index 100%
rename from event-bus/.classpath
rename to event-bus-core/.classpath
diff --git a/event-bus-core/.project b/event-bus-core/.project
new file mode 100644
index 0000000..8523046
--- /dev/null
+++ b/event-bus-core/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>event-bus-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/event-bus-core/pom.xml b/event-bus-core/pom.xml
new file mode 100644
index 0000000..1f1f5b6
--- /dev/null
+++ b/event-bus-core/pom.xml
@@ -0,0 +1,23 @@
+<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>event-bus-core</artifactId>
+	<name>Event Bus Core</name>
+
+	<parent>
+		<groupId>dev.kske</groupId>
+		<artifactId>event-bus</artifactId>
+		<version>0.1.0</version>
+	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>5.6.2</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/event-bus/src/main/java/dev/kske/eventbus/Event.java b/event-bus-core/src/main/java/dev/kske/eventbus/Event.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/Event.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/Event.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/EventBus.java b/event-bus-core/src/main/java/dev/kske/eventbus/EventBus.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/EventBus.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/EventBus.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/EventBusException.java b/event-bus-core/src/main/java/dev/kske/eventbus/EventBusException.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/EventBusException.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/EventBusException.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/EventHandler.java b/event-bus-core/src/main/java/dev/kske/eventbus/EventHandler.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/EventHandler.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/EventHandler.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/EventListener.java b/event-bus-core/src/main/java/dev/kske/eventbus/EventListener.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/EventListener.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/EventListener.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/IEvent.java b/event-bus-core/src/main/java/dev/kske/eventbus/IEvent.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/IEvent.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/IEvent.java
diff --git a/event-bus/src/main/java/dev/kske/eventbus/package-info.java b/event-bus-core/src/main/java/dev/kske/eventbus/package-info.java
similarity index 100%
rename from event-bus/src/main/java/dev/kske/eventbus/package-info.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/package-info.java
diff --git a/event-bus/src/main/java/module-info.java b/event-bus-core/src/main/java/module-info.java
similarity index 100%
rename from event-bus/src/main/java/module-info.java
rename to event-bus-core/src/main/java/module-info.java
diff --git a/event-bus/src/test/java/dev/kske/eventbus/CancelTest.java b/event-bus-core/src/test/java/dev/kske/eventbus/CancelTest.java
similarity index 100%
rename from event-bus/src/test/java/dev/kske/eventbus/CancelTest.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/CancelTest.java
diff --git a/event-bus/src/test/java/dev/kske/eventbus/DispatchTest.java b/event-bus-core/src/test/java/dev/kske/eventbus/DispatchTest.java
similarity index 100%
rename from event-bus/src/test/java/dev/kske/eventbus/DispatchTest.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/DispatchTest.java
diff --git a/event-bus/src/test/java/dev/kske/eventbus/SimpleEvent.java b/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEvent.java
similarity index 100%
rename from event-bus/src/test/java/dev/kske/eventbus/SimpleEvent.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/SimpleEvent.java
diff --git a/event-bus/src/test/java/dev/kske/eventbus/SimpleEventSub.java b/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEventSub.java
similarity index 100%
rename from event-bus/src/test/java/dev/kske/eventbus/SimpleEventSub.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/SimpleEventSub.java
diff --git a/event-bus/pom.xml b/pom.xml
similarity index 83%
rename from event-bus/pom.xml
rename to pom.xml
index 4ddb9ac..e7d4b95 100644
--- a/event-bus/pom.xml
+++ b/pom.xml
@@ -6,10 +6,16 @@
 	<groupId>dev.kske</groupId>
 	<artifactId>event-bus</artifactId>
 	<version>0.1.0</version>
+	<packaging>pom</packaging>
 
 	<name>Event Bus</name>
 	<description>An event handling framework for Java utilizing annotations.</description>
-	<url>https://git.kske.dev/zdm/event-bus</url>
+	<url>https://git.kske.dev/kske/event-bus</url>
+
+	<modules>
+		<module>event-bus-core</module>
+		<module>event-bus-ap</module>
+	</modules>
 
 	<licenses>
 		<license>
@@ -33,8 +39,8 @@
 	</developers>
 
 	<scm>
-		<connection>scm:git:https://git.kske.dev/zdm/event-bus.git</connection>
-		<developerConnection>scm:git:ssh:git@git.kske.dev:zdm/event-bus.git</developerConnection>
+		<connection>scm:git:https://git.kske.dev/kske/event-bus.git</connection>
+		<developerConnection>scm:git:ssh:git@git.kske.dev:kske/event-bus.git</developerConnection>
 	</scm>
 
 	<properties>
@@ -89,13 +95,4 @@
 
 		</plugins>
 	</build>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.6.2</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
 </project>
\ No newline at end of file