diff --git a/templates/doc/annotation.html.ep b/templates/doc/annotation.html.ep
new file mode 100644
index 0000000..18cdad9
--- /dev/null
+++ b/templates/doc/annotation.html.ep
@@ -0,0 +1,20 @@
+% layout 'main', title => 'Annotations';
+
+%= page_title
+
+<p>KorAP supports an arbitrary number of <%= embedded_link_to 'doc', 'Annotations', 'data', 'annotation' %> from different sources (called <em>foundries</em>) with different <em>layers</em>.</p>
+
+<dl>
+  <p>Annotations of the following kind are supported:</p>
+  <dt>Tokens</dt>
+  <dd>Annotations associated to single tokens (e.g. words or numbers)</dd>
+  
+  <dt>Spans</dt>
+  <dd>Annotations to a sequence of words or nodes (e.g. sentences, phrases, constituency annotations)</dd>
+
+  <dt>Relations</dt>
+  <dd>Annotations of relations between tokens or spans (e.g. dependency annotations)</dd>
+
+  <dt>Attributes</dt>
+  <dd>Attribute information for tokens, spans, or relations (e.g. attributes of HTML elements)</dd>
+</dl>
diff --git a/templates/doc/data.html.ep b/templates/doc/data.html.ep
deleted file mode 100644
index 237e851..0000000
--- a/templates/doc/data.html.ep
+++ /dev/null
@@ -1,27 +0,0 @@
-% layout 'main', title => 'KorAP: Corpus Data';
-
-%= page_title
-
-<p>KorAP is developed as being the main access point to
-  <%= ext_link_to 'DeReKo', 'http://www1.ids-mannheim.de/kl/projekte/korpora' %>,
-  being the successor of <%= ext_link_to 'COSMAS II', 'https://cosmas2.ids-mannheim.de/cosmas2-web/' %> in that regard.
-  But KorAP is not focussed on any specific corpus, it is, for example, now also used for the Romanian national corpus <%= ext_link_to 'CoRoLa', 'http://corola.racai.ro/' %>.</p>
-
-<p>In KorAP, corpus texts are allowed to have arbitrary metadata information, that partially can be used to create subcorpora (so-called virtual corpora).</p>
-
-<p>KorAP also supports an arbitrary number of <%= embedded_link_to 'doc', 'Annotations', 'data', 'annotation' %> from different sources (called <em>foundries</em>) with different <em>layers</em>.</p>
-
-<dl>
-  <p>Annotations of the following kind are supported:</p>
-  <dt>Tokens</dt>
-  <dd>Annotations associated to single tokens (e.g. words or numbers)</dd>
-  
-  <dt>Spans</dt>
-  <dd>Annotations to a sequence of words or nodes (e.g. sentences, phrases, constituency annotations)</dd>
-
-  <dt>Relations</dt>
-  <dd>Annotations of relations between tokens or spans (e.g. dependency annotations)</dd>
-
-  <dt>Attributes</dt>
-  <dd>Attribute information for tokens, spans, or relations (e.g. attributes of HTML elements)</dd>
-</dl>
diff --git a/templates/doc/navigation.json b/templates/doc/navigation.json
index 677d335..b301e8c 100644
--- a/templates/doc/navigation.json
+++ b/templates/doc/navigation.json
@@ -100,15 +100,9 @@
     ]
   },
   {
-    "title": "Corpus Data",
-    "id": "data",
-    "class": "folded",
-    "items": [
-      {
-        "title": "Annotations",
-        "id": "annotation"
-      }
-    ]
+    "title": "Annotations",
+    "id": "annotation",
+    "class": "folded"
   },
   {
     "title": "FAQ",
@@ -147,4 +141,4 @@
       }
     ]
   }
-]
+]
\ No newline at end of file