diff --git a/documentation/javadocs/2.5/android/index.html b/documentation/javadocs/2.5/android/index.html
deleted file mode 100644
index 1f69d2cd..00000000
--- a/documentation/javadocs/2.5/android/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-parent: Javadocs
-title: Google Android
-long-title: Javadocs - Google Android
-layout: documentation
-section: javadoc
-version: '2.5'
-nav_order: 0
----
-<h4>Version {{ page.version }}</h4>
-
-<p class="index">
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/android/api/index.html">Restlet API</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/android/ext/index.html">Restlet Extensions</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/android/engine/index.html">Restlet Engine</a><br />
-</p>
diff --git a/documentation/javadocs/2.5/gae/index.html b/documentation/javadocs/2.5/gae/index.html
deleted file mode 100644
index 97ebe468..00000000
--- a/documentation/javadocs/2.5/gae/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-parent: Javadocs
-title: Google App Engine
-long-title: Javadocs - Google App Engine
-layout: documentation
-section: javadoc
-version: '2.5'
-nav_order: 1
----
-<h4>Version {{ page.version }}</h4>
-
-<p class="index">
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/gae/api/index.html">Restlet API</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/gae/ext/index.html">Restlet Extensions</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/gae/engine/index.html">Restlet Engine</a><br />
-</p>
diff --git a/documentation/javadocs/2.5/index.html b/documentation/javadocs/2.5/index.html
index e067b01f..38c117a4 100644
--- a/documentation/javadocs/2.5/index.html
+++ b/documentation/javadocs/2.5/index.html
@@ -8,10 +8,6 @@
 ---
 
 <p class="index">
-  <a href="android/">Android</a><br />
-  <a href="gae/">Google App Engine</a><br />
+  <a href="java/">Java Edition</a><br />
   <a href="gwt/">Google Web Toolkit</a><br />
-  <a href="jee/">Java Entreprise Edition</a><br />
-  <a href="jse/">Java Standard Edition</a><br />
-  <a href="osgi/">OSGi Environments</a><br />
 </p>
diff --git a/documentation/javadocs/2.5/java/index.html b/documentation/javadocs/2.5/java/index.html
new file mode 100644
index 00000000..9bed4e9a
--- /dev/null
+++ b/documentation/javadocs/2.5/java/index.html
@@ -0,0 +1,16 @@
+---
+parent: Javadocs
+title: Java Standard Edition
+long-title: Javadocs - Java Standard Edition
+layout: documentation
+section: javadoc
+version: '2.5'
+nav_order: 4
+---
+<h4>Version {{ page.version }}</h4>
+
+<p class="index">
+  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/java/api/index.html">Restlet API</a><br />
+  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/java/ext/index.html">Restlet Extensions</a><br />
+  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/java/engine/index.html">Restlet Engine</a><br />
+</p>
diff --git a/documentation/javadocs/2.5/jee/index.html b/documentation/javadocs/2.5/jee/index.html
deleted file mode 100644
index 8257cc34..00000000
--- a/documentation/javadocs/2.5/jee/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-parent: Javadocs
-title: Java Entreprise Edition
-long-title: Javadocs - Java Entreprise Edition
-layout: documentation
-section: javadoc
-version: '2.5'
-nav_order: 3
----
-<h4>Version {{ page.version }}</h4>
-
-<p class="index">
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jee/api/index.html">Restlet API</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jee/ext/index.html">Restlet Extensions</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jee/engine/index.html">Restlet Engine</a><br />
-</p>
diff --git a/documentation/javadocs/2.5/jse/index.html b/documentation/javadocs/2.5/jse/index.html
deleted file mode 100644
index f055e404..00000000
--- a/documentation/javadocs/2.5/jse/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-parent: Javadocs
-title: Java Standard Edition
-long-title: Javadocs - Java Standard Edition
-layout: documentation
-section: javadoc
-version: '2.5'
-nav_order: 4
----
-<h4>Version {{ page.version }}</h4>
-
-<p class="index">
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jse/api/index.html">Restlet API</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jse/ext/index.html">Restlet Extensions</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/jse/engine/index.html">Restlet Engine</a><br />
-</p>
diff --git a/documentation/javadocs/2.5/osgi/index.html b/documentation/javadocs/2.5/osgi/index.html
deleted file mode 100644
index dea4785b..00000000
--- a/documentation/javadocs/2.5/osgi/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
----
-parent: Javadocs
-title: OSGi Environments
-long-title: Javadocs - OSGi Environments
-layout: documentation
-section: javadoc
-version: '2.5'
-nav_order: 5
----
-<h4>Version {{ page.version }}</h4>
-
-<p class="index">
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/osgi/api/index.html">Restlet API</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/osgi/ext/index.html">Restlet Extensions</a><br />
-  <a href="{{ site.data.javadoc.baseUrl }}{{ page.version }}/osgi/engine/index.html">Restlet Engine</a><br />
-</p>