diff --git a/apache-flink/pom.xml b/apache-flink/pom.xml
deleted file mode 100644
index c93ea3ef77..0000000000
--- a/apache-flink/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>groupId</groupId>
-    <artifactId>apache-flink</artifactId>
-    <version>1.0-SNAPSHOT</version>
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-    </parent>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-core</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_2.11</artifactId>
-            <version>1.5.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.9.6</version>
-        </dependency>
-    </dependencies>
-</project>
\ No newline at end of file
diff --git a/libraries/pom.xml b/libraries/pom.xml
index b19a005d94..047b56dd01 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -169,6 +169,17 @@
             <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>
@@ -243,6 +254,11 @@
             <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>
@@ -947,7 +963,7 @@
 
         <httpclient.version>4.5.3</httpclient.version>
         <commons.io.version>2.5</commons.io.version>
-        <flink.version>1.2.0</flink.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>
diff --git a/apache-flink/src/main/java/com/baeldung/FlinkDataPipeline.java b/libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/FlinkDataPipeline.java
rename to libraries/src/main/java/com/baeldung/flink/FlinkDataPipeline.java
diff --git a/apache-flink/src/main/java/com/baeldung/flink/Consumers.java b/libraries/src/main/java/com/baeldung/flink/connector/Consumers.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/flink/Consumers.java
rename to libraries/src/main/java/com/baeldung/flink/connector/Consumers.java
diff --git a/apache-flink/src/main/java/com/baeldung/flink/Producers.java b/libraries/src/main/java/com/baeldung/flink/connector/Producers.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/flink/Producers.java
rename to libraries/src/main/java/com/baeldung/flink/connector/Producers.java
diff --git a/apache-flink/src/main/java/com/baeldung/model/Backup.java b/libraries/src/main/java/com/baeldung/flink/model/Backup.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/model/Backup.java
rename to libraries/src/main/java/com/baeldung/flink/model/Backup.java
diff --git a/apache-flink/src/main/java/com/baeldung/model/InputMessage.java b/libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/model/InputMessage.java
rename to libraries/src/main/java/com/baeldung/flink/model/InputMessage.java
diff --git a/apache-flink/src/main/java/com/baeldung/flink/BackupAggregator.java b/libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/flink/BackupAggregator.java
rename to libraries/src/main/java/com/baeldung/flink/operator/BackupAggregator.java
diff --git a/apache-flink/src/main/java/com/baeldung/flink/InputMessageTimestampAssigner.java b/libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/flink/InputMessageTimestampAssigner.java
rename to libraries/src/main/java/com/baeldung/flink/operator/InputMessageTimestampAssigner.java
diff --git a/apache-flink/src/main/java/com/baeldung/flink/WordsCapitalizer.java b/libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/flink/WordsCapitalizer.java
rename to libraries/src/main/java/com/baeldung/flink/operator/WordsCapitalizer.java
diff --git a/apache-flink/src/main/java/com/baeldung/schema/BackupSerializationSchema.java b/libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/schema/BackupSerializationSchema.java
rename to libraries/src/main/java/com/baeldung/flink/schema/BackupSerializationSchema.java
diff --git a/apache-flink/src/main/java/com/baeldung/schema/InputMessageDeserializationSchema.java b/libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java
similarity index 100%
rename from apache-flink/src/main/java/com/baeldung/schema/InputMessageDeserializationSchema.java
rename to libraries/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java