diff --git a/core-java-modules/core-java-concurrency-advanced/README.md b/core-java-modules/core-java-concurrency-advanced/README.md
index 8e99858693..f76e68757a 100644
--- a/core-java-modules/core-java-concurrency-advanced/README.md
+++ b/core-java-modules/core-java-concurrency-advanced/README.md
@@ -1,7 +1,7 @@
-=========
-
 ## Core Java Concurrency Advanced Examples
 
+This module contains articles about advanced concurrency in core Java.
+
 ### Relevant Articles: 
 - [Introduction to Thread Pools in Java](http://www.baeldung.com/thread-pool-java-and-guava)
 - [Guide to CountDownLatch in Java](http://www.baeldung.com/java-countdown-latch)
diff --git a/core-kotlin-2/README.md b/core-kotlin-2/README.md
index d75dd2208a..ecf16c2c91 100644
--- a/core-kotlin-2/README.md
+++ b/core-kotlin-2/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Core Kotlin
+
+This module contains articles about core Kotlin.
+
+### Relevant articles:
 
 - [Void Type in Kotlin](https://www.baeldung.com/kotlin-void-type)
 - [How to use Kotlin Range Expressions](https://www.baeldung.com/kotlin-ranges)
@@ -8,3 +12,4 @@
 - [Split a List into Parts in Kotlin](https://www.baeldung.com/kotlin-split-list-into-parts)
 - [String Comparison in Kotlin](https://www.baeldung.com/kotlin-string-comparison)
 - [Guide to JVM Platform Annotations in Kotlin](https://www.baeldung.com/kotlin-jvm-annotations)
+- More articles: [[<-- prev]](/core-kotlin)
diff --git a/core-kotlin-io/README.md b/core-kotlin-io/README.md
index cb4dac7e4d..ad4c503895 100644
--- a/core-kotlin-io/README.md
+++ b/core-kotlin-io/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Core Kotlin I/O
+
+This module contains articles about core Kotlin I/O.
+
+### Relevant articles:
 
 - [InputStream to String in Kotlin](https://www.baeldung.com/kotlin-inputstream-to-string)
 - [Console I/O in Kotlin](https://www.baeldung.com/kotlin-console-io)
diff --git a/core-kotlin/README.md b/core-kotlin/README.md
index 2728fd4ea0..bdff95d36d 100644
--- a/core-kotlin/README.md
+++ b/core-kotlin/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Core Kotlin
+
+This module contains articles about core Kotlin.
+
+### Relevant articles:
 
 - [Introduction to the Kotlin Language](https://www.baeldung.com/kotlin)
 - [Guide to the “when{}” Block in Kotlin](https://www.baeldung.com/kotlin-when)
@@ -56,3 +60,4 @@
 - [Static Methods Behavior in Kotlin](https://www.baeldung.com/kotlin-static-methods)
 - [Inline Functions in Kotlin](https://www.baeldung.com/kotlin-inline-functions)
 - [Delegation Pattern in Kotlin](https://www.baeldung.com/kotlin-delegation-pattern)
+- More articles: [[next -->]](/core-kotlin-2)
diff --git a/jenkins/README.md b/jenkins/README.md
index 6b28b61277..ba3e13cc95 100644
--- a/jenkins/README.md
+++ b/jenkins/README.md
@@ -1,2 +1,3 @@
+## Jenkins
 
 This is an aggregator modules for Jenkins-related modules.
diff --git a/jenkins/hello-world/README.md b/jenkins/hello-world/README.md
index da60e556df..5f6b9f364a 100644
--- a/jenkins/hello-world/README.md
+++ b/jenkins/hello-world/README.md
@@ -1,3 +1,7 @@
-## Relevant articles:
+## Jenkins Plugins
+
+This module contains articles about Jenkins plugins.
+
+### Relevant articles:
 
 - [Writing a Jenkins Plugin](http://www.baeldung.com/jenkins-custom-plugin)
diff --git a/jhipster/README.md b/jhipster/README.md
new file mode 100644
index 0000000000..1bb31951f0
--- /dev/null
+++ b/jhipster/README.md
@@ -0,0 +1,9 @@
+## JHipster
+
+This module contains articles about JHipster.
+
+### Relevant articles:
+
+- [JHipster with a Microservice Architecture](https://www.baeldung.com/jhipster-microservices)
+- [Intro to JHipster](https://www.baeldung.com/jhipster)
+- [Building a Basic UAA-Secured JHipster Microservice](https://www.baeldung.com/jhipster-uaa-secured-micro-service)
diff --git a/jws/README.md b/jws/README.md
index b939941d22..c7cddb11ac 100644
--- a/jws/README.md
+++ b/jws/README.md
@@ -1,3 +1,7 @@
+## Java Web Start
+
+This module contains articles about Java Web Start.
+
 ### Relevant articles
 
 - [A Guide to the Java Web Start](https://www.baeldung.com/java-web-start)
diff --git a/libraries-2/README.md b/libraries-2/README.md
index 7d7fc67fa7..ea95b18d72 100644
--- a/libraries-2/README.md
+++ b/libraries-2/README.md
@@ -1,5 +1,13 @@
-## Relevant Articles: 
+## Libraries
 
+This module contains articles about various Java libraries. 
+These are small libraries that are relatively easy to use and do not require any separate module of their own.
+
+The code examples related to different libraries are each in their own module.
+
+Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-modules) we already have separate modules. Please make sure to have a look at the existing modules in such cases.
+
+### Relevant articles
 - [A Guide to jBPM with Java](https://www.baeldung.com/jbpm-java)
 - [Guide to Classgraph Library](https://www.baeldung.com/classgraph)
 - [Create a Java Command Line Program with Picocli](https://www.baeldung.com/java-picocli-create-command-line-program)
@@ -10,3 +18,4 @@
 - [Key Value Store with Chronicle Map](https://www.baeldung.com/java-chronicle-map)
 - [Guide to MapDB](https://www.baeldung.com/mapdb)
 - [A Guide to Apache Mesos](https://www.baeldung.com/apache-mesos)
+- More articles [[<-- prev]](/libraries)
diff --git a/libraries/README.md b/libraries/README.md
index c15e0d8fb8..627c30e75a 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -1,3 +1,12 @@
+## Libraries
+
+This module contains articles about various Java libraries. 
+These are small libraries that are relatively easy to use and do not require any separate module of their own.
+
+The code examples related to different libraries are each in their own module.
+
+Remember, for advanced libraries like [Jackson](/jackson) and [JUnit](/testing-modules) we already have separate modules. Please make sure to have a look at the existing modules in such cases.
+
 ### Relevant articles
 
 - [Introduction to Javatuples](https://www.baeldung.com/java-tuples)
@@ -37,9 +46,4 @@
 - [Implementing a FTP-Client in Java](https://www.baeldung.com/java-ftp-client)
 - [Introduction to Functional Java](https://www.baeldung.com/java-functional-library)
 - [A Guide to the Reflections Library](https://www.baeldung.com/reflections-library)
-
-The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
-
-The code examples related to different libraries should go in a new package.
-
-Remember, for advanced libraries like JUnit, Jackson, etc. we already have separate modules. Please make sure to have a look at the existing modules in such cases.
+- More articles [[next -->]](/libraries-2)
diff --git a/persistence-modules/hibernate-mapping/README.md b/persistence-modules/hibernate-mapping/README.md
index 99374f9135..c227620324 100644
--- a/persistence-modules/hibernate-mapping/README.md
+++ b/persistence-modules/hibernate-mapping/README.md
@@ -4,4 +4,4 @@
 - [Persisting Maps with Hibernate](https://www.baeldung.com/hibernate-persisting-maps)
 - [Difference Between @Size, @Length, and @Column(length=value)](https://www.baeldung.com/jpa-size-length-column-differences)
 - [Hibernate Validator Specific Constraints](https://www.baeldung.com/hibernate-validator-constraints)
-- [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
\ No newline at end of file
+- [Hibernate One to Many Annotation Tutorial](http://www.baeldung.com/hibernate-one-to-many)
diff --git a/persistence-modules/hibernate5/README.md b/persistence-modules/hibernate5/README.md
index 65322f0cea..a8e2eae38b 100644
--- a/persistence-modules/hibernate5/README.md
+++ b/persistence-modules/hibernate5/README.md
@@ -1,4 +1,8 @@
-## Relevant articles:
+## Hibernate 5
+
+This module contains articles about Hibernate 5.
+
+### Relevant articles:
 
 - [Dynamic Mapping with Hibernate](http://www.baeldung.com/hibernate-dynamic-mapping)
 - [An Overview of Identifiers in Hibernate](http://www.baeldung.com/hibernate-identifiers)
diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md
index 0e1889c1fc..1b4a175008 100644
--- a/persistence-modules/java-jpa-2/README.md
+++ b/persistence-modules/java-jpa-2/README.md
@@ -1,4 +1,8 @@
-# Relevant Articles
+## JPA in Java
+
+This module contains articles about the Java Persistence API (JPA) in Java.
+
+### Relevant Articles
 
 - [JPA Query Parameters Usage](https://www.baeldung.com/jpa-query-parameters-usage)
 - [Mapping Entitiy Class Names to SQL Table Names with JPA](https://www.baeldung.com/jpa-entity-table-names)
@@ -6,3 +10,4 @@
 - [Types of JPA Queries](https://www.baeldung.com/jpa-queries)
 - [JPA/Hibernate Projections](https://www.baeldung.com/jpa-hibernate-projections)
 - [Combining JPA And/Or Criteria Predicates](https://www.baeldung.com/jpa-and-or-criteria-predicates)
+- More articles: [[<-- prev]](/java-jpa)
\ No newline at end of file
diff --git a/persistence-modules/java-jpa/README.md b/persistence-modules/java-jpa/README.md
index 670203f10d..be4c7fb79a 100644
--- a/persistence-modules/java-jpa/README.md
+++ b/persistence-modules/java-jpa/README.md
@@ -1,4 +1,8 @@
-# Relevant Articles
+## JPA in Java
+
+This module contains articles about the Java Persistence API (JPA) in Java.
+
+### Relevant Articles
 
 - [A Guide to SqlResultSetMapping](https://www.baeldung.com/jpa-sql-resultset-mapping)
 - [A Guide to Stored Procedures with JPA](https://www.baeldung.com/jpa-stored-procedures)
@@ -10,3 +14,4 @@
 - [Defining JPA Entities](https://www.baeldung.com/jpa-entities)
 - [JPA @Basic Annotation](https://www.baeldung.com/jpa-basic-annotation)
 - [Persisting Enums in JPA](https://www.baeldung.com/jpa-persisting-enums-in-jpa)
+- More articles: [[next -->]](/java-jpa-2)