diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml
index 2b83328295..5b34a903ce 100644
--- a/libraries-data/pom.xml
+++ b/libraries-data/pom.xml
@@ -147,7 +147,6 @@
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
         </dependency>
-
         <!--  crunch project  -->
 		<dependency>
 			<groupId>org.apache.crunch</groupId>
@@ -185,7 +184,72 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-                
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-core</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-java</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils_2.11</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility-proxy</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -336,6 +400,10 @@
         <ignite.version>2.4.0</ignite.version>
         <gson.version>2.8.2</gson.version>
         <cache.version>1.1.0</cache.version>
+        <flink.version>1.5.0</flink.version>
+        <jackson.version>2.8.5</jackson.version>
+        <awaitility.version>3.0.0</awaitility.version>
+        <assertj.version>3.6.2</assertj.version>
         <hazelcast.version>3.8.4</hazelcast.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
diff --git a/libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java b/libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
rename to libraries-data/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
diff --git a/libraries/src/main/java/com/baeldung/flink/LineSplitter.java b/libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/LineSplitter.java
rename to libraries-data/src/main/java/com/baeldung/flink/LineSplitter.java
diff --git a/libraries/src/main/java/com/baeldung/flink/WordCount.java b/libraries-data/src/main/java/com/baeldung/flink/WordCount.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/WordCount.java
rename to libraries-data/src/main/java/com/baeldung/flink/WordCount.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Consumers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Consumers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Consumers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/connector/Producers.java b/libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/connector/Producers.java
rename to libraries-data/src/main/java/com/baeldung/flink/connector/Producers.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/Backup.java b/libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/model/Backup.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/Backup.java
diff --git a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
similarity index 99%
rename from libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
rename to libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
index 183fa69c11..b3f75256ae 100644
--- a/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java
@@ -18,7 +18,6 @@ public class InputMessage {
     public String getSender() {
         return sender;
     }
-
     public void setSender(String sender) {
         this.sender = sender;
     }
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java b/libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java b/libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
diff --git a/libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java b/libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
rename to libraries-data/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
similarity index 100%
rename from libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
diff --git a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
similarity index 89%
rename from libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
rename to libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
index 1df456bbe5..9aaf8b9877 100644
--- a/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
+++ b/libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
@@ -1,8 +1,6 @@
 package com.baeldung.flink.schema;
 
 import com.baeldung.flink.model.InputMessage;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.apache.flink.api.common.serialization.DeserializationSchema;
diff --git a/libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/BackupCreatorIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCapitalizerIntegrationTest.java
diff --git a/libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
similarity index 100%
rename from libraries/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
rename to libraries-data/src/test/java/com/baeldung/flink/WordCountIntegrationTest.java
diff --git a/libraries/pom.xml b/libraries/pom.xml
index f7980f10f6..91c54b6113 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -154,45 +154,7 @@
             <artifactId>commons-dbutils</artifactId>
             <version>${commons.dbutils.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
-            <version>${flink.version}</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-core</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-java</artifactId>
-            <version>${flink.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_2.11</artifactId>
-            <version>${flink.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-math3</artifactId>
@@ -239,11 +201,7 @@
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
+
         <!-- JDO -->
         <dependency>
             <groupId>org.datanucleus</groupId>
@@ -900,7 +858,6 @@
 
         <httpclient.version>4.5.3</httpclient.version>
         <commons.io.version>2.5</commons.io.version>
-        <flink.version>1.5.0</flink.version>
         <jackson.version>2.8.5</jackson.version>
         <neuroph.version>2.92</neuroph.version>
         <serenity.version>1.9.26</serenity.version>