diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java b/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/AnnotationBuilder.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationInvoker.java b/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationInvoker.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationInvoker.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/AnnotationInvoker.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationTrainer.java b/core/src/main/java/org/apache/commons/proxy2/stub/AnnotationTrainer.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/AnnotationTrainer.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/AnnotationTrainer.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/BaseAnnotationTrainer.java b/core/src/main/java/org/apache/commons/proxy2/stub/BaseAnnotationTrainer.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/BaseAnnotationTrainer.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/BaseAnnotationTrainer.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java b/core/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/BaseTrainer.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java b/core/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/StubBuilder.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/StubInterceptorBuilder.java b/core/src/main/java/org/apache/commons/proxy2/stub/StubInterceptorBuilder.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/StubInterceptorBuilder.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/StubInterceptorBuilder.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/Trainer.java b/core/src/main/java/org/apache/commons/proxy2/stub/Trainer.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/Trainer.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/Trainer.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java b/core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/TrainingContext.java
diff --git a/stub/src/main/java/org/apache/commons/proxy2/stub/package-info.java b/core/src/main/java/org/apache/commons/proxy2/stub/package-info.java
similarity index 100%
rename from stub/src/main/java/org/apache/commons/proxy2/stub/package-info.java
rename to core/src/main/java/org/apache/commons/proxy2/stub/package-info.java
diff --git a/pom.xml b/pom.xml
index 0beff6c..4412469 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
         <module>asm4</module>
         <module>javassist</module>
         <module>cglib</module>
-        <module>stub</module>
         <module>build-tools</module>
         <module>test</module>
     </modules>
diff --git a/stub/pom.xml b/stub/pom.xml
deleted file mode 100644
index f7847ae..0000000
--- a/stub/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-    <!--
-        ~ Licensed to the Apache Software Foundation (ASF) under one or more ~
-        contributor license agreements. See the NOTICE file distributed with ~
-        this work for additional information regarding copyright ownership. ~
-        The ASF licenses this file to You under the Apache License, Version
-        2.0 ~ (the "License"); you may not use this file except in compliance
-        with ~ the License. You may obtain a copy of the License at ~ ~
-        http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
-        applicable law or agreed to in writing, software ~ distributed under
-        the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES
-        OR CONDITIONS OF ANY KIND, either express or implied. ~ See the
-        License for the specific language governing permissions and ~
-        limitations under the License.
-    -->
-
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>commons-proxy2-parent</artifactId>
-        <groupId>org.apache.commons</groupId>
-        <version>2.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>commons-proxy2-stub</artifactId>
-    <name>Commons Proxy Stub</name>
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>commons-proxy2</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>commons-proxy2-jdk</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>commons-proxy2-cglib</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>2.1_3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>commons-proxy2-javassist</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java b/test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/AbstractStubTestCase.java
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/AnnotationBuilderTest.java b/test/src/test/java/org/apache/commons/proxy2/stub/AnnotationBuilderTest.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/AnnotationBuilderTest.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/AnnotationBuilderTest.java
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java b/test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/RetentionWrapper.java
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java b/test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/StubBuilderTest.java
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java b/test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/StubInterceptorBuilderTest.java
diff --git a/stub/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java b/test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java
similarity index 100%
rename from stub/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java
rename to test/src/test/java/org/apache/commons/proxy2/stub/StubInterface.java