diff --git a/core-java-modules/core-java-datetime/java-dates-computations/README.md b/core-java-modules/core-java-datetime/java-dates-computations/README.md
index 73b927df98..019c34c7d3 100644
--- a/core-java-modules/core-java-datetime/java-dates-computations/README.md
+++ b/core-java-modules/core-java-datetime/java-dates-computations/README.md
@@ -4,3 +4,13 @@ This module contains articles about date and time computations in Java.
 
 ### Relevant Articles: 
 - [Difference Between Two Dates in Java](http://www.baeldung.com/java-date-difference)
+- [Get Date Without Time in Java](http://www.baeldung.com/java-date-without-time)
+- [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates)
+- [Extracting Year, Month and Day from Date in Java](http://www.baeldung.com/java-year-month-day)
+- [Guide to java.util.GregorianCalendar](http://www.baeldung.com/java-gregorian-calendar)
+- [Handling Daylight Savings Time in Java](http://www.baeldung.com/java-daylight-savings)
+- [Calculate Age in Java](http://www.baeldung.com/java-get-age)
+- [Increment Date in Java](http://www.baeldung.com/java-increment-date)
+- [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
+- [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
+- [Measure Elapsed Time in Java](http://www.baeldung.com/java-measure-elapsed-time)
diff --git a/core-java-modules/core-java-datetime/java-dates-computations/pom.xml b/core-java-modules/core-java-datetime/java-dates-computations/pom.xml
index 8ce396d229..46790bdce4 100644
--- a/core-java-modules/core-java-datetime/java-dates-computations/pom.xml
+++ b/core-java-modules/core-java-datetime/java-dates-computations/pom.xml
@@ -19,7 +19,18 @@
             <artifactId>joda-time</artifactId>
             <version>${joda-time.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3.version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.darwinsys</groupId>
             <artifactId>hirondelle-date4j</artifactId>
diff --git a/java-dates/src/main/java/com/baeldung/date/AgeCalculator.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/date/AgeCalculator.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/date/AgeCalculator.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/date/AgeCalculator.java
diff --git a/java-dates/src/main/java/com/baeldung/date/DateWithoutTime.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/date/DateWithoutTime.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/date/DateWithoutTime.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/date/DateWithoutTime.java
diff --git a/java-dates/src/main/java/com/baeldung/datetime/AddHoursToDate.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/AddHoursToDate.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetime/AddHoursToDate.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/AddHoursToDate.java
diff --git a/java-dates/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java
similarity index 95%
rename from java-dates/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java
index a6cef94377..8b6d9885af 100644
--- a/java-dates/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java
+++ b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/DateExtractYearMonthDayIntegerValues.java
@@ -1,28 +1,28 @@
-package com.baeldung.datetime;
-
-import java.util.Calendar;
-import java.util.Date;
-
-public class DateExtractYearMonthDayIntegerValues {
-
-    int getYear(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-
-        return calendar.get(Calendar.YEAR);
-    }
-
-    int getMonth(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-
-        return calendar.get(Calendar.MONTH);
-    }
-
-    int getDay(Date date) {
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
-
-        return calendar.get(Calendar.DAY_OF_MONTH);
-    }
-}
+package com.baeldung.datetime;
+
+import java.util.Calendar;
+import java.util.Date;
+
+public class DateExtractYearMonthDayIntegerValues {
+
+    int getYear(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        return calendar.get(Calendar.YEAR);
+    }
+
+    int getMonth(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        return calendar.get(Calendar.MONTH);
+    }
+
+    int getDay(Date date) {
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+
+        return calendar.get(Calendar.DAY_OF_MONTH);
+    }
+}
diff --git a/java-dates/src/main/java/com/baeldung/datetime/modify/DateIncrementer.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/modify/DateIncrementer.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/datetime/modify/DateIncrementer.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/datetime/modify/DateIncrementer.java
diff --git a/java-dates/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/gregorian/calendar/GregorianCalendarExample.java
diff --git a/java-dates/src/main/java/com/baeldung/java9/time/TimeApi.java b/core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/java9/time/TimeApi.java
similarity index 100%
rename from java-dates/src/main/java/com/baeldung/java9/time/TimeApi.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/main/java/com/baeldung/java9/time/TimeApi.java
diff --git a/java-dates/src/test/java/com/baeldung/date/DateWithoutTimeUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/date/DateWithoutTimeUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/date/DateWithoutTimeUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/date/DateWithoutTimeUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetime/AddHoursToDateUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/datetime/AddHoursToDateUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetime/AddHoursToDateUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/datetime/AddHoursToDateUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/datetime/modify/DateIncrementerUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/datetime/modify/DateIncrementerUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/datetime/modify/DateIncrementerUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/datetime/modify/DateIncrementerUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/dst/DaylightSavingTimeExamplesUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/dst/DaylightSavingTimeJavaTimeExamplesUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/gregorian/calendar/GregorianCalendarTester.java
diff --git a/java-dates/src/test/java/com/baeldung/java9/time/TimeApiUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/java9/time/TimeApiUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/java9/time/TimeApiUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/java9/time/TimeApiUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/jodatime/JodaTimeUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/jodatime/JodaTimeUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/jodatime/JodaTimeUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/jodatime/JodaTimeUnitTest.java
diff --git a/java-dates/src/test/java/com/baeldung/time/ElapsedTimeUnitTest.java b/core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/time/ElapsedTimeUnitTest.java
similarity index 100%
rename from java-dates/src/test/java/com/baeldung/time/ElapsedTimeUnitTest.java
rename to core-java-modules/core-java-datetime/java-dates-computations/src/test/java/com/baeldung/time/ElapsedTimeUnitTest.java
diff --git a/java-dates/README.md b/java-dates/README.md
index 71290c7c0f..c9ee971101 100644
--- a/java-dates/README.md
+++ b/java-dates/README.md
@@ -4,21 +4,11 @@
 
 ### Relevant Articles: 
 - [TemporalAdjuster in Java](http://www.baeldung.com/java-temporal-adjuster)
-- [Handling Daylight Savings Time in Java](http://www.baeldung.com/java-daylight-savings)
 - [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)
-- [Get Date Without Time in Java](http://www.baeldung.com/java-date-without-time)
-- [How to Get All Dates Between Two Dates?](http://www.baeldung.com/java-between-dates)
-- [Extracting Year, Month and Day from Date in Java](http://www.baeldung.com/java-year-month-day)
-- [Guide to java.util.GregorianCalendar](http://www.baeldung.com/java-gregorian-calendar)
-- [Measure Elapsed Time in Java](http://www.baeldung.com/java-measure-elapsed-time)
 - [How to Get the Start and the End of a Day using Java](http://www.baeldung.com/java-day-start-end)
-- [Calculate Age in Java](http://www.baeldung.com/java-get-age)
-- [Increment Date in Java](http://www.baeldung.com/java-increment-date)
-- [Add Hours To a Date In Java](http://www.baeldung.com/java-add-hours-date)
 - [ZoneOffset in Java](https://www.baeldung.com/java-zone-offset)
 - [Differences Between ZonedDateTime and OffsetDateTime](https://www.baeldung.com/java-zoneddatetime-offsetdatetime)
-- [Introduction to Joda-Time](http://www.baeldung.com/joda-time)
 - [Comparing Dates in Java](https://www.baeldung.com/java-comparing-dates)
diff --git a/java-dates/pom.xml b/java-dates/pom.xml
index 8e6b708c2f..464a3bff12 100644
--- a/java-dates/pom.xml
+++ b/java-dates/pom.xml
@@ -15,23 +15,12 @@
     </parent>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3.version}</version>
-        </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>${log4j.version}</version>
         </dependency>
         <!-- test scoped -->
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>${assertj.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
diff --git a/pom.xml b/pom.xml
index 137c174b47..bac4baa403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -469,7 +469,7 @@
                 <module>java-collections-maps</module>
                 <module>java-collections-maps-2</module>
                 <module>java-jdi</module>
-				<!--<module>core-java-modules/core-java-datetime</module>--> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
+				<module>core-java-modules/core-java-datetime</module> <!-- We haven't upgraded to java 9. Fixing in BAEL-10841 -->
 				<!--<module>java-dates</module>-->
                 <!-- <module>java-ee-8-security-api</module> --> <!-- long running -->
                 <module>java-lite</module>