diff --git a/templates/de/doc/korap/kalamar.html.ep b/templates/de/doc/development/kalamar.html.ep
similarity index 84%
rename from templates/de/doc/korap/kalamar.html.ep
rename to templates/de/doc/development/kalamar.html.ep
index 52b7877..db736b9 100644
--- a/templates/de/doc/korap/kalamar.html.ep
+++ b/templates/de/doc/development/kalamar.html.ep
@@ -4,7 +4,7 @@
 
 %= korap_overview 'kalamar'
 
-<p><strong>Hauptentwickler:</strong> Nils Diewald</p>
+<p><strong>Hauptentwickler:</strong> Nils Diewald, Helge Stallkamp</p>
 
 <p>Kalamar ist das wichtigste User-Frontend von KorAP. Es basiert auf <%= ext_link_to 'Mojolicious', "http://mojolicio.us/" %> und ist in Perl und JavaScript geschrieben.</p>
 
diff --git a/templates/de/doc/korap/karang.html.ep b/templates/de/doc/development/karang.html.ep
similarity index 100%
rename from templates/de/doc/korap/karang.html.ep
rename to templates/de/doc/development/karang.html.ep
diff --git a/templates/de/doc/korap/koral.html.ep b/templates/de/doc/development/koral.html.ep
similarity index 100%
rename from templates/de/doc/korap/koral.html.ep
rename to templates/de/doc/development/koral.html.ep
diff --git a/templates/de/doc/korap/krill.html.ep b/templates/de/doc/development/krill.html.ep
similarity index 100%
rename from templates/de/doc/korap/krill.html.ep
rename to templates/de/doc/development/krill.html.ep
diff --git a/templates/de/doc/korap/kustvakt.html.ep b/templates/de/doc/development/kustvakt.html.ep
similarity index 100%
rename from templates/de/doc/korap/kustvakt.html.ep
rename to templates/de/doc/development/kustvakt.html.ep
diff --git a/templates/doc/korap.html.ep b/templates/doc/development.html.ep
similarity index 87%
rename from templates/doc/korap.html.ep
rename to templates/doc/development.html.ep
index 2b0cae5..efd4b70 100644
--- a/templates/doc/korap.html.ep
+++ b/templates/doc/development.html.ep
@@ -2,27 +2,27 @@
 
 %= page_title
 
-%= korap_overview 'korap'
+%= korap_overview 'development'
 
 <p>The KorAP project was launched in 2011 at the <%= ext_link_to 'Leibniz Institute for the German Language (IDS)', "http://www.ids-mannheim.de/" %> in Mannheim, Germany. KorAP is a Corpus Analysis Platform, with an extensible and scalable architecture. It consists of multiple components, that are exchangable due to well defined APIs.</p>
 
 <dl>
-  <dt><%= embedded_link_to('doc', 'Kalamar', 'korap', 'kalamar') %></dt>
+  <dt><%= embedded_link_to('doc', 'Kalamar', 'development', 'kalamar') %></dt>
   <dd>Kalamar is the user frontend. Most users will access the search and analysis capabilities of KorAP through the user frontend. The user will formulate queries in one of several query languages that are passed to Kustvakt.</dd>
 
   <dt><%= embedded_link_to('doc', 'API', 'api') %></dt>
   <dd>As an alternative to the user frontend, queries can be initiated using a REST web interface directly with Kustvakt.</dd>
 
-  <dt><%= embedded_link_to('doc', 'Kustvakt', 'korap', 'kustvakt') %></dt>
-  <dd>Kustvakt is the central user and policy management service. It takes a query and rewrites it to restrict the scope of a search to documents the user is allowed to. It may also inject further properties the user has set up, like preferred annotation layers. To transfer a query written in a certain query language to the internal general query protocol <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>, Kustvakt uses <%= embedded_link_to('doc', 'Koral', 'korap', 'koral') %>.</dd>
+  <dt><%= embedded_link_to('doc', 'Kustvakt', 'development', 'kustvakt') %></dt>
+  <dd>Kustvakt is the central user and policy management service. It takes a query and rewrites it to restrict the scope of a search to documents the user is allowed to. It may also inject further properties the user has set up, like preferred annotation layers. To transfer a query written in a certain query language to the internal general query protocol <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>, Kustvakt uses <%= embedded_link_to('doc', 'Koral', 'development', 'koral') %>.</dd>
 
-  <dt><%= embedded_link_to('doc', 'Koral', 'korap', 'koral') %></dt>
+  <dt><%= embedded_link_to('doc', 'Koral', 'development', 'koral') %></dt>
   <dd>Koral is a library that translates queries written in one of several implemented query languages into a general query protocol, called <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>.</dd>
 
-  <dt><%= embedded_link_to('doc', 'Krill', 'korap', 'krill') %></dt>
+  <dt><%= embedded_link_to('doc', 'Krill', 'development', 'krill') %></dt>
   <dd>Krill is a Lucene based backend engine that can search large corpora for occurrences of search patterns formulated in <%= embedded_link_to('doc', 'KoralQuery', 'api', 'koralquery') %>.</dd>
 
-  <dt><%= embedded_link_to('doc', 'Karang', 'korap', 'karang') %></dt>
+  <dt><%= embedded_link_to('doc', 'Karang', 'development', 'karang') %></dt>
   <dd>Karang is a Neo4j based backend engine that can traverse large corpora represented as graphs.</dd>
 </dl>
 
diff --git a/templates/doc/korap/kalamar.html.ep b/templates/doc/development/kalamar.html.ep
similarity index 100%
rename from templates/doc/korap/kalamar.html.ep
rename to templates/doc/development/kalamar.html.ep
diff --git a/templates/doc/korap/karang.html.ep b/templates/doc/development/karang.html.ep
similarity index 100%
rename from templates/doc/korap/karang.html.ep
rename to templates/doc/development/karang.html.ep
diff --git a/templates/doc/korap/koral.html.ep b/templates/doc/development/koral.html.ep
similarity index 100%
rename from templates/doc/korap/koral.html.ep
rename to templates/doc/development/koral.html.ep
diff --git a/templates/doc/korap/krill.html.ep b/templates/doc/development/krill.html.ep
similarity index 100%
rename from templates/doc/korap/krill.html.ep
rename to templates/doc/development/krill.html.ep
diff --git a/templates/doc/korap/kustvakt.html.ep b/templates/doc/development/kustvakt.html.ep
similarity index 100%
rename from templates/doc/korap/kustvakt.html.ep
rename to templates/doc/development/kustvakt.html.ep
diff --git a/templates/doc/navigation.json b/templates/doc/navigation.json
index a904c16..b53bcf6 100644
--- a/templates/doc/navigation.json
+++ b/templates/doc/navigation.json
@@ -104,7 +104,7 @@
   },
   {
     "title": "Development",
-    "id": "korap",
+    "id": "development",
     "items": [
       {
         "title": "Kalamar",