diff --git a/akka-docs/src/main/paradox/index.md b/akka-docs/src/main/paradox/index.md
index 204c099eee..486ea75cf7 100644
--- a/akka-docs/src/main/paradox/index.md
+++ b/akka-docs/src/main/paradox/index.md
@@ -1,10 +1,4 @@
 # Contents
 
-@@toc { depth=1 }
-
-@@@ index
-
-* [java](java.md)
-* [scala](scala.md)
-
-@@@
+* @ref[Java Documentation](java/index.md)
+* @ref[Scala Documentation](scala/index.md)
diff --git a/akka-docs/src/main/paradox/java.md b/akka-docs/src/main/paradox/java.md
deleted file mode 100644
index 287557f7db..0000000000
--- a/akka-docs/src/main/paradox/java.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Java Documentation
-
-@@toc { depth=2 }
-
-@@@ index
-
-* [security/index](java/security/index.md)
-* [java/guide](java/guide/index.md)
-* [general/index](java/general/index.md)
-* [java/index-actors](java/index-actors.md)
-* [java/index-network](java/index-network.md)
-* [java/stream/index](java/stream/index.md)
-* [java/index-futures](java/index-futures.md)
-* [java/index-utilities](java/index-utilities.md)
-* [common/other-modules](java/common/other-modules.md)
-* [java/howto](java/howto.md)
-* [java/scala-compat](java/scala-compat.md)
-* [project/index](java/project/index.md)
-* [additional/index](java/additional/index.md)
-
-@@@
\ No newline at end of file
diff --git a/akka-docs/src/main/paradox/java/index.md b/akka-docs/src/main/paradox/java/index.md
new file mode 100644
index 0000000000..1fd1bf7b20
--- /dev/null
+++ b/akka-docs/src/main/paradox/java/index.md
@@ -0,0 +1,21 @@
+# Java Documentation
+
+@@toc { depth=2 }
+
+@@@ index
+
+* [security/index](security/index.md)
+* [guide/index](guide/index.md)
+* [general/index](general/index.md)
+* [index-actors](index-actors.md)
+* [index-network](index-network.md)
+* [stream/index](stream/index.md)
+* [index-futures](index-futures.md)
+* [index-utilities](index-utilities.md)
+* [common/other-modules](common/other-modules.md)
+* [howto](howto.md)
+* [scala-compat](scala-compat.md)
+* [project/index](project/index.md)
+* [additional/index](additional/index.md)
+
+@@@
diff --git a/akka-docs/src/main/paradox/java/scala-compat.md b/akka-docs/src/main/paradox/java/scala-compat.md
index 71a5fe9df7..2c242c1678 100644
--- a/akka-docs/src/main/paradox/java/scala-compat.md
+++ b/akka-docs/src/main/paradox/java/scala-compat.md
@@ -3,10 +3,6 @@
 Akka requires that you have [Java 8](http://www.oracle.com/technetwork/java/javase/downloads/index.html) or
 later installed on your machine.
 
-## Scala and Java APIs
-
-Akka has both a @ref:[Scala Documentation](../scala.md) and a @ref:[Java Documentation](../java.md).
-
 ## Java 8 types
 
 Starting with Akka 2.4.2 we have begun to introduce Java 8 types (most
diff --git a/akka-docs/src/main/paradox/scala.md b/akka-docs/src/main/paradox/scala.md
deleted file mode 100644
index a956070dba..0000000000
--- a/akka-docs/src/main/paradox/scala.md
+++ /dev/null
@@ -1,20 +0,0 @@
-# Scala Documentation
-
-@@toc { depth=2 }
-
-@@@ index
-
-* [security/index](scala/security/index.md)
-* [scala/guide](scala/guide/index.md)
-* [general/index](scala/general/index.md)
-* [scala/index-actors](scala/index-actors.md)
-* [scala/index-network](scala/index-network.md)
-* [scala/stream/index](scala/stream/index.md)
-* [scala/index-futures](scala/index-futures.md)
-* [scala/index-utilities](scala/index-utilities.md)
-* [common/other-modules](scala/common/other-modules.md)
-* [scala/howto](scala/howto.md)
-* [project/index](scala/project/index.md)
-* [additional/index](scala/additional/index.md)
-
-@@@
diff --git a/akka-docs/src/main/paradox/scala/index.md b/akka-docs/src/main/paradox/scala/index.md
new file mode 100644
index 0000000000..e5d0e5415b
--- /dev/null
+++ b/akka-docs/src/main/paradox/scala/index.md
@@ -0,0 +1,20 @@
+# Scala Documentation
+
+@@toc { depth=2 }
+
+@@@ index
+
+* [security/index](security/index.md)
+* [guide/index](guide/index.md)
+* [general/index](general/index.md)
+* [index-actors](index-actors.md)
+* [index-network](index-network.md)
+* [stream/index](stream/index.md)
+* [index-futures](index-futures.md)
+* [index-utilities](index-utilities.md)
+* [common/other-modules](common/other-modules.md)
+* [howto](howto.md)
+* [project/index](project/index.md)
+* [additional/index](additional/index.md)
+
+@@@