diff --git a/event-bus-ap/.classpath b/event-bus-ap/.classpath
index 0fb79cf..42c6248 100644
--- a/event-bus-ap/.classpath
+++ b/event-bus-ap/.classpath
@@ -6,24 +6,6 @@
 			<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"/>
@@ -34,5 +16,17 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="home/kske/git/event-bus/event-bus-ap">
+		<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/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/event-bus-ap/pom.xml b/event-bus-ap/pom.xml
index b9207fb..4b0ec76 100644
--- a/event-bus-ap/pom.xml
+++ b/event-bus-ap/pom.xml
@@ -11,6 +11,21 @@
 	<parent>
 		<groupId>dev.kske</groupId>
 		<artifactId>event-bus</artifactId>
-		<version>0.1.0</version>
+		<version>1.0.0</version>
 	</parent>
+
+	<dependencies>
+		<dependency>
+			<groupId>dev.kske</groupId>
+			<artifactId>event-bus-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+
+		<!-- Disable test folder -->
+		<testSourceDirectory />
+
+	</build>
 </project>
\ No newline at end of file
diff --git a/event-bus-core/pom.xml b/event-bus-core/pom.xml
index 1f1f5b6..91ed55d 100644
--- a/event-bus-core/pom.xml
+++ b/event-bus-core/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>dev.kske</groupId>
 		<artifactId>event-bus</artifactId>
-		<version>0.1.0</version>
+		<version>1.0.0</version>
 	</parent>
 
 	<dependencies>
@@ -20,4 +20,11 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+
+	<build>
+
+		<!-- Disable resource folder -->
+		<resources />
+
+	</build>
 </project>
\ No newline at end of file
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/Event.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/Event.java
similarity index 98%
rename from event-bus-core/src/main/java/dev/kske/eventbus/Event.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/Event.java
index 95fb2d3..25ee7a3 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/Event.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/Event.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/EventBus.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventBus.java
similarity index 99%
rename from event-bus-core/src/main/java/dev/kske/eventbus/EventBus.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/EventBus.java
index 628e0b9..ae39625 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/EventBus.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventBus.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 import java.lang.System.Logger;
 import java.lang.System.Logger.Level;
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/EventBusException.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventBusException.java
similarity index 95%
rename from event-bus-core/src/main/java/dev/kske/eventbus/EventBusException.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/EventBusException.java
index 5b3eb8e..d67616c 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/EventBusException.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventBusException.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 /**
  * This runtime exception is thrown when an event bus error occurs. This can
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/EventHandler.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventHandler.java
similarity index 97%
rename from event-bus-core/src/main/java/dev/kske/eventbus/EventHandler.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/EventHandler.java
index 53d9085..aae6387 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/EventHandler.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventHandler.java
@@ -1,8 +1,8 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 import java.lang.reflect.*;
 
-import dev.kske.eventbus.Event.USE_PARAMETER;
+import dev.kske.eventbus.core.Event.USE_PARAMETER;
 
 /**
  * Internal representation of an event handling method.
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/EventListener.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventListener.java
similarity index 88%
rename from event-bus-core/src/main/java/dev/kske/eventbus/EventListener.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/EventListener.java
index bc48ec7..4e54505 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/EventListener.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/EventListener.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 /**
  * Marker interface for event listeners. Event listeners can contain event handling methods to which
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/IEvent.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/IEvent.java
similarity index 88%
rename from event-bus-core/src/main/java/dev/kske/eventbus/IEvent.java
rename to event-bus-core/src/main/java/dev/kske/eventbus/core/IEvent.java
index fe9e843..bb09b18 100644
--- a/event-bus-core/src/main/java/dev/kske/eventbus/IEvent.java
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/IEvent.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 /**
  * Marker interface for event objects. Event objects can be used as event handler parameters and
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/core/package-info.java b/event-bus-core/src/main/java/dev/kske/eventbus/core/package-info.java
new file mode 100644
index 0000000..816c30d
--- /dev/null
+++ b/event-bus-core/src/main/java/dev/kske/eventbus/core/package-info.java
@@ -0,0 +1,9 @@
+/**
+ * Contains the public API and implementation of the Event Bus library.
+ *
+ * @author Kai S. K. Engelbart
+ * @since 0.0.1
+ * @see dev.kske.eventbus.core.Event
+ * @see dev.kske.eventbus.core.EventBus
+ */
+package dev.kske.eventbus.core;
diff --git a/event-bus-core/src/main/java/dev/kske/eventbus/package-info.java b/event-bus-core/src/main/java/dev/kske/eventbus/package-info.java
deleted file mode 100644
index 99c8ccf..0000000
--- a/event-bus-core/src/main/java/dev/kske/eventbus/package-info.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Contains the public API and implementation of the event bus library.
- *
- * @author Kai S. K. Engelbart
- * @since 0.0.1
- * @see dev.kske.eventbus.Event
- * @see dev.kske.eventbus.EventBus
- */
-package dev.kske.eventbus;
diff --git a/event-bus-core/src/main/java/module-info.java b/event-bus-core/src/main/java/module-info.java
index 8e10850..c79f442 100644
--- a/event-bus-core/src/main/java/module-info.java
+++ b/event-bus-core/src/main/java/module-info.java
@@ -1,12 +1,12 @@
 /**
- * Contains the public API and implementation of the event bus library.
+ * Contains the public API and implementation of the Event Bus library.
  *
  * @author Kai S. K. Engelbart
  * @since 0.0.3
- * @see dev.kske.eventbus.Event
- * @see dev.kske.eventbus.EventBus
+ * @see dev.kske.eventbus.core.Event
+ * @see dev.kske.eventbus.core.EventBus
  */
-module dev.kske.eventbus {
+module dev.kske.eventbus.core {
 
-	exports dev.kske.eventbus;
+	exports dev.kske.eventbus.core;
 }
diff --git a/event-bus-core/src/test/java/dev/kske/eventbus/CancelTest.java b/event-bus-core/src/test/java/dev/kske/eventbus/core/CancelTest.java
similarity index 96%
rename from event-bus-core/src/test/java/dev/kske/eventbus/CancelTest.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/core/CancelTest.java
index 8584f48..0d25f93 100644
--- a/event-bus-core/src/test/java/dev/kske/eventbus/CancelTest.java
+++ b/event-bus-core/src/test/java/dev/kske/eventbus/core/CancelTest.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/event-bus-core/src/test/java/dev/kske/eventbus/DispatchTest.java b/event-bus-core/src/test/java/dev/kske/eventbus/core/DispatchTest.java
similarity index 97%
rename from event-bus-core/src/test/java/dev/kske/eventbus/DispatchTest.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/core/DispatchTest.java
index 83c99e7..a683bc7 100644
--- a/event-bus-core/src/test/java/dev/kske/eventbus/DispatchTest.java
+++ b/event-bus-core/src/test/java/dev/kske/eventbus/core/DispatchTest.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEvent.java b/event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEvent.java
similarity index 81%
rename from event-bus-core/src/test/java/dev/kske/eventbus/SimpleEvent.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEvent.java
index a453acc..ede1afa 100644
--- a/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEvent.java
+++ b/event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEvent.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 /**
  * A simple event for testing purposes.
diff --git a/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEventSub.java b/event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEventSub.java
similarity index 83%
rename from event-bus-core/src/test/java/dev/kske/eventbus/SimpleEventSub.java
rename to event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEventSub.java
index 3030eaf..c519fc8 100644
--- a/event-bus-core/src/test/java/dev/kske/eventbus/SimpleEventSub.java
+++ b/event-bus-core/src/test/java/dev/kske/eventbus/core/SimpleEventSub.java
@@ -1,4 +1,4 @@
-package dev.kske.eventbus;
+package dev.kske.eventbus.core;
 
 /**
  * Subclass of {@link SimpleEvent} for testing purposes.
diff --git a/pom.xml b/pom.xml
index e7d4b95..cc00e1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>dev.kske</groupId>
 	<artifactId>event-bus</artifactId>
-	<version>0.1.0</version>
+	<version>1.0.0</version>
 	<packaging>pom</packaging>
 
 	<name>Event Bus</name>
@@ -52,8 +52,7 @@
 
 	<build>
 
-		<!-- Disable resource folders -->
-		<resources />
+		<!-- Disable test resource folder -->
 		<testResources />
 
 		<plugins>