diff --git a/broker/core/pom.xml b/broker/core/pom.xml
index fb673895c0..7230db7fd4 100755
--- a/broker/core/pom.xml
+++ b/broker/core/pom.xml
@@ -23,10 +23,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
diff --git a/broker/oidc/pom.xml b/broker/oidc/pom.xml
index ee7e4b91f4..a75c280aa0 100755
--- a/broker/oidc/pom.xml
+++ b/broker/oidc/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>jackson-databind</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
diff --git a/broker/saml/pom.xml b/broker/saml/pom.xml
index 4eceaf131d..e30ec71958 100755
--- a/broker/saml/pom.xml
+++ b/broker/saml/pom.xml
@@ -35,11 +35,6 @@
             <artifactId>keycloak-services</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index a5791fb3a7..978d81fe45 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -47,10 +47,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-invalidation-cache-model</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-events-jpa</artifactId>
@@ -108,30 +104,7 @@
             <artifactId>keycloak-login-freemarker</artifactId>
         </dependency>
 
-        <!-- timer -->
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-timer-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-timer-basic</artifactId>
-        </dependency>
-
-        <!-- export/import -->
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-dir</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-single-file</artifactId>
-        </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-connections-truststore</artifactId>
         </dependency>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml
index c49741c350..8936ceb0ac 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-api/main/module.xml
@@ -7,7 +7,6 @@
         <artifact name="${org.keycloak:keycloak-account-api}"/>
     </resources>
     <dependencies>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml
index cc21098a90..71a0498e5b 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-account-freemarker/main/module.xml
@@ -9,7 +9,6 @@
     <dependencies>
         <module name="org.keycloak.keycloak-forms-common-freemarker"/>
         <module name="org.keycloak.keycloak-account-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml
index dec5a0fc07..61b5f74b50 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-core/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
index c8d84aeaf6..36c11ae40a 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-oidc/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-broker-core"/>
         <module name="org.keycloak.keycloak-services"/>
         <module name="org.keycloak.keycloak-connections-truststore"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml
index 9179bc99a1..610c05686e 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-broker-saml/main/module.xml
@@ -9,7 +9,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-broker-core"/>
         <module name="org.keycloak.keycloak-saml-core"/>
         <module name="org.keycloak.keycloak-saml-protocol"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml
index 08ba50aef6..3fc237a7fe 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-api/main/module.xml
@@ -8,7 +8,6 @@
     </resources>
     <dependencies>
         <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.jboss.logging"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml
index 7a3fada3d6..0e1e9aadca 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-email-freemarker/main/module.xml
@@ -9,7 +9,6 @@
     <dependencies>
         <module name="org.keycloak.keycloak-forms-common-freemarker"/>
         <module name="org.keycloak.keycloak-email-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml
deleted file mode 100755
index 0d1796a605..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-api/main/module.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-events-api">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-events-api}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml
index 8ea965accc..8642b91e56 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-email-api"/>
         <module name="javax.mail.api"/>
         <module name="org.jboss.logging"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml
index cb9aa7cc40..3c37f2ddc7 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.jboss.logging"/>
         <module name="javax.api"/>
         <module name="javax.ws.rs.api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml
index 641d1f84da..2a6bc39f53 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jpa/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-connections-jpa"/>
         <module name="javax.persistence.api"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml
index 340f5cf375..f28fc2b81e 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-mongo/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-connections-mongo"/>
         <module name="org.mongodb.mongo-java-driver"/>
         <module name="com.fasterxml.jackson.core.jackson-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml
deleted file mode 100755
index c4729cad43..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-api/main/module.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-export-import-api">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-export-import-api}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-invalidation-cache-model"/>
-        <module name="javax.ws.rs.api"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
-        <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.bouncycastle" />
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml
deleted file mode 100755
index 9b834bef6d..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-dir/main/module.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-export-import-dir">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-export-import-dir}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-invalidation-cache-model"/>
-        <module name="org.keycloak.keycloak-export-import-api"/>
-        <module name="javax.ws.rs.api"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
-        <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.bouncycastle" />
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml
deleted file mode 100755
index 41b089c3a4..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-export-import-single-file/main/module.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-export-import-single-file">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-export-import-single-file}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-invalidation-cache-model"/>
-        <module name="org.keycloak.keycloak-export-import-api"/>
-        <module name="javax.ws.rs.api"/>
-        <module name="com.fasterxml.jackson.core.jackson-core"/>
-        <module name="com.fasterxml.jackson.core.jackson-annotations"/>
-        <module name="com.fasterxml.jackson.core.jackson-databind"/>
-        <module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
-        <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.logging"/>
-        <module name="org.bouncycastle" />
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml
index d0bb1b08d4..bb5c7d0fb8 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-api/main/module.xml
@@ -8,7 +8,6 @@
     </resources>
     <dependencies>
         <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-core"/>
         <module name="javax.ws.rs.api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml
index c33da4a3a8..d440d1a512 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-login-freemarker/main/module.xml
@@ -10,7 +10,6 @@
         <module name="org.keycloak.keycloak-forms-common-freemarker"/>
         <module name="org.keycloak.keycloak-login-api"/>
         <module name="org.keycloak.keycloak-email-api"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-server-spi"/>
         <module name="org.keycloak.keycloak-common"/>
         <module name="org.keycloak.keycloak-core"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
index 674f2a2708..0dd7036a2b 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-saml-protocol/main/module.xml
@@ -11,7 +11,6 @@
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-saml-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
         <module name="org.keycloak.keycloak-account-api"/>
         <module name="org.keycloak.keycloak-email-api"/>
         <module name="org.keycloak.keycloak-login-api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
index b4eaa3c27d..9b37f66880 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml
@@ -13,14 +13,10 @@
             <module name="org.keycloak.keycloak-core" services="import"/>
             <module name="org.keycloak.keycloak-email-api" services="import"/>
             <module name="org.keycloak.keycloak-email-freemarker" services="import"/>
-            <module name="org.keycloak.keycloak-events-api" services="import"/>
             <module name="org.keycloak.keycloak-events-email" services="import"/>
             <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
             <module name="org.keycloak.keycloak-events-jpa" services="import"/>
             <module name="org.keycloak.keycloak-events-mongo" services="import"/>
-            <module name="org.keycloak.keycloak-export-import-api" services="import"/>
-            <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
-            <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
             <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
             <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
@@ -43,8 +39,6 @@
             <module name="org.keycloak.keycloak-social-twitter" services="import"/>
             <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
             <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
-            <module name="org.keycloak.keycloak-timer-api" services="import"/>
-            <module name="org.keycloak.keycloak-timer-basic" services="import"/>
             <module name="org.hibernate" services="import"/>
             <module name="org.bouncycastle"/>
 
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
index 61082b2b3b..52208c2978 100755
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
+++ b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-services/main/module.xml
@@ -23,14 +23,10 @@
         <module name="org.keycloak.keycloak-core" services="import"/>
         <module name="org.keycloak.keycloak-email-api" services="import"/>
         <module name="org.keycloak.keycloak-email-freemarker" services="import"/>
-        <module name="org.keycloak.keycloak-events-api" services="import"/>
         <module name="org.keycloak.keycloak-events-email" services="import"/>
         <module name="org.keycloak.keycloak-events-jboss-logging" services="import"/>
         <module name="org.keycloak.keycloak-events-jpa" services="import"/>
         <module name="org.keycloak.keycloak-events-mongo" services="import"/>
-        <module name="org.keycloak.keycloak-export-import-api" services="import"/>
-        <module name="org.keycloak.keycloak-export-import-dir" services="import"/>
-        <module name="org.keycloak.keycloak-export-import-single-file" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-freemarker" services="import"/>
         <module name="org.keycloak.keycloak-forms-common-themes" services="import"/>
         <module name="org.keycloak.keycloak-invalidation-cache-infinispan" services="import"/>
@@ -54,8 +50,6 @@
         <module name="org.keycloak.keycloak-social-twitter" services="import"/>
         <module name="org.keycloak.keycloak-social-linkedin" services="import"/>
         <module name="org.keycloak.keycloak-social-stackoverflow" services="import"/>
-        <module name="org.keycloak.keycloak-timer-api" services="import"/>
-        <module name="org.keycloak.keycloak-timer-basic" services="import"/>
         <module name="org.keycloak.keycloak-wildfly-extensions" services="import"/>
 
         <module name="javax.ws.rs.api"/>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml
deleted file mode 100755
index 00b0c1e458..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-api/main/module.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-timer-api">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-timer-api}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml b/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml
deleted file mode 100755
index 832808eab0..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-timer-basic/main/module.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-
-<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-timer-basic">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-timer-basic}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-timer-api"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-    </dependencies>
-
-</module>
diff --git a/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml b/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml
index da16e55d9e..ac6479753f 100755
--- a/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml
+++ b/docbook/auth-server-docs/reference/en/en-US/modules/providers.xml
@@ -161,7 +161,6 @@ public class MyEventListenerProviderFactory implements EventListenerProviderFact
     <dependencies>
         <module name="org.keycloak.keycloak-core"/>
         <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.keycloak.keycloak-events-api"/>
     </dependencies>
 </module>
 ]]></programlisting>
diff --git a/events/api/pom.xml b/events/api/pom.xml
deleted file mode 100755
index 91731f7f38..0000000000
--- a/events/api/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<project>
-    <parent>
-        <artifactId>keycloak-events-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-events-api</artifactId>
-    <name>Keycloak Events API</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-   </dependencies>
-
-</project>
diff --git a/events/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/events/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
deleted file mode 100644
index aeedcfb044..0000000000
--- a/events/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ /dev/null
@@ -1,2 +0,0 @@
-org.keycloak.events.EventListenerSpi
-org.keycloak.events.EventStoreSpi
\ No newline at end of file
diff --git a/events/email/pom.xml b/events/email/pom.xml
index 270c70e227..7e15467501 100755
--- a/events/email/pom.xml
+++ b/events/email/pom.xml
@@ -23,11 +23,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-email-api</artifactId>
diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml
index 4cc66d09b6..89646bb080 100755
--- a/events/jboss-logging/pom.xml
+++ b/events/jboss-logging/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
diff --git a/events/jpa/pom.xml b/events/jpa/pom.xml
index 33c593ce6c..663002c3c0 100755
--- a/events/jpa/pom.xml
+++ b/events/jpa/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>keycloak-connections-jpa</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.hibernate.javax.persistence</groupId>
             <artifactId>${hibernate.javax.persistence.artifactId}</artifactId>
diff --git a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java b/events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java
old mode 100644
new mode 100755
index 94906ee40c..58dd82ec06
--- a/events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java
+++ b/events/jpa/src/main/java/org/keycloak/events/jpa/JpaAdminEventQuery.java
@@ -1,7 +1,5 @@
 package org.keycloak.events.jpa;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.LinkedList;
diff --git a/events/mongo/pom.xml b/events/mongo/pom.xml
index 6ff83fb6e1..f354edefb2 100755
--- a/events/mongo/pom.xml
+++ b/events/mongo/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>keycloak-connections-mongo</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
diff --git a/events/mongo/src/main/java/org/keycloak/events/mongo/MongoAdminEventQuery.java b/events/mongo/src/main/java/org/keycloak/events/mongo/MongoAdminEventQuery.java
old mode 100644
new mode 100755
index 612294e09e..47d1ba87cd
--- a/events/mongo/src/main/java/org/keycloak/events/mongo/MongoAdminEventQuery.java
+++ b/events/mongo/src/main/java/org/keycloak/events/mongo/MongoAdminEventQuery.java
@@ -1,7 +1,5 @@
 package org.keycloak.events.mongo;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -12,7 +10,6 @@ import org.keycloak.events.admin.AdminEventQuery;
 import org.keycloak.events.admin.OperationType;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 
diff --git a/events/mongo/src/main/java/org/keycloak/events/mongo/MongoEventQuery.java b/events/mongo/src/main/java/org/keycloak/events/mongo/MongoEventQuery.java
index 47efa6ae69..189c104a8e 100755
--- a/events/mongo/src/main/java/org/keycloak/events/mongo/MongoEventQuery.java
+++ b/events/mongo/src/main/java/org/keycloak/events/mongo/MongoEventQuery.java
@@ -1,17 +1,13 @@
 package org.keycloak.events.mongo;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.BasicDBObjectBuilder;
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
 
 import org.keycloak.events.Event;
 import org.keycloak.events.EventQuery;
 import org.keycloak.events.EventType;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
diff --git a/events/pom.xml b/events/pom.xml
index 5837cea383..1290ce0bbc 100755
--- a/events/pom.xml
+++ b/events/pom.xml
@@ -16,7 +16,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>api</module>
         <module>email</module>
         <module>jpa</module>
         <module>jboss-logging</module>
diff --git a/events/syslog/pom.xml b/events/syslog/pom.xml
index ce1146083f..55e2a4429e 100755
--- a/events/syslog/pom.xml
+++ b/events/syslog/pom.xml
@@ -28,11 +28,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/examples/providers/event-listener-sysout/pom.xml b/examples/providers/event-listener-sysout/pom.xml
index 3684a17de7..c0c24abcf2 100755
--- a/examples/providers/event-listener-sysout/pom.xml
+++ b/examples/providers/event-listener-sysout/pom.xml
@@ -23,10 +23,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/examples/providers/event-store-mem/pom.xml b/examples/providers/event-store-mem/pom.xml
index 739705731d..e80b0c3de2 100755
--- a/examples/providers/event-store-mem/pom.xml
+++ b/examples/providers/event-store-mem/pom.xml
@@ -23,10 +23,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemAdminEventQuery.java b/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemAdminEventQuery.java
old mode 100644
new mode 100755
index c636534812..8c737ba4de
--- a/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemAdminEventQuery.java
+++ b/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemAdminEventQuery.java
@@ -1,7 +1,5 @@
 package org.keycloak.examples.providers.events;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
diff --git a/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemEventQuery.java b/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemEventQuery.java
old mode 100644
new mode 100755
index eccd62dba5..af50961da6
--- a/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemEventQuery.java
+++ b/examples/providers/event-store-mem/src/main/java/org/keycloak/examples/providers/events/MemEventQuery.java
@@ -4,8 +4,6 @@ import org.keycloak.events.Event;
 import org.keycloak.events.EventQuery;
 import org.keycloak.events.EventType;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml
deleted file mode 100755
index 3b042845a4..0000000000
--- a/export-import/export-import-api/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.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-export-import-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-export-import-api</artifactId>
-    <name>Keycloak Export Import API</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-invalidation-cache-model</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/export-import/export-import-api/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/export-import/export-import-api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
deleted file mode 100644
index 93029438b2..0000000000
--- a/export-import/export-import-api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ /dev/null
@@ -1,2 +0,0 @@
-org.keycloak.exportimport.ExportSpi
-org.keycloak.exportimport.ImportSpi
\ No newline at end of file
diff --git a/export-import/export-import-dir/pom.xml b/export-import/export-import-dir/pom.xml
deleted file mode 100755
index b664706a34..0000000000
--- a/export-import/export-import-dir/pom.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.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-export-import-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-export-import-dir</artifactId>
-    <name>Keycloak Export Import To Directory</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory b/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
deleted file mode 100644
index 8a8fea4adb..0000000000
--- a/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.exportimport.dir.DirExportProviderFactory
\ No newline at end of file
diff --git a/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory b/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
deleted file mode 100644
index ba9874ed89..0000000000
--- a/export-import/export-import-dir/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.exportimport.dir.DirImportProviderFactory
\ No newline at end of file
diff --git a/export-import/export-import-single-file/pom.xml b/export-import/export-import-single-file/pom.xml
deleted file mode 100755
index c94271bdc4..0000000000
--- a/export-import/export-import-single-file/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.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-export-import-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-export-import-single-file</artifactId>
-    <name>Keycloak Export Import To Single File</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/export-import/pom.xml b/export-import/pom.xml
deleted file mode 100755
index 3912bea19f..0000000000
--- a/export-import/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.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>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>pom</packaging>
-
-    <artifactId>keycloak-export-import-parent</artifactId>
-    <name>Keycloak Export And Import</name>
-    <description/>
-
-    <modules>
-        <module>export-import-api</module>
-        <module>export-import-dir</module>
-        <module>export-import-single-file</module>
-    </modules>
-
-</project>
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index 6054a5abf3..0976fb1464 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -24,11 +24,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
 			<groupId>org.jboss.spec.javax.ws.rs</groupId>
 			<artifactId>jboss-jaxrs-api_2.0_spec</artifactId>
diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml
index 6672c769ee..1f729c206e 100755
--- a/forms/account-freemarker/pom.xml
+++ b/forms/account-freemarker/pom.xml
@@ -44,11 +44,6 @@
             <artifactId>keycloak-social-core</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml
index 76e06603c6..6fdeeeb041 100755
--- a/forms/email-api/pom.xml
+++ b/forms/email-api/pom.xml
@@ -24,11 +24,6 @@
             <artifactId>keycloak-server-spi</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 	</dependencies>
 
 	<build>
diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml
index a272cff815..fbbdc6cddf 100755
--- a/forms/email-freemarker/pom.xml
+++ b/forms/email-freemarker/pom.xml
@@ -34,12 +34,7 @@
             <artifactId>keycloak-services</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
+       <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-forms-common-freemarker</artifactId>
             <scope>provided</scope>
diff --git a/pom.xml b/pom.xml
index a3b479395f..d8e753c38c 100755
--- a/pom.xml
+++ b/pom.xml
@@ -154,8 +154,6 @@
         <module>social</module>
         <module>forms</module>
         <module>examples</module>
-        <module>timer</module>
-        <module>export-import</module>
         <module>util</module>
         <module>wildfly</module>
         <module>testsuite</module>
@@ -677,11 +675,6 @@
                 <artifactId>keycloak-client-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-events-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-events-email</artifactId>
@@ -707,21 +700,6 @@
                 <artifactId>keycloak-events-syslog</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-export-import-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-export-import-dir</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-export-import-single-file</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-kerberos-federation</artifactId>
@@ -1119,16 +1097,6 @@
                 <artifactId>keycloak-social-twitter</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-timer-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-timer-basic</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-saml-as7-modules</artifactId>
diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index 979b8fc380..67b5457d7e 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -48,11 +48,6 @@
             <artifactId>keycloak-forms-common-freemarker</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-account-api</artifactId>
diff --git a/events/api/src/main/java/org/keycloak/events/Details.java b/server-spi/src/main/java/org/keycloak/events/Details.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/Details.java
rename to server-spi/src/main/java/org/keycloak/events/Details.java
diff --git a/events/api/src/main/java/org/keycloak/events/Errors.java b/server-spi/src/main/java/org/keycloak/events/Errors.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/Errors.java
rename to server-spi/src/main/java/org/keycloak/events/Errors.java
diff --git a/events/api/src/main/java/org/keycloak/events/Event.java b/server-spi/src/main/java/org/keycloak/events/Event.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/Event.java
rename to server-spi/src/main/java/org/keycloak/events/Event.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventBuilder.java b/server-spi/src/main/java/org/keycloak/events/EventBuilder.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventBuilder.java
rename to server-spi/src/main/java/org/keycloak/events/EventBuilder.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventListenerProvider.java b/server-spi/src/main/java/org/keycloak/events/EventListenerProvider.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventListenerProvider.java
rename to server-spi/src/main/java/org/keycloak/events/EventListenerProvider.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventListenerProviderFactory.java b/server-spi/src/main/java/org/keycloak/events/EventListenerProviderFactory.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventListenerProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/events/EventListenerProviderFactory.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventListenerSpi.java b/server-spi/src/main/java/org/keycloak/events/EventListenerSpi.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventListenerSpi.java
rename to server-spi/src/main/java/org/keycloak/events/EventListenerSpi.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventQuery.java b/server-spi/src/main/java/org/keycloak/events/EventQuery.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventQuery.java
rename to server-spi/src/main/java/org/keycloak/events/EventQuery.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventStoreProvider.java b/server-spi/src/main/java/org/keycloak/events/EventStoreProvider.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventStoreProvider.java
rename to server-spi/src/main/java/org/keycloak/events/EventStoreProvider.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventStoreProviderFactory.java b/server-spi/src/main/java/org/keycloak/events/EventStoreProviderFactory.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventStoreProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/events/EventStoreProviderFactory.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventStoreSpi.java b/server-spi/src/main/java/org/keycloak/events/EventStoreSpi.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventStoreSpi.java
rename to server-spi/src/main/java/org/keycloak/events/EventStoreSpi.java
diff --git a/events/api/src/main/java/org/keycloak/events/EventType.java b/server-spi/src/main/java/org/keycloak/events/EventType.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/EventType.java
rename to server-spi/src/main/java/org/keycloak/events/EventType.java
diff --git a/events/api/src/main/java/org/keycloak/events/admin/AdminEvent.java b/server-spi/src/main/java/org/keycloak/events/admin/AdminEvent.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/admin/AdminEvent.java
rename to server-spi/src/main/java/org/keycloak/events/admin/AdminEvent.java
diff --git a/events/api/src/main/java/org/keycloak/events/admin/AdminEventQuery.java b/server-spi/src/main/java/org/keycloak/events/admin/AdminEventQuery.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/admin/AdminEventQuery.java
rename to server-spi/src/main/java/org/keycloak/events/admin/AdminEventQuery.java
diff --git a/events/api/src/main/java/org/keycloak/events/admin/AuthDetails.java b/server-spi/src/main/java/org/keycloak/events/admin/AuthDetails.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/admin/AuthDetails.java
rename to server-spi/src/main/java/org/keycloak/events/admin/AuthDetails.java
diff --git a/events/api/src/main/java/org/keycloak/events/admin/AuthQuery.java b/server-spi/src/main/java/org/keycloak/events/admin/AuthQuery.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/admin/AuthQuery.java
rename to server-spi/src/main/java/org/keycloak/events/admin/AuthQuery.java
diff --git a/events/api/src/main/java/org/keycloak/events/admin/OperationType.java b/server-spi/src/main/java/org/keycloak/events/admin/OperationType.java
similarity index 100%
rename from events/api/src/main/java/org/keycloak/events/admin/OperationType.java
rename to server-spi/src/main/java/org/keycloak/events/admin/OperationType.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProvider.java b/server-spi/src/main/java/org/keycloak/exportimport/ExportProvider.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProvider.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ExportProvider.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProviderFactory.java b/server-spi/src/main/java/org/keycloak/exportimport/ExportProviderFactory.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ExportProviderFactory.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportSpi.java b/server-spi/src/main/java/org/keycloak/exportimport/ExportSpi.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportSpi.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ExportSpi.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProvider.java b/server-spi/src/main/java/org/keycloak/exportimport/ImportProvider.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProvider.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ImportProvider.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProviderFactory.java b/server-spi/src/main/java/org/keycloak/exportimport/ImportProviderFactory.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ImportProviderFactory.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportSpi.java b/server-spi/src/main/java/org/keycloak/exportimport/ImportSpi.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ImportSpi.java
rename to server-spi/src/main/java/org/keycloak/exportimport/ImportSpi.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/Strategy.java b/server-spi/src/main/java/org/keycloak/exportimport/Strategy.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/Strategy.java
rename to server-spi/src/main/java/org/keycloak/exportimport/Strategy.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/UsersExportStrategy.java b/server-spi/src/main/java/org/keycloak/exportimport/UsersExportStrategy.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/UsersExportStrategy.java
rename to server-spi/src/main/java/org/keycloak/exportimport/UsersExportStrategy.java
diff --git a/timer/api/src/main/java/org/keycloak/timer/TimerProvider.java b/server-spi/src/main/java/org/keycloak/timer/TimerProvider.java
similarity index 100%
rename from timer/api/src/main/java/org/keycloak/timer/TimerProvider.java
rename to server-spi/src/main/java/org/keycloak/timer/TimerProvider.java
diff --git a/timer/api/src/main/java/org/keycloak/timer/TimerProviderFactory.java b/server-spi/src/main/java/org/keycloak/timer/TimerProviderFactory.java
similarity index 100%
rename from timer/api/src/main/java/org/keycloak/timer/TimerProviderFactory.java
rename to server-spi/src/main/java/org/keycloak/timer/TimerProviderFactory.java
diff --git a/timer/api/src/main/java/org/keycloak/timer/TimerSpi.java b/server-spi/src/main/java/org/keycloak/timer/TimerSpi.java
similarity index 100%
rename from timer/api/src/main/java/org/keycloak/timer/TimerSpi.java
rename to server-spi/src/main/java/org/keycloak/timer/TimerSpi.java
diff --git a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
index fd8c0fd6fd..cbea53ae75 100755
--- a/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ b/server-spi/src/main/resources/META-INF/services/org.keycloak.provider.Spi
@@ -6,3 +6,8 @@ org.keycloak.models.UserSpi
 org.keycloak.models.session.UserSessionPersisterSpi
 org.keycloak.migration.MigrationSpi
 org.keycloak.hash.PasswordHashSpi
+org.keycloak.events.EventListenerSpi
+org.keycloak.events.EventStoreSpi
+org.keycloak.exportimport.ExportSpi
+org.keycloak.exportimport.ImportSpi
+org.keycloak.timer.TimerSpi
diff --git a/services/pom.xml b/services/pom.xml
index 408366e9af..816134e584 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -38,10 +38,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-forms-common-freemarker</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-account-api</artifactId>
@@ -75,18 +71,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-broker-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-timer-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-timer-basic</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-export-import-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
             <artifactId>jboss-servlet-api_3.0_spec</artifactId>
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportImportConfig.java b/services/src/main/java/org/keycloak/exportimport/ExportImportConfig.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/ExportImportConfig.java
rename to services/src/main/java/org/keycloak/exportimport/ExportImportConfig.java
diff --git a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java b/services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java
similarity index 100%
rename from export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java
rename to services/src/main/java/org/keycloak/exportimport/dir/DirExportProvider.java
diff --git a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java b/services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java
similarity index 100%
rename from export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java
rename to services/src/main/java/org/keycloak/exportimport/dir/DirExportProviderFactory.java
diff --git a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java b/services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java
similarity index 100%
rename from export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java
rename to services/src/main/java/org/keycloak/exportimport/dir/DirImportProvider.java
diff --git a/export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java b/services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java
similarity index 100%
rename from export-import/export-import-dir/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java
rename to services/src/main/java/org/keycloak/exportimport/dir/DirImportProviderFactory.java
diff --git a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java b/services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java
similarity index 100%
rename from export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java
rename to services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProvider.java
diff --git a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java b/services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java
similarity index 100%
rename from export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java
rename to services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileExportProviderFactory.java
diff --git a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java b/services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java
similarity index 100%
rename from export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java
rename to services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProvider.java
diff --git a/export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java b/services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java
similarity index 100%
rename from export-import/export-import-single-file/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java
rename to services/src/main/java/org/keycloak/exportimport/singlefile/SingleFileImportProviderFactory.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java b/services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java
rename to services/src/main/java/org/keycloak/exportimport/util/ExportImportSessionTask.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java b/services/src/main/java/org/keycloak/exportimport/util/ExportUtils.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ExportUtils.java
rename to services/src/main/java/org/keycloak/exportimport/util/ExportUtils.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java b/services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/ImportUtils.java
rename to services/src/main/java/org/keycloak/exportimport/util/ImportUtils.java
diff --git a/export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java b/services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java
similarity index 100%
rename from export-import/export-import-api/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java
rename to services/src/main/java/org/keycloak/exportimport/util/MultipleStepsExportProvider.java
diff --git a/timer/basic/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java
similarity index 100%
rename from timer/basic/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java
rename to services/src/main/java/org/keycloak/timer/basic/BasicTimerProvider.java
diff --git a/timer/basic/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java b/services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java
similarity index 100%
rename from timer/basic/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java
rename to services/src/main/java/org/keycloak/timer/basic/BasicTimerProviderFactory.java
diff --git a/export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
old mode 100644
new mode 100755
similarity index 55%
rename from export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
rename to services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
index 82a1fafc06..d5209e929c
--- a/export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
+++ b/services/src/main/resources/META-INF/services/org.keycloak.exportimport.ExportProviderFactory
@@ -1 +1,2 @@
+org.keycloak.exportimport.dir.DirExportProviderFactory
 org.keycloak.exportimport.singlefile.SingleFileExportProviderFactory
\ No newline at end of file
diff --git a/export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
old mode 100644
new mode 100755
similarity index 55%
rename from export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
rename to services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
index d2192b6e84..e9b8e921bf
--- a/export-import/export-import-single-file/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
+++ b/services/src/main/resources/META-INF/services/org.keycloak.exportimport.ImportProviderFactory
@@ -1 +1,2 @@
+org.keycloak.exportimport.dir.DirImportProviderFactory
 org.keycloak.exportimport.singlefile.SingleFileImportProviderFactory
\ No newline at end of file
diff --git a/timer/basic/src/main/resources/META-INF/services/org.keycloak.timer.TimerProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.timer.TimerProviderFactory
similarity index 100%
rename from timer/basic/src/main/resources/META-INF/services/org.keycloak.timer.TimerProviderFactory
rename to services/src/main/resources/META-INF/services/org.keycloak.timer.TimerProviderFactory
diff --git a/social/twitter/pom.xml b/social/twitter/pom.xml
index 8e067182b9..9fa1e26985 100755
--- a/social/twitter/pom.xml
+++ b/social/twitter/pom.xml
@@ -22,10 +22,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-broker-oidc</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-services</artifactId>
diff --git a/timer/api/pom.xml b/timer/api/pom.xml
deleted file mode 100755
index 824ace7892..0000000000
--- a/timer/api/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<project>
-    <parent>
-        <artifactId>keycloak-timer-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-timer-api</artifactId>
-    <name>Keycloak Timer API</name>
-    <description/>
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/timer/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi b/timer/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
deleted file mode 100644
index e8219ff77d..0000000000
--- a/timer/api/src/main/resources/META-INF/services/org.keycloak.provider.Spi
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.timer.TimerSpi
\ No newline at end of file
diff --git a/timer/basic/pom.xml b/timer/basic/pom.xml
deleted file mode 100755
index ea6cbe3eb6..0000000000
--- a/timer/basic/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<project>
-    <parent>
-        <artifactId>keycloak-timer-parent</artifactId>
-        <groupId>org.keycloak</groupId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>keycloak-timer-basic</artifactId>
-    <name>Keycloak Timer Basic Provider</name>
-    <description/>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-spi</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-timer-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/timer/pom.xml b/timer/pom.xml
deleted file mode 100755
index 16cd2a8e79..0000000000
--- a/timer/pom.xml
+++ /dev/null
@@ -1,22 +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>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <name>Keycloak Timer Parent</name>
-    <description/>
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>org.keycloak</groupId>
-    <artifactId>keycloak-timer-parent</artifactId>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>api</module>
-        <module>basic</module>
-    </modules>
-</project>