diff --git a/docs/ecosystem.md b/docs/ecosystem.md
index 4accd610f..9fbc56f8e 100644
--- a/docs/ecosystem.md
+++ b/docs/ecosystem.md
@@ -1,4 +1,4 @@
-# Tendermint Ecosystem
+# Ecosystem
 
 The growing list of applications built using various pieces of the
 Tendermint stack can be found at:
diff --git a/docs/index.rst b/docs/index.rst
index a539cd22c..b40db3bf4 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -12,23 +12,17 @@ Welcome to Tendermint!
    :width: 200px
    :align: center
 
-Tendermint 101
---------------
+Introduction
+------------
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    introduction.md
    install.md
    getting-started.md
    using-tendermint.md
-
-Tendermint Ecosystem
---------------------
-
-.. toctree::
-   :maxdepth: 2
-
+   deploy-testnets.md
    ecosystem.md
 
 Tendermint Tools
@@ -39,22 +33,19 @@ Tendermint Tools
 .. toctree::
    :maxdepth: 1
 
-   deploy-testnets.md
-   terraform-and-ansible.md
    tools/docker.md
+   terraform-and-ansible.md
    tools/benchmarking.md
    tools/monitoring.md
 
-.. TODO fix tools
-
-Tendermint 102
---------------
+ABCI, Apps, Logging, Etc
+------------------------
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    abci-cli.md
-   abci-spec.rst 
+   abci-spec.md
    app-architecture.md
    app-development.md
    subscribing-to-events-via-websocket.md
@@ -62,16 +53,16 @@ Tendermint 102
    how-to-read-logs.md
    running-in-production.md
 
-Tendermint 201
---------------
+Research & Specification
+------------------------
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    determinism.md
    transactional-semantics.md
 
-.. specification.md
+.. specification.md ## keep this file for legacy purpose. needs to be fixed though
 
 * For a deeper dive, see `this thesis <https://atrium.lib.uoguelph.ca/xmlui/handle/10214/9769>`__.
 * There is also the `original whitepaper <https://tendermint.com/static/docs/tendermint.pdf>`__, though it is now quite outdated.
diff --git a/docs/introduction.md b/docs/introduction.md
index b621b6f70..419071dca 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -1,9 +1,4 @@
-# Introduction
-
-Welcome to the Tendermint guide! This is the best place to start if you
-are new to Tendermint.
-
-## What is Tendermint?
+# What is Tendermint?
 
 Tendermint is software for securely and consistently replicating an
 application on many machines. By securely, we mean that Tendermint works