diff --git a/core-java-modules/core-java-documentation/README.md b/core-java-modules/core-java-documentation/README.md
new file mode 100644
index 0000000000..b66b9e8c05
--- /dev/null
+++ b/core-java-modules/core-java-documentation/README.md
@@ -0,0 +1,6 @@
+## Core Java Documentation
+
+### Relevant Articles: 
+
+- [Introduction to Javadoc](http://www.baeldung.com/javadoc)
+
diff --git a/core-java-modules/core-java-documentation/pom.xml b/core-java-modules/core-java-documentation/pom.xml
new file mode 100644
index 0000000000..be18af1b10
--- /dev/null
+++ b/core-java-modules/core-java-documentation/pom.xml
@@ -0,0 +1,41 @@
+<?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>
+    <artifactId>core-java-documentation</artifactId>
+    <version>0.1.0-SNAPSHOT</version>
+    <name>core-java-documentation</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven-javadoc-plugin.version}</version>
+                <configuration>
+                    <source>${source.version}</source>
+                    <target>${target.version}</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <!-- maven plugins -->
+        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
+        <source.version>1.8</source.version>
+        <target.version>1.8</target.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/CodeSnippetFormatting.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/Person.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/Person.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/Person.java
diff --git a/core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java b/core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/SuperHero.java
similarity index 100%
rename from core-java-modules/core-java/src/main/java/com/baeldung/javadoc/SuperHero.java
rename to core-java-modules/core-java-documentation/src/main/java/com/baeldung/javadoc/SuperHero.java
diff --git a/core-java-modules/core-java/README.md b/core-java-modules/core-java/README.md
index f29d6abd7c..8858c58b1c 100644
--- a/core-java-modules/core-java/README.md
+++ b/core-java-modules/core-java/README.md
@@ -5,6 +5,5 @@
 - [Getting Started with Java Properties](http://www.baeldung.com/java-properties)
 - [Java Money and the Currency API](http://www.baeldung.com/java-money-and-currency)
 - [Compiling Java *.class Files with javac](http://www.baeldung.com/javac)
-- [Introduction to Javadoc](http://www.baeldung.com/javadoc)
 - [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties)
 - [Illegal Character Compilation Error](https://www.baeldung.com/java-illegal-character-error)
diff --git a/core-java-modules/core-java/pom.xml b/core-java-modules/core-java/pom.xml
index 552999702e..9ccfc7cbd8 100644
--- a/core-java-modules/core-java/pom.xml
+++ b/core-java-modules/core-java/pom.xml
@@ -110,15 +110,6 @@
                     </arguments>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>${maven-javadoc-plugin.version}</version>
-                <configuration>
-                    <source>${source.version}</source>
-                    <target>${target.version}</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 
@@ -188,9 +179,6 @@
         <grep4j.version>1.8.7</grep4j.version>
         <!-- maven plugins -->
         <javamoney.moneta.version>1.1</javamoney.moneta.version>
-        <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
-        <source.version>1.8</source.version>
-        <target.version>1.8</target.version>
         <spring.core.version>4.3.20.RELEASE</spring.core.version>
         <gdata.version>1.47.1</gdata.version>
     </properties>
diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml
index c5dbdca299..6cf4c7bee0 100644
--- a/core-java-modules/pom.xml
+++ b/core-java-modules/pom.xml
@@ -67,6 +67,7 @@
         <module>core-java-datetime-string-2</module>
         <module>core-java-date-operations-2</module>
         <module>core-java-date-operations-3</module>
+        <module>core-java-documentation</module>
         <module>core-java-exceptions</module>
         <module>core-java-exceptions-2</module>
         <module>core-java-exceptions-3</module>