diff --git a/core-java/pom.xml b/core-java/pom.xml
index 3406bddda9..85afee2968 100644
--- a/core-java/pom.xml
+++ b/core-java/pom.xml
@@ -64,11 +64,6 @@
             <version>${grep4j.version}</version>
         </dependency>
         
-        <dependency>
-            <groupId>com.lmax</groupId>
-            <artifactId>disruptor</artifactId>
-            <version>${disruptor.version}</version>
-        </dependency>
         <!-- web -->
 
         <!-- marshalling -->
@@ -369,7 +364,6 @@
         <unix4j.version>0.4</unix4j.version>
         <grep4j.version>1.8.7</grep4j.version>
         <lombok.version>1.16.12</lombok.version>
-        <disruptor.version>3.3.6</disruptor.version>
 
         <!-- testing -->
         <org.hamcrest.version>1.3</org.hamcrest.version>
diff --git a/disruptor/README.md b/disruptor/README.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/disruptor/pom.xml b/disruptor/pom.xml
new file mode 100644
index 0000000000..7f2c78c9b0
--- /dev/null
+++ b/disruptor/pom.xml
@@ -0,0 +1,251 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung</groupId>
+    <artifactId>disruptor</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
+    <name>disruptor</name>
+
+    <dependencies>
+
+        <!-- utils -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+            <version>${disruptor.version}</version>
+        </dependency>
+
+        <!-- logging -->
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <version>${logback.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>${org.slf4j.version}</version>
+        </dependency>
+
+        <!-- test scoped -->
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-all</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-core</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${org.hamcrest.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>disruptor</finalName>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <archive>
+                                <manifest>
+                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                                </manifest>
+                            </archive>
+                            <descriptorRefs>
+                                <descriptorRef>jar-with-dependencies</descriptorRef>
+                            </descriptorRefs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <transformers>
+                                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.jolira</groupId>
+                <artifactId>onejar-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <mainClass>org.baeldung.executable.ExecutableMavenJar</mainClass>
+                            <attachToBuild>true</attachToBuild>
+                            <filename>${project.build.finalName}-onejar.${project.packaging}</filename>
+                        </configuration>
+                        <goals>
+                            <goal>one-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+
+    </build>
+
+    <profiles>
+        <profile>
+            <id>integration</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>test</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <systemPropertyVariables>
+                                <test.mime>json</test.mime>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <properties>
+        <!-- logging -->
+        <org.slf4j.version>1.7.21</org.slf4j.version>
+        <logback.version>1.1.7</logback.version>
+
+        <!-- util -->
+        <commons-lang3.version>3.5</commons-lang3.version>
+        <disruptor.version>3.3.6</disruptor.version>
+
+        <!-- testing -->
+        <org.hamcrest.version>1.3</org.hamcrest.version>
+        <junit.version>4.12</junit.version>
+        <mockito.version>1.10.19</mockito.version>
+        <testng.version>6.10</testng.version>
+        <assertj.version>3.6.1</assertj.version>
+
+        <!-- maven plugins -->
+        <maven-compiler-plugin.version>3.6.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/DelayedMultiEventProducer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/EventConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/EventConsumer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/EventConsumer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/EventConsumer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/EventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/EventProducer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/EventProducer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/EventProducer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/MultiEventPrintConsumer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java b/disruptor/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/SingleEventPrintConsumer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/SingleEventProducer.java b/disruptor/src/main/java/com/baeldung/disruptor/SingleEventProducer.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/SingleEventProducer.java
rename to disruptor/src/main/java/com/baeldung/disruptor/SingleEventProducer.java
diff --git a/core-java/src/main/java/com/baeldung/disruptor/ValueEvent.java b/disruptor/src/main/java/com/baeldung/disruptor/ValueEvent.java
similarity index 100%
rename from core-java/src/main/java/com/baeldung/disruptor/ValueEvent.java
rename to disruptor/src/main/java/com/baeldung/disruptor/ValueEvent.java
diff --git a/core-java/src/test/java/com/baeldung/disruptor/DisruptorTest.java b/disruptor/src/test/java/com/baeldung/disruptor/DisruptorTest.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/disruptor/DisruptorTest.java
rename to disruptor/src/test/java/com/baeldung/disruptor/DisruptorTest.java
diff --git a/core-java/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java b/disruptor/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java
rename to disruptor/src/test/java/com/baeldung/disruptor/MultiEventConsumer.java
diff --git a/core-java/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java b/disruptor/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java
similarity index 100%
rename from core-java/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java
rename to disruptor/src/test/java/com/baeldung/disruptor/SingleEventConsumer.java
diff --git a/pom.xml b/pom.xml
index 661b80fca5..cd17b611c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,6 +44,7 @@
         <module>guava</module>
         <module>guava18</module>
         <module>guava19</module>
+        <module>disruptor</module>
 
         <module>handling-spring-static-resources</module>
         <module>hazelcast</module>