diff --git a/client-registration/pom.xml b/client-registration/pom.xml
deleted file mode 100755
index a6ce18e6c8..0000000000
--- a/client-registration/pom.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<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/maven-v4_0_0.xsd">
-    <parent>
-        <artifactId>keycloak-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-    </parent>
-
-    <name>Keycloak Client Registration Parent</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>keycloak-client-registration-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>api</module>
-        <!--<module>cli</module>-->
-    </modules>
-</project>
diff --git a/integration/admin-client/pom.xml b/integration/admin-client/pom.xml
index 6e07121d25..8597e8e403 100755
--- a/integration/admin-client/pom.xml
+++ b/integration/admin-client/pom.xml
@@ -3,10 +3,9 @@
          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>keycloak-parent</artifactId>
+        <artifactId>keycloak-integration-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/client-registration/cli/pom.xml b/integration/client-registration-cli/pom.xml
similarity index 100%
rename from client-registration/cli/pom.xml
rename to integration/client-registration-cli/pom.xml
diff --git a/client-registration/cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java b/integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java
similarity index 100%
rename from client-registration/cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java
rename to integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java
diff --git a/client-registration/cli/src/main/java/org/keycloak/client/registration/cli/Context.java b/integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/Context.java
similarity index 100%
rename from client-registration/cli/src/main/java/org/keycloak/client/registration/cli/Context.java
rename to integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/Context.java
diff --git a/client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java b/integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java
similarity index 100%
rename from client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java
rename to integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java
diff --git a/client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java b/integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java
similarity index 100%
rename from client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java
rename to integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java
diff --git a/client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java b/integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java
similarity index 100%
rename from client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java
rename to integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java
diff --git a/client-registration/api/pom.xml b/integration/client-registration/pom.xml
similarity index 92%
rename from client-registration/api/pom.xml
rename to integration/client-registration/pom.xml
index da5f4077e5..1e7757cef5 100755
--- a/client-registration/api/pom.xml
+++ b/integration/client-registration/pom.xml
@@ -2,7 +2,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/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>keycloak-client-registration-parent</artifactId>
+        <artifactId>keycloak-integration-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.9.0.CR1-SNAPSHOT</version>
     </parent>
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/Auth.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/Auth.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistration.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistration.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/HttpErrorException.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/HttpErrorException.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/HttpUtil.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/HttpUtil.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java
diff --git a/client-registration/api/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java b/integration/client-registration/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java
similarity index 100%
rename from client-registration/api/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java
rename to integration/client-registration/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java
diff --git a/integration/pom.xml b/integration/pom.xml
index 0b4145c061..4bb2451a0f 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -10,10 +10,11 @@
     <description/>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-integration-pom</artifactId>
+    <artifactId>keycloak-integration-parent</artifactId>
     <packaging>pom</packaging>
 
     <modules>
         <module>admin-client</module>
+        <module>client-registration</module>
     </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 9c7e8877d1..54fa4f95bb 100755
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,6 @@
     <modules>
         <module>common</module>
         <module>core</module>
-        <module>client-registration</module>
         <module>dependencies</module>
         <module>server-spi</module>
         <module>saml</module>