diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
index 4a2ff44ac0..f2f0ac30c3 100755
--- a/dependencies/server-all/pom.xml
+++ b/dependencies/server-all/pom.xml
@@ -28,15 +28,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-model-infinispan</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-jboss-logging</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-email</artifactId>
-        </dependency>
-
         <!-- identity providers -->
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
index c7c6375f3e..4dddea7d8f 100755
--- a/dependencies/server-min/pom.xml
+++ b/dependencies/server-min/pom.xml
@@ -43,11 +43,7 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-server-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-events-jboss-logging</artifactId>
-        </dependency>
-        <dependency>
+         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-js-adapter</artifactId>
         </dependency>
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
deleted file mode 100755
index 082c8fbc2d..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-email/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-events-email">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-events-email}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="javax.mail.api"/>
-        <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-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
deleted file mode 100755
index 3c37f2ddc7..0000000000
--- a/distribution/feature-packs/server-feature-pack/src/main/resources/modules/system/layers/base/org/keycloak/keycloak-events-jboss-logging/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-events-jboss-logging">
-    <resources>
-        <artifact name="${org.keycloak:keycloak-events-jboss-logging}"/>
-    </resources>
-    <dependencies>
-        <module name="org.keycloak.keycloak-common"/>
-        <module name="org.keycloak.keycloak-core"/>
-        <module name="org.keycloak.keycloak-server-spi"/>
-        <module name="org.jboss.logging"/>
-        <module name="javax.api"/>
-        <module name="javax.ws.rs.api"/>
-    </dependencies>
-
-</module>
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 352871e17f..07cdcf25ea 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
@@ -3,8 +3,6 @@
         <dependencies>
             <module name="org.keycloak.keycloak-common" services="import"/>
             <module name="org.keycloak.keycloak-core" 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-forms-common-themes" services="import"/>
             <module name="org.keycloak.keycloak-js-adapter" services="import"/>
             <module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
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 c013524519..46916be2fe 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
@@ -11,8 +11,6 @@
         <module name="org.keycloak.keycloak-broker-saml" services="import"/>
         <module name="org.keycloak.keycloak-common" services="import"/>
         <module name="org.keycloak.keycloak-core" 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-forms-common-themes" services="import"/>
         <module name="org.keycloak.keycloak-js-adapter" services="import"/>
         <module name="org.keycloak.keycloak-kerberos-federation" services="import"/>
diff --git a/events/email/pom.xml b/events/email/pom.xml
deleted file mode 100755
index 6769ae3972..0000000000
--- a/events/email/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-email</artifactId>
-    <name>Keycloak Events Email 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.jboss.logging</groupId>
-            <artifactId>jboss-logging</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-   </dependencies>
-
-</project>
diff --git a/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
deleted file mode 100644
index 31448f3ad3..0000000000
--- a/events/email/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
+++ /dev/null
@@ -1 +0,0 @@
-org.keycloak.events.email.EmailEventListenerProviderFactory
\ No newline at end of file
diff --git a/events/jboss-logging/pom.xml b/events/jboss-logging/pom.xml
deleted file mode 100755
index 89646bb080..0000000000
--- a/events/jboss-logging/pom.xml
+++ /dev/null
@@ -1,43 +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-jboss-logging</artifactId>
-    <name>Keycloak Events JBoss Logging Provider</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>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-   </dependencies>
-
-</project>
diff --git a/events/pom.xml b/events/pom.xml
index 1307cdb50f..45e28e5916 100755
--- a/events/pom.xml
+++ b/events/pom.xml
@@ -16,8 +16,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>email</module>
-        <module>jboss-logging</module>
         <module>syslog</module>
     </modules>
 </project>
diff --git a/pom.xml b/pom.xml
index 7b910ee9d9..f200a2afb7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -149,13 +149,12 @@
         <module>model</module>
         <module>events</module>
         <module>saml</module>
-        <!-- force -->
         <module>broker</module>
         <module>social</module>
         <module>forms</module>
-        <module>examples</module>
         <module>util</module>
         <module>wildfly</module>
+        <module>examples</module>
         <module>testsuite</module>
     </modules>
 
@@ -635,16 +634,6 @@
                 <artifactId>keycloak-client-api</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-events-email</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-events-jboss-logging</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.keycloak</groupId>
                 <artifactId>keycloak-events-syslog</artifactId>
diff --git a/events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java
similarity index 100%
rename from events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java
rename to services/src/main/java/org/keycloak/events/email/EmailEventListenerProvider.java
diff --git a/events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java
similarity index 100%
rename from events/email/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java
rename to services/src/main/java/org/keycloak/events/email/EmailEventListenerProviderFactory.java
diff --git a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java
similarity index 100%
rename from events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java
rename to services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProvider.java
diff --git a/events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java b/services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java
similarity index 100%
rename from events/jboss-logging/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java
rename to services/src/main/java/org/keycloak/events/log/JBossLoggingEventListenerProviderFactory.java
diff --git a/events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory b/services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
old mode 100644
new mode 100755
similarity index 51%
rename from events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
rename to services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
index c1ebc1f1a3..8591bfd0ed
--- a/events/jboss-logging/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
+++ b/services/src/main/resources/META-INF/services/org.keycloak.events.EventListenerProviderFactory
@@ -1 +1,2 @@
+org.keycloak.events.email.EmailEventListenerProviderFactory
 org.keycloak.events.log.JBossLoggingEventListenerProviderFactory
\ No newline at end of file