diff --git a/core-java-modules/core-java-datetime/README.md b/core-java-modules/core-java-datetime/README.md
index 51f52e239d..9077b0a10f 100644
--- a/core-java-modules/core-java-datetime/README.md
+++ b/core-java-modules/core-java-datetime/README.md
@@ -1,3 +1,3 @@
 ## Java Date and Time
 
-This module contains articles about date and time in Java.
+This module contains articles about date and time in Java. Please refer to its submodules.
diff --git a/core-java-modules/core-java-datetime/java-dates-java8/README.md b/core-java-modules/core-java-datetime/java-dates-java8/README.md
new file mode 100644
index 0000000000..1e36c546df
--- /dev/null
+++ b/core-java-modules/core-java-datetime/java-dates-java8/README.md
@@ -0,0 +1,6 @@
+## Java 8+ Date and Time API 
+
+This module contains articles about the Date and Time API introduced with Java 8.
+
+### Relevant Articles: 
+- [Migrating to the New Java 8 Date Time API](http://www.baeldung.com/migrating-to-java-8-date-time-api)
diff --git a/core-java-modules/core-java-datetime/java-dates-java8/pom.xml b/core-java-modules/core-java-datetime/java-dates-java8/pom.xml
new file mode 100644
index 0000000000..d5bbcb6e4d
--- /dev/null
+++ b/core-java-modules/core-java-datetime/java-dates-java8/pom.xml
@@ -0,0 +1,53 @@
+<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>
+    <artifactId>java-dates-java8</artifactId>
+    <version>${project.parent.version}</version>
+    <name>java-dates-java8</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-java</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../../parent-java</relativePath>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>java-dates-java8</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>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+		<maven.compiler.source>1.9</maven.compiler.source>
+        <maven.compiler.target>1.9</maven.compiler.target>
+        <!-- testing -->
+        <assertj.version>3.6.1</assertj.version>
+    </properties>
+</project>
diff --git a/java-dates/src/test/java/com/baeldung/dateapi/ConversionExample.java b/core-java-modules/core-java-datetime/java-dates-java8/src/test/java/com/baeldung/dateapi/ConversionExample.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/dateapi/ConversionExample.java
rename to core-java-modules/core-java-datetime/java-dates-java8/src/test/java/com/baeldung/dateapi/ConversionExample.java
diff --git a/java-dates/src/test/java/com/baeldung/dateapi/JavaUtilTimeUnitTest.java b/core-java-modules/core-java-datetime/java-dates-java8/src/test/java/com/baeldung/dateapi/JavaUtilTimeUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/dateapi/JavaUtilTimeUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-java8/src/test/java/com/baeldung/dateapi/JavaUtilTimeUnitTest.java
diff --git a/core-java-modules/core-java-datetime/pom.xml b/core-java-modules/core-java-datetime/pom.xml
index e61f804a32..080289e751 100644
--- a/core-java-modules/core-java-datetime/pom.xml
+++ b/core-java-modules/core-java-datetime/pom.xml
@@ -18,6 +18,7 @@
 	<modules>
 		<module>java-dates-computations</module>
 		<module>java-dates-conversion</module>
+		<module>java-dates-java8</module>
 		<module>java-dates-string</module>
 	</modules>
 
diff --git a/java-dates/README.md b/java-dates/README.md
index c9ee971101..f16ea6d411 100644
--- a/java-dates/README.md
+++ b/java-dates/README.md
@@ -5,7 +5,6 @@
 ### Relevant Articles: 
 - [TemporalAdjuster in Java](http://www.baeldung.com/java-temporal-adjuster)
 - [Period and Duration in Java](http://www.baeldung.com/java-period-duration)
-- [Migrating to the New Java 8 Date Time API](http://www.baeldung.com/migrating-to-java-8-date-time-api)
 - [Introduction to the Java 8 Date/Time API](http://www.baeldung.com/java-8-date-time-intro)
 - [Get the Current Date, Time and Timestamp in Java 8](http://www.baeldung.com/current-date-time-and-timestamp-in-java-8)
 - [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)