diff --git a/docs/README.md b/docs/README.md
index 7444c5ef7369..bfc1539b3c8b 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -36,7 +36,7 @@ build described below.
 ## Local build
 
 To build the documentation without docker on your local machine, first
-install the required packages for Ubutun 14.04.  These are approximately:
+install the required packages for Ubuntu 14.04.  These are approximately:
 
 ```
 sudo apt-get install doxygen python-pip
diff --git a/docs/_static/mxnet-theme/navbar.html b/docs/_static/mxnet-theme/navbar.html
index d5493e3eba5b..a8a79cc95f7a 100644
--- a/docs/_static/mxnet-theme/navbar.html
+++ b/docs/_static/mxnet-theme/navbar.html
@@ -52,7 +52,7 @@ <h1 id="logo-wrap">
         <a class="main-nav-link" href="{{url_root}}{{name.lower()|replace(" ", "_")}}/index.html">{{name}}</a>
         {% endfor %}
 
-        {% for name in ['Packages'] %}
+        {% for name in ['Supported Languages'] %}
         <span id="dropdown-menu-position-anchor">
           <a href="#" class="main-nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="true">{{name}} <span class="caret"></span></a>
           <ul id="package-dropdown-menu" class="dropdown-menu">
diff --git a/docs/how_to/multi_devices.md b/docs/how_to/multi_devices.md
index c3cdb2b0c9c8..cb81cd3df4a6 100644
--- a/docs/how_to/multi_devices.md
+++ b/docs/how_to/multi_devices.md
@@ -52,7 +52,7 @@ python train_mnist.py --gpus 0,2 ...
 If the GPUs are have different computation power, we can partition the workload
 according to their powers. For example, if GPU 0 is 3 times faster than GPU 2,
 then we provide an additional workload option `work_load_list=[3, 1]`, see
-[model.fit](../packages/python/model.html#mxnet.model.FeedForward.fit) for more
+[model.fit](../supported_languages/python/model.html#mxnet.model.FeedForward.fit) for more
 details.
 
 Training with multiple GPUs should have the same results as a single GPU if all
diff --git a/docs/index.md b/docs/index.md
index dc152b8eb64b..5b13db9ce3a9 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -2,11 +2,11 @@ Contents
 --------
 These are used to generate the index used in search.
 
-- [Python Documents](packages/python/index.md)
-- [R Documents](packages/r/index.md)
-- [Julia Documents](packages/julia/index.md)
-- [Julia Documents](packages/c++/index.md)
-- [Scala Documents](packages/scala/index.md)
+- [Python Documents](supported_languages/python/index.md)
+- [R Documents](supported_languages/r/index.md)
+- [Julia Documents](supported_languages/julia/index.md)
+- [Julia Documents](supported_languages/c++/index.md)
+- [Scala Documents](supported_languages/scala/index.md)
 - [Howto Documents](how_to/index.md)
 - [Get Started Documents](get_started/index.md)
 - [System Documents](system/index.md)
diff --git a/docs/packages/c++/index.md b/docs/supported_languages/c++/index.md
similarity index 100%
rename from docs/packages/c++/index.md
rename to docs/supported_languages/c++/index.md
diff --git a/docs/packages/julia/index.md b/docs/supported_languages/julia/index.md
similarity index 100%
rename from docs/packages/julia/index.md
rename to docs/supported_languages/julia/index.md
diff --git a/docs/packages/python/index.md b/docs/supported_languages/python/index.md
similarity index 100%
rename from docs/packages/python/index.md
rename to docs/supported_languages/python/index.md
diff --git a/docs/packages/python/io.md b/docs/supported_languages/python/io.md
similarity index 100%
rename from docs/packages/python/io.md
rename to docs/supported_languages/python/io.md
diff --git a/docs/packages/python/kvstore.md b/docs/supported_languages/python/kvstore.md
similarity index 100%
rename from docs/packages/python/kvstore.md
rename to docs/supported_languages/python/kvstore.md
diff --git a/docs/packages/python/model.md b/docs/supported_languages/python/model.md
similarity index 100%
rename from docs/packages/python/model.md
rename to docs/supported_languages/python/model.md
diff --git a/docs/packages/python/module.md b/docs/supported_languages/python/module.md
similarity index 100%
rename from docs/packages/python/module.md
rename to docs/supported_languages/python/module.md
diff --git a/docs/packages/python/ndarray.md b/docs/supported_languages/python/ndarray.md
similarity index 100%
rename from docs/packages/python/ndarray.md
rename to docs/supported_languages/python/ndarray.md
diff --git a/docs/packages/python/symbol.md b/docs/supported_languages/python/symbol.md
similarity index 100%
rename from docs/packages/python/symbol.md
rename to docs/supported_languages/python/symbol.md
diff --git a/docs/packages/python/symbol_in_pictures.md b/docs/supported_languages/python/symbol_in_pictures.md
similarity index 100%
rename from docs/packages/python/symbol_in_pictures.md
rename to docs/supported_languages/python/symbol_in_pictures.md
diff --git a/docs/packages/python/tutorial.md b/docs/supported_languages/python/tutorial.md
similarity index 100%
rename from docs/packages/python/tutorial.md
rename to docs/supported_languages/python/tutorial.md
diff --git a/docs/packages/r/CallbackFunctionTutorial.md b/docs/supported_languages/r/CallbackFunctionTutorial.md
similarity index 100%
rename from docs/packages/r/CallbackFunctionTutorial.md
rename to docs/supported_languages/r/CallbackFunctionTutorial.md
diff --git a/docs/packages/r/CharRnnModel.md b/docs/supported_languages/r/CharRnnModel.md
similarity index 100%
rename from docs/packages/r/CharRnnModel.md
rename to docs/supported_languages/r/CharRnnModel.md
diff --git a/docs/packages/r/Makefile b/docs/supported_languages/r/Makefile
similarity index 100%
rename from docs/packages/r/Makefile
rename to docs/supported_languages/r/Makefile
diff --git a/docs/packages/r/classifyRealImageWithPretrainedModel.md b/docs/supported_languages/r/classifyRealImageWithPretrainedModel.md
similarity index 100%
rename from docs/packages/r/classifyRealImageWithPretrainedModel.md
rename to docs/supported_languages/r/classifyRealImageWithPretrainedModel.md
diff --git a/docs/packages/r/fiveMinutesNeuralNetwork.md b/docs/supported_languages/r/fiveMinutesNeuralNetwork.md
similarity index 100%
rename from docs/packages/r/fiveMinutesNeuralNetwork.md
rename to docs/supported_languages/r/fiveMinutesNeuralNetwork.md
diff --git a/docs/packages/r/index.md b/docs/supported_languages/r/index.md
similarity index 100%
rename from docs/packages/r/index.md
rename to docs/supported_languages/r/index.md
diff --git a/docs/packages/r/mnistCompetition.md b/docs/supported_languages/r/mnistCompetition.md
similarity index 100%
rename from docs/packages/r/mnistCompetition.md
rename to docs/supported_languages/r/mnistCompetition.md
diff --git a/docs/packages/r/ndarrayAndSymbolTutorial.md b/docs/supported_languages/r/ndarrayAndSymbolTutorial.md
similarity index 100%
rename from docs/packages/r/ndarrayAndSymbolTutorial.md
rename to docs/supported_languages/r/ndarrayAndSymbolTutorial.md
diff --git a/docs/packages/scala/index.md b/docs/supported_languages/scala/index.md
similarity index 100%
rename from docs/packages/scala/index.md
rename to docs/supported_languages/scala/index.md
diff --git a/docs/zh/packages/python/index.md b/docs/zh/supported_languages/python/index.md
similarity index 100%
rename from docs/zh/packages/python/index.md
rename to docs/zh/supported_languages/python/index.md
diff --git a/docs/zh/packages/python/io.md b/docs/zh/supported_languages/python/io.md
similarity index 100%
rename from docs/zh/packages/python/io.md
rename to docs/zh/supported_languages/python/io.md
diff --git a/docs/zh/packages/python/kvstore.md b/docs/zh/supported_languages/python/kvstore.md
similarity index 100%
rename from docs/zh/packages/python/kvstore.md
rename to docs/zh/supported_languages/python/kvstore.md
diff --git a/docs/zh/packages/python/ndarray.md b/docs/zh/supported_languages/python/ndarray.md
similarity index 100%
rename from docs/zh/packages/python/ndarray.md
rename to docs/zh/supported_languages/python/ndarray.md
diff --git a/docs/zh/packages/r/CallbackFunctionTutorial.md b/docs/zh/supported_languages/r/CallbackFunctionTutorial.md
similarity index 100%
rename from docs/zh/packages/r/CallbackFunctionTutorial.md
rename to docs/zh/supported_languages/r/CallbackFunctionTutorial.md
diff --git a/docs/zh/packages/r/CharRnnModel.Rmd b/docs/zh/supported_languages/r/CharRnnModel.Rmd
similarity index 100%
rename from docs/zh/packages/r/CharRnnModel.Rmd
rename to docs/zh/supported_languages/r/CharRnnModel.Rmd
diff --git a/docs/zh/packages/r/fiveMinutesNeuralNetwork.md b/docs/zh/supported_languages/r/fiveMinutesNeuralNetwork.md
similarity index 100%
rename from docs/zh/packages/r/fiveMinutesNeuralNetwork.md
rename to docs/zh/supported_languages/r/fiveMinutesNeuralNetwork.md