diff --git a/README.md b/README.md
index 4f1f869b5..1650b687b 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,12 @@ Project Structure
 -----------------
 
 ```
-container-spi (contains no dependencies on a specific web container)
+core
 container
-  tomcat (base for Tomcat container implementations, based on Tomcat 7)
+  spi (contains no dependencies on a specific web container)
+  tomcat (base for Tomcat container implementations, based on Tomcat 7.0)
   tomcat8 (Tomcat 8.0 container implementation)
   tomcat85 (Tomcat 8.5 and 9.0 milestone container implementation)
-core
 demo
   client
   server
diff --git a/container/pom.xml b/container/pom.xml
index fb7fae6be..eced13c47 100644
--- a/container/pom.xml
+++ b/container/pom.xml
@@ -38,6 +38,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
+                <module>spi</module>
                 <module>tomcat</module>
                 <module>tomcat8</module>
                 <module>tomcat85</module>
@@ -49,6 +50,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
+                <module>spi</module>
                 <module>tomcat</module>
                 <module>tomcat85</module>
             </modules>
@@ -59,6 +61,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
+                <module>spi</module>
                 <module>tomcat</module>
                 <module>tomcat85</module>
             </modules>
@@ -69,6 +72,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
+                <module>spi</module>
                 <module>tomcat</module>
                 <module>tomcat8</module>
             </modules>
@@ -79,6 +83,7 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
+                <module>spi</module>
                 <module>tomcat</module>
             </modules>
         </profile>
diff --git a/container-spi/pom.xml b/container/spi/pom.xml
similarity index 97%
rename from container-spi/pom.xml
rename to container/spi/pom.xml
index 78dd97637..661ae0a32 100644
--- a/container-spi/pom.xml
+++ b/container/spi/pom.xml
@@ -23,7 +23,7 @@
 <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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>mod_cluster-parent</artifactId>
+        <artifactId>mod_cluster-container</artifactId>
         <groupId>org.jboss.mod_cluster</groupId>
         <version>2.0.0.Alpha1-SNAPSHOT</version>
         <relativePath>..</relativePath>
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Connector.java b/container/spi/src/main/java/org/jboss/modcluster/container/Connector.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/Connector.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/Connector.java
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/ContainerEventHandler.java b/container/spi/src/main/java/org/jboss/modcluster/container/ContainerEventHandler.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/ContainerEventHandler.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/ContainerEventHandler.java
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Context.java b/container/spi/src/main/java/org/jboss/modcluster/container/Context.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/Context.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/Context.java
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Engine.java b/container/spi/src/main/java/org/jboss/modcluster/container/Engine.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/Engine.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/Engine.java
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Host.java b/container/spi/src/main/java/org/jboss/modcluster/container/Host.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/Host.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/Host.java
diff --git a/container-spi/src/main/java/org/jboss/modcluster/container/Server.java b/container/spi/src/main/java/org/jboss/modcluster/container/Server.java
similarity index 100%
rename from container-spi/src/main/java/org/jboss/modcluster/container/Server.java
rename to container/spi/src/main/java/org/jboss/modcluster/container/Server.java
diff --git a/pom.xml b/pom.xml
index e98207af1..9b4965d71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -183,7 +183,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
                 <module>demo</module>
@@ -195,7 +194,6 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
             </modules>
@@ -206,7 +204,6 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
             </modules>
@@ -217,7 +214,6 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
            </modules>
@@ -228,7 +224,6 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
             </modules>
@@ -239,7 +234,6 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <modules>
-                <module>container-spi</module>
                 <module>core</module>
                 <module>container</module>
                 <module>demo</module>
diff --git a/src/assembly/bin.xml b/src/assembly/bin.xml
index a2530bf94..8949c9440 100644
--- a/src/assembly/bin.xml
+++ b/src/assembly/bin.xml
@@ -46,7 +46,7 @@
 
     <!-- Container implementations -->
     <fileSet>
-      <directory>container-spi/target/</directory>
+      <directory>container/spi/target/</directory>
       <includes>
         <include>*.jar</include>
       </includes>