diff --git a/docs/scaffolding.md b/docs/scaffolding.md
index 818b242b..ddde0de8 100644
--- a/docs/scaffolding.md
+++ b/docs/scaffolding.md
@@ -1,15 +1,24 @@
 # Scaffolding Tools
+- [Scaffold Definition](#scaffold-definition)
+- [Nodejs Scaffolding with Yeoman](#nodejs-scaffolding-with-yeoman)
+- [Java Scaffolding](#java-scaffolding)
+    - [Java Scaffolding with Spring Roo](#java-scaffolding-with-spring-roo)
+    - [Java Scaffolding with Maven](#java-scaffolding-with-maven)
+
+## Scaffold Definition 
 - [Wikipedia: Scaffold (programming)](https://en.wikipedia.org/wiki/Scaffold_(programming))
 
-## Nodejs
+## Nodejs Scaffolding with Yeoman
 - [Yeoman](https://en.wikipedia.org/wiki/Yeoman_(software))
-* [callicoder.com: Scaffolding your Spring Boot Application with Yeoman](https://www.callicoder.com/scaffolding-your-spring-boot-application/)
+- [callicoder.com: Scaffolding your Spring Boot Application with Yeoman](https://www.callicoder.com/scaffolding-your-spring-boot-application/)
 
-## Java
-- [Spring Roo](https://en.wikipedia.org/wiki/Spring_Roo)
+## Java Scaffolding 
+### Java Scaffolding with Spring Roo
+- [Wikipedia: Spring Roo](https://en.wikipedia.org/wiki/Spring_Roo)
+- [Spring Roo](https://projects.spring.io/spring-roo/)
 
-## Scaffolding a project with Maven
+### Java Scaffolding with Maven
 - Maven supports project scaffolding, based on project templates (called archtype). This is provided by the archetype plug-in. Maven provides archetypes for almost anything, from a simple Java application to a complex web application. The goal of this scaffolding is to allow a fast start into the Maven world. It provides the "standardized" folder structure of software projects.
 - You can create a project by executing the generation goal on the archetype plugin via the following command: ```mvn archetype:generate```.
-- [Maven](maven.md)
+- [Maven](maven.md/#apache-maven)