diff --git a/docs/en/build.md b/docs/build.md
similarity index 100%
rename from docs/en/build.md
rename to docs/build.md
diff --git a/docs/en/compiling.md b/docs/compiling.md
similarity index 100%
rename from docs/en/compiling.md
rename to docs/compiling.md
diff --git a/docs/en/extn-developer-faq.md b/docs/extn-developer-faq.md
similarity index 100%
rename from docs/en/extn-developer-faq.md
rename to docs/extn-developer-faq.md
diff --git a/docs/en/flash.md b/docs/flash.md
similarity index 92%
rename from docs/en/flash.md
rename to docs/flash.md
index 7593542355..7e95fd9556 100644
--- a/docs/en/flash.md
+++ b/docs/flash.md
@@ -37,23 +37,14 @@ Run the following command to flash an *aggregated* binary as is produced for exa
 ### NodeMCU PyFlasher
 > Self-contained [NodeMCU](https://github.com/nodemcu/nodemcu-firmware) flasher with GUI based on [esptool.py](https://github.com/espressif/esptool) and [wxPython](https://www.wxpython.org/).
 
-![NodeMCU PyFlasher](../img/NodeMCU-PyFlasher.png "NodeMCU PyFlasher")
+![NodeMCU PyFlasher](img/NodeMCU-PyFlasher.png "NodeMCU PyFlasher")
 
 Source: [https://github.com/marcelstoer/nodemcu-pyflasher](https://github.com/marcelstoer/nodemcu-pyflasher)
 
-Supported platforms: anything that runs Python, runnable .exe available for Windows and .dmg for macOS
+Supported platforms: anything that runs Python, runnable `.exe` available for Windows and `.dmg` for macOS
 
 Disclaimer: the availability of [NodeMCU PyFlasher was announced on the NodeMCU Facebook page](https://www.facebook.com/NodeMCU/posts/663197460515251) but it is not an official offering of the current NodeMCU firmware team.
 
-### NodeMCU Flasher
-> A firmware Flash tool for NodeMCU...We are working on next version and will use QT framework. It will be cross platform and open-source.
-
-Source: [https://github.com/nodemcu/nodemcu-flasher](https://github.com/nodemcu/nodemcu-flasher)
-
-Supported platforms: Windows
-
-Note that this tool was created by the initial developers of the NodeMCU firmware. **It hasn't seen updates since September 2015** and is not maintained by the current NodeMCU *firmware* team. Be careful to not accidentally flash the very old default firmware the tool is shipped with.
-
 ## Putting Device Into Flash Mode
 
 To enable ESP8266 firmware flashing GPIO0 pin must be pulled low before the device is reset. Conversely, for a normal boot, GPIO0 must be pulled high or floating.
diff --git a/docs/en/getting-started.md b/docs/getting-started.md
similarity index 99%
rename from docs/en/getting-started.md
rename to docs/getting-started.md
index 3d1a1c784b..76da932fbf 100644
--- a/docs/en/getting-started.md
+++ b/docs/getting-started.md
@@ -325,4 +325,4 @@ Once the LFS image file is on SPIFFS, you can execute the [node.flashreload()](.
 
 Do a protected call of this `_init` code: `pcall(node.flashindex("_init"))` and check the error status.  See [Programming Techniques and Approachs](lfs.md#programming-techniques-and-approachs) in the LFS whitepaper for a more detailed description. 
 
-[↑ back to matrix](#task-os-selector)
\ No newline at end of file
+[↑ back to matrix](#task-os-selector)
diff --git a/docs/en/hardware-faq.md b/docs/hardware-faq.md
similarity index 100%
rename from docs/en/hardware-faq.md
rename to docs/hardware-faq.md
diff --git a/docs/index.md b/docs/index.md
index ea345dcf49..c8d2999e4c 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,10 +1,10 @@
 # NodeMCU Documentation
 
-NodeMCU is an open source [Lua](https://www.lua.org/) based firmware for the [ESP8266 WiFi SOC from Espressif](http://espressif.com/en/products/esp8266/) and uses an on-module flash-based [SPIFFS](https://github.com/pellepl/spiffs) file system. NodeMCU is implemented in C and is layered on the [Espressif NON-OS SDK](https://github.com/espressif/ESP8266_NONOS_SDK).
+NodeMCU is an open source [Lua](https://www.lua.org/) based firmware for the [ESP8266 WiFi SOC from Espressif](http://espressif.com/products/esp8266/) and uses an on-module flash-based [SPIFFS](https://github.com/pellepl/spiffs) file system. NodeMCU is implemented in C and is layered on the [Espressif NON-OS SDK](https://github.com/espressif/ESP8266_NONOS_SDK).
 
 The firmware was initially developed as is a companion project to the popular ESP8266-based [NodeMCU development modules](https://github.com/nodemcu/nodemcu-devkit-v1.0), but the project is now community-supported, and the firmware can now be run on _any_ ESP module.
 
-→ [Getting Started](en/getting-started.md)
+→ [Getting Started](getting-started.md)
 
 ## Programming Model
 The NodeMCU programming model is similar to that of [Node.js](https://en.wikipedia.org/wiki/Node.js), only in Lua. It is asynchronous and event-driven. Many functions, therefore, have parameters for callback functions. To give you an idea what a NodeMCU program looks like study the short snippets below. For more extensive examples have a look at the [`/lua_examples`](https://github.com/nodemcu/nodemcu-firmware/tree/master/lua_examples) folder in the repository on GitHub.
@@ -45,10 +45,10 @@ gpio.write(pin, gpio.HIGH)
 print(gpio.read(pin))
 ```
 
-→ [Getting Started](en/getting-started.md)
+→ [Getting Started](getting-started.md)
 
 ## Lua Flash Store (LFS)
-In September 2018 support for a [Lua Flash Store (LFS)](en/lfs.md) was introduced. LFS allows Lua code and its associated constant data to be executed directly out of flash-memory; just as the firmware itself is executed. This now enables NodeMCU developers to create Lua applications with up to 256Kb Lua code and read-only constants executing out of flash. All of the RAM is available for read-write data!
+In September 2018 support for a [Lua Flash Store (LFS)](lfs.md) was introduced. LFS allows Lua code and its associated constant data to be executed directly out of flash-memory; just as the firmware itself is executed. This now enables NodeMCU developers to create Lua applications with up to 256Kb Lua code and read-only constants executing out of flash. All of the RAM is available for read-write data!
 
 ## Releases
 
@@ -57,4 +57,4 @@ This project uses two main branches, `master` and `dev`. `dev` is actively worke
 A new tag is created every time `dev` is merged back to `master`. They are listed in the [releases section on GitHub](https://github.com/nodemcu/nodemcu-firmware/releases). Tag names follow the `<SDK-version>-master_yyyymmdd` pattern.
 
 ## Up-To-Date Documentation
-At the moment the only up-to-date documentation maintained by the current NodeMCU team is in English. It is part of the source code repository (`/docs` subfolder) and kept in sync with the code.
\ No newline at end of file
+At the moment the only up-to-date documentation maintained by the current NodeMCU team is in English. It is part of the source code repository (`/docs` subfolder) and kept in sync with the code.
diff --git a/docs/js/extra.js b/docs/js/extra.js
index 1f8c5209aa..e2fef36d74 100644
--- a/docs/js/extra.js
+++ b/docs/js/extra.js
@@ -1,16 +1,9 @@
 var nodemcu = nodemcu || {};
-
 (function () {
   'use strict';
-  //var languageCodeToNameMap = {en: 'English', de: 'Deutsch'};
-  var languageCodeToNameMap = {en: 'English'};
-  var languageNames = values(languageCodeToNameMap);
-  var defaultLanguageCode = 'en';
 
   $(document).ready(function () {
     addToc();
-    hideNavigationForAllButSelectedLanguage();
-    addLanguageSelectorToRtdFlyOutMenu();
     replaceRelativeLinksWithStaticGitHubUrl();
   });
 
@@ -45,75 +38,13 @@ var nodemcu = nodemcu || {};
     }
   }
 
-  function hideNavigationForAllButSelectedLanguage() {
-    var selectedLanguageCode = determineSelectedLanguageCode();
-    var selectedLanguageName = languageCodeToNameMap[selectedLanguageCode];
-    // Finds all subnav elements and hides them if they're /language/ subnavs. Hence, all 'Modules' subnav elements
-    // won't be hidden.
-    // <ul class="subnav">
-    //   <li><span>Modules</span></li>
-    //   <li class="toctree-l1 ">
-    //     <a class="" href="EN/modules/node/">node</a>
-    //   </li>
-    $('.subnav li span').not(':contains(' + selectedLanguageName + ')').each(function (index) {
-      var spanElement = $(this);
-      if ($.inArray(spanElement.text(), languageNames) > -1) {
-        spanElement.parent().parent().hide();
-      }
-    });
-  }
-
-  /**
-   * Adds a language selector to the RTD fly-out menu found bottom left. Example:
-   *
-   * <dl>
-   *   <dt>Languages</dt>
-   *   <dd><a href="http://nodemcu.readthedocs.io/en/<branch>/de/">de</a></dd>
-   *   <strong>
-   *     <dd><a href="http://nodemcu.readthedocs.io/en/<branch>/en/">en</a></dd>
-   *   </strong>
-   * </dl>
-   *
-   * UGLY! That fly-out menu is added by RTD with an AJAX call after page load. Hence, we need to
-   * react to the subsequent DOM manipulation using a DOM4 MutationObserver. The provided structure
-   * is as follows:
-   *
-   * <div class="rst-other-versions">
-   *   <!-- Inserted RTD Footer -->
-   *   <div class="injected">
-   */
-  function addLanguageSelectorToRtdFlyOutMenu() {
-    var flyOutWrapper = $('.rst-other-versions');
-    // only relevant on RTD
-    if (flyOutWrapper.size() > 0) {
-      var observer = new MutationObserver(function (mutations) {
-        // since mutation on the target node was triggered we can safely assume the injected RTD div has now been added
-        var injectedDiv = $('.rst-other-versions .injected');
-        var selectedLanguageCode = determineSelectedLanguageCode();
-        var dl = document.createElement('dl');
-        var dt = document.createElement('dt');
-        dl.appendChild(dt);
-        dt.appendChild(document.createTextNode('Languages'));
-        for (var languageCode in languageCodeToNameMap) {
-          dl.appendChild(createLanguageLinkFor(languageCode, selectedLanguageCode === languageCode));
-        }
-        injectedDiv.prepend(dl);
-        // no need for that observer anymore
-        observer.disconnect();
-      });
-
-      // observed target node is the fly-out wrapper, the only event we care about is when children are modified
-      observer.observe(flyOutWrapper[0], {childList: true});
-    }
-  }
-
   /**
    * The module doc pages contain relative links to artifacts in the GitHub repository. For those links to work both
    * on GitHub (i.e. when the page is viewed on GitHub) and on RTD they are defined with a relative URL. This function
    * replaces the relative path with an absolute path based on the selected branch.
    */
   function replaceRelativeLinksWithStaticGitHubUrl() {
-    var relativePath = isOnRtd() ? "../../../.." : "../../..";
+    var relativePath = isOnRtd() ? "../../.." : "../..";
     var gitHubPath = "https://github.com/nodemcu/nodemcu-firmware/tree/" + determineSelectedBranch();
     var gitHubLinks = $("a[href^='" + relativePath + "']").each(function (index) {
       var url = $(this).attr('href');
@@ -121,48 +52,6 @@ var nodemcu = nodemcu || {};
     });
   }
 
-  function createLanguageLinkFor(languageCode, isCurrentlySelected) {
-    var strong;
-    // split[0] is an '' because the path starts with the separator
-    var pathSegments = window.location.pathname.split('/');
-    var dd = document.createElement("dd");
-    var href = document.createElement("a");
-    href.setAttribute('href', '/' + pathSegments[1] + '/' + pathSegments[2] + '/' + languageCode);
-    href.appendChild(document.createTextNode(languageCode));
-    dd.appendChild(href);
-    if (isCurrentlySelected) {
-      strong = document.createElement("strong");
-      strong.appendChild(dd);
-      return strong;
-    } else {
-      return dd;
-    }
-  }
-
-  /**
-   * Analyzes the URL of the current page to find out what the selected language is. It's usually
-   * part of the location path. The code needs to distinguish between running MkDocs standalone
-   * and docs served from RTD. If no valid language could be determined the default language is
-   * returned.
-   *
-   * @returns 2-char language code
-   */
-  function determineSelectedLanguageCode() {
-    var selectedLanguageCode, path = window.location.pathname;
-    if (isOnRtd()) {
-      // path is like /en/<branch>/<lang>/build/ -> extract 'lang'
-      // split[0] is an '' because the path starts with the separator
-      selectedLanguageCode = path.split('/')[3];
-    } else if (!window.location.href.startsWith('file://')) {
-      // path is like /<lang>/build/ -> extract 'lang'
-      selectedLanguageCode = path.substr(1, 2);
-    }
-    if (!selectedLanguageCode || selectedLanguageCode.length > 2) {
-      selectedLanguageCode = defaultLanguageCode;
-    }
-    return selectedLanguageCode;
-  }
-
   /**
    * Analyzes the URL of the current page to find out what the selected GitHub branch is. It's usually
    * part of the location path. The code needs to distinguish between running MkDocs standalone
diff --git a/docs/en/lcd.md b/docs/lcd.md
similarity index 100%
rename from docs/en/lcd.md
rename to docs/lcd.md
diff --git a/docs/en/lfs.md b/docs/lfs.md
similarity index 100%
rename from docs/en/lfs.md
rename to docs/lfs.md
diff --git a/docs/en/lua-developer-faq.md b/docs/lua-developer-faq.md
similarity index 100%
rename from docs/en/lua-developer-faq.md
rename to docs/lua-developer-faq.md
diff --git a/docs/en/lua-modules/bh1750.md b/docs/lua-modules/bh1750.md
similarity index 97%
rename from docs/en/lua-modules/bh1750.md
rename to docs/lua-modules/bh1750.md
index dbcef38b0f..de25df6fd1 100644
--- a/docs/en/lua-modules/bh1750.md
+++ b/docs/lua-modules/bh1750.md
@@ -1,7 +1,7 @@
 # BH1750 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-01-30 | [Martin Han](https://github.com/MarsTechHAN) | [Martin Han](https://github.com/MarsTechHAN) | [bh1750.lua](../../../lua_modules/bh1750/bh1750.lua) |
+| 2015-01-30 | [Martin Han](https://github.com/MarsTechHAN) | [Martin Han](https://github.com/MarsTechHAN) | [bh1750.lua](../../lua_modules/bh1750/bh1750.lua) |
 
 This Lua module provides access to [BH1750](https://www.mouser.com/ds/2/348/bh1750fvi-e-186247.pdf) I²C ambient light sensor.
 
@@ -70,4 +70,4 @@ print("lux: "..(l / 100).."."..(l % 100).." lx")
 -- release module
 bh1750 = nil
 package.loaded["bh1750"] = nil
-```
\ No newline at end of file
+```
diff --git a/docs/en/lua-modules/ds18b20.md b/docs/lua-modules/ds18b20.md
similarity index 93%
rename from docs/en/lua-modules/ds18b20.md
rename to docs/lua-modules/ds18b20.md
index 12d9e88792..61fa8eb67b 100644
--- a/docs/en/lua-modules/ds18b20.md
+++ b/docs/lua-modules/ds18b20.md
@@ -1,7 +1,7 @@
 # DS18B20 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-08 | [Huang Rui](https://github.com/vowstar) | [Huang Rui](https://github.com/vowstar) | [ds18b20.lua](../../../lua_modules/ds18b20/ds18b20.lua) |
+| 2014-12-08 | [Huang Rui](https://github.com/vowstar) | [Huang Rui](https://github.com/vowstar) | [ds18b20.lua](../../lua_modules/ds18b20/ds18b20.lua) |
 
 This Lua module provides access to [DS18B20](https://datasheets.maximintegrated.com/en/ds/DS18B20.pdf) 1-Wire digital thermometer.
 
@@ -75,4 +75,4 @@ A table with sensors present on the bus. It includes its address (8 bytes) and i
 A table with readout values (also passed as a parameter to callback function). It is addressed by sensor addresses.
 
 #### Notes
-Other examples of using this module can be found in [ds18b20-example.lua](../../../lua_modules/ds18b20/ds18b20-example.lua) and [ds18b20-web.lua](../../../lua_modules/ds18b20/ds18b20-web.lua) files.
\ No newline at end of file
+Other examples of using this module can be found in [ds18b20-example.lua](../../lua_modules/ds18b20/ds18b20-example.lua) and [ds18b20-web.lua](../../lua_modules/ds18b20/ds18b20-web.lua) files.
diff --git a/docs/en/lua-modules/ds3231.md b/docs/lua-modules/ds3231.md
similarity index 97%
rename from docs/en/lua-modules/ds3231.md
rename to docs/lua-modules/ds3231.md
index d2a4934e45..4e80635447 100644
--- a/docs/en/lua-modules/ds3231.md
+++ b/docs/lua-modules/ds3231.md
@@ -1,7 +1,7 @@
 # DS3231 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-01-19 | [Tobie Booth](https://github.com/tobiebooth) | [Tobie Booth](https://github.com/tobiebooth) | [ds3231.lua](../../../lua_modules/ds3231/ds3231.lua) |
+| 2015-01-19 | [Tobie Booth](https://github.com/tobiebooth) | [Tobie Booth](https://github.com/tobiebooth) | [ds3231.lua](../../lua_modules/ds3231/ds3231.lua) |
 
 This Lua module provides access to [DS3231](https://datasheets.maximintegrated.com/en/ds/DS3231.pdf) I²C real-time clock.
 
@@ -299,4 +299,4 @@ package.loaded["ds3231"] = nil
 ```
 
 #### Notes
-Other examples of using this module can be found in [ds3231-example.lua](../../../lua_modules/ds3231/ds3231-example.lua) and [ds3231-web.lua](../../../lua_modules/ds3231/ds3231-web.lua) files.
\ No newline at end of file
+Other examples of using this module can be found in [ds3231-example.lua](../../lua_modules/ds3231/ds3231-example.lua) and [ds3231-web.lua](../../lua_modules/ds3231/ds3231-web.lua) files.
diff --git a/docs/en/lua-modules/ftpserver.md b/docs/lua-modules/ftpserver.md
similarity index 95%
rename from docs/en/lua-modules/ftpserver.md
rename to docs/lua-modules/ftpserver.md
index 8b2260a92f..c23fab35f8 100644
--- a/docs/en/lua-modules/ftpserver.md
+++ b/docs/lua-modules/ftpserver.md
@@ -1,7 +1,7 @@
 # FTPServer Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2018-07-02 | [Terry Ellison](https://github.com/TerryE) | [Terry Ellison](https://github.com/TerryE) | [ftpserver.lua](../../../lua_modules/ftp/ftpserver.lua) |
+| 2018-07-02 | [Terry Ellison](https://github.com/TerryE) | [Terry Ellison](https://github.com/TerryE) | [ftpserver.lua](../../lua_modules/ftp/ftpserver.lua) |
 
 This Lua module implementation provides a basic FTP server for the ESP8266. It has been tested against a number of Table, Windows and Linux FTP clients and browsers.
 
@@ -12,7 +12,7 @@ It provides a limited subset of FTP commands that enable such clients to transfe
 
 ### Limitations
 -  FTP over SSH or TLS is not currently supported so transfer is unencrypted.
--  The client session , must,  authentical against a single user/password.
+-  The client session , must,  authenticate against a single user/password.
 -  Only the SPIFFS filesystem is currently supported, so changing directories is treated as a NO-OP.
 -  This implementation has been optimized for running in LFS.
 -  Only PASV mode is supported as the `net` module does not allow static allocation of outbound sockets.
@@ -85,4 +85,4 @@ None
 #### Example
 ```Lua
 FTP.close()
-```
\ No newline at end of file
+```
diff --git a/docs/en/lua-modules/hdc1000.md b/docs/lua-modules/hdc1000.md
similarity index 98%
rename from docs/en/lua-modules/hdc1000.md
rename to docs/lua-modules/hdc1000.md
index 8c6ccebacf..f925f8cde1 100644
--- a/docs/en/lua-modules/hdc1000.md
+++ b/docs/lua-modules/hdc1000.md
@@ -1,7 +1,7 @@
 # HDC1000 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-03-07 | [Francesco Truzzi](https://github.com/ftruzzi) | [Francesco Truzzi](https://github.com/ftruzzi) | [hdc1000.lua](../../../lua_modules/hdc1000/HDC1000.lua) |
+| 2015-03-07 | [Francesco Truzzi](https://github.com/ftruzzi) | [Francesco Truzzi](https://github.com/ftruzzi) | [hdc1000.lua](../../lua_modules/hdc1000/HDC1000.lua) |
 
 This Lua module provides access to [HDC1000](https://www.ti.com/lit/ds/symlink/hdc1000.pdf) I²C digital humidity and temperature sensor. It should also work with HDC1008 sensor bout this haven't been tested.
 
@@ -105,4 +105,4 @@ print(string.format("Temperature: %.2f °C\nHumidity: %.2f %%", HDC1000.getTemp(
 
 HDC1000 = nil
 package.loaded["HDC1000"] = nil
-```
\ No newline at end of file
+```
diff --git a/docs/en/lua-modules/httpserver.md b/docs/lua-modules/httpserver.md
similarity index 91%
rename from docs/en/lua-modules/httpserver.md
rename to docs/lua-modules/httpserver.md
index 9648736f2d..fccf7b460c 100644
--- a/docs/en/lua-modules/httpserver.md
+++ b/docs/lua-modules/httpserver.md
@@ -1,7 +1,7 @@
 # HTTP Server Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-01-19 | [Vladimir Dronnikov](https://github.com/dvv) | [Vladimir Dronnikov](https://github.com/dvv) | [http.lua](../../../lua_modules/http/http.lua) |
+| 2015-01-19 | [Vladimir Dronnikov](https://github.com/dvv) | [Vladimir Dronnikov](https://github.com/dvv) | [http.lua](../../lua_modules/http/httpserver.lua) |
 
 This Lua module provides a simple callback implementation of a [HTTP 1.1](https://www.w3.org/Protocols/rfc2616/rfc2616.html) server.
 
@@ -51,4 +51,4 @@ The second object holds functions:
 - `send_header(self, header_name, header_data)`: Function to send HTTP headers to client. `self` is `req` object, `header_name` is HTTP header name and `header_data` is HTTP header data for client.
 - `finish([data])`: Function to finalize connection, optionally sending data. `data` is optional data to send on connection finalizing.
 
-Full example can be found in [http-example.lua](../../../lua_modules/http/http-example.lua)
\ No newline at end of file
+Full example can be found in [http-example.lua](../../lua_modules/http/http-example.lua)
diff --git a/docs/en/lua-modules/imap.md b/docs/lua-modules/imap.md
similarity index 95%
rename from docs/en/lua-modules/imap.md
rename to docs/lua-modules/imap.md
index 3291b0435c..e42f2b1647 100644
--- a/docs/en/lua-modules/imap.md
+++ b/docs/lua-modules/imap.md
@@ -1,7 +1,7 @@
 # IMAP Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-03-12 | [AllAboutEE](https://github.com/AllAboutEE) | [AllAboutEE](https://github.com/AllAboutEE) | [imap.lua](../../../lua_modules/email/imap.lua) |
+| 2015-03-12 | [AllAboutEE](https://github.com/AllAboutEE) | [AllAboutEE](https://github.com/AllAboutEE) | [imap.lua](../../lua_modules/email/imap.lua) |
 
 This Lua module provides a simple implementation of an [IMAP 4rev1](http://www.faqs.org/rfcs/rfc2060.html) protocol that can be used to read e-mails.
 
@@ -145,4 +145,4 @@ Sends the IMAP command to logout of the email session.
 `nil`
 
 #### Example
-Example use of `imap` module can be found in  [read_email_imap.lua](../../../lua_examples/email/read_email_imap.lua) file.
\ No newline at end of file
+Example use of `imap` module can be found in  [read_email_imap.lua](../../lua_examples/email/read_email_imap.lua) file.
diff --git a/docs/en/lua-modules/lm92.md b/docs/lua-modules/lm92.md
similarity index 96%
rename from docs/en/lua-modules/lm92.md
rename to docs/lua-modules/lm92.md
index f101184d03..328bb0a31e 100644
--- a/docs/en/lua-modules/lm92.md
+++ b/docs/lua-modules/lm92.md
@@ -1,7 +1,7 @@
 # LM92 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-05-17 | [Levente Tamas](https://github.com/elgarbe) | [Levente Tamas](https://github.com/elgarbe) | [lm92.lua](../../../lua_modules/lm92/lm92.lua) |
+| 2015-05-17 | [Levente Tamas](https://github.com/elgarbe) | [Levente Tamas](https://github.com/elgarbe) | [lm92.lua](../../lua_modules/lm92/lm92.lua) |
 
 This Lua module provides access to [LM92](http://www.ti.com/lit/ds/symlink/lm92.pdf) I²C ±0.33C 12bit+sign temperature sensor.
 
@@ -204,4 +204,4 @@ print("Got High: "..t.." C")
 ```
 
 #### TODO:
-- add full support of the features, including interrupt and critical alert support
\ No newline at end of file
+- add full support of the features, including interrupt and critical alert support
diff --git a/docs/en/lua-modules/mcp23008.md b/docs/lua-modules/mcp23008.md
similarity index 92%
rename from docs/en/lua-modules/mcp23008.md
rename to docs/lua-modules/mcp23008.md
index 891f324788..2ce84e2ce5 100644
--- a/docs/en/lua-modules/mcp23008.md
+++ b/docs/lua-modules/mcp23008.md
@@ -1,7 +1,7 @@
 # MCP23008 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-03-02 | [AllAboutEE](https://github.com/AllAboutEE) | [AllAboutEE](https://github.com/AllAboutEE) | [mcp23008.lua](../../../lua_modules/mcp23008/mcp23008.lua) |
+| 2015-03-02 | [AllAboutEE](https://github.com/AllAboutEE) | [AllAboutEE](https://github.com/AllAboutEE) | [mcp23008.lua](../../lua_modules/mcp23008/mcp23008.lua) |
 
 This Lua module provides access to [MCP23008](http://ww1.microchip.com/downloads/en/DeviceDoc/21919e.pdf) I²C I/O Expander.
 
@@ -110,4 +110,4 @@ None
 The GPPU byte i.e. state of all internal pull-up resistors
 
 #### Notes
-Other examples of using this module can be found in [mcp23008_buttons.lua](../../../lua_examples/mcp23008/mcp23008_buttons.lua) and  [mcp23008_leds.lua](../../../lua_examples/mcp23008/mcp23008_leds.lua) files.
\ No newline at end of file
+Other examples of using this module can be found in [mcp23008_buttons.lua](../../lua_examples/mcp23008/mcp23008_buttons.lua) and  [mcp23008_leds.lua](../../lua_examples/mcp23008/mcp23008_leds.lua) files.
diff --git a/docs/en/lua-modules/redis.md b/docs/lua-modules/redis.md
similarity index 94%
rename from docs/en/lua-modules/redis.md
rename to docs/lua-modules/redis.md
index e9d58666e6..836897edd0 100644
--- a/docs/en/lua-modules/redis.md
+++ b/docs/lua-modules/redis.md
@@ -1,7 +1,7 @@
 # Redis Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-02-06 | [Vladimir Dronnikov](https://github.com/dvv) | [Vladimir Dronnikov](https://github.com/dvv) | [redis.lua](../../../lua_modules/redis/redis.lua) |
+| 2015-02-06 | [Vladimir Dronnikov](https://github.com/dvv) | [Vladimir Dronnikov](https://github.com/dvv) | [redis.lua](../../lua_modules/redis/redis.lua) |
 
 This Lua module provides a simple implementation of a [Redis](https://redis.io/) client.
 
@@ -83,4 +83,4 @@ None
 local redis = dofile("redis.lua").connect(host, port)
 redis:publish("chan1", foo")
 redis:subscribe("chan1", function(channel, msg) print(channel, msg) end)
-```
\ No newline at end of file
+```
diff --git a/docs/en/lua-modules/yeelink.md b/docs/lua-modules/yeelink.md
similarity index 91%
rename from docs/en/lua-modules/yeelink.md
rename to docs/lua-modules/yeelink.md
index 8db53ce851..b6fbbb1a64 100644
--- a/docs/en/lua-modules/yeelink.md
+++ b/docs/lua-modules/yeelink.md
@@ -1,7 +1,7 @@
 # Yeelink Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-04-14 | [Martin Han](https://github.com/MarsTechHAN) | [Martin Han](https://github.com/MarsTechHAN) | [yeelink_lib.lua](../../../lua_modules/yeelink/yeelink_lib.lua) |
+| 2015-04-14 | [Martin Han](https://github.com/MarsTechHAN) | [Martin Han](https://github.com/MarsTechHAN) | [yeelink_lib.lua](../../lua_modules/yeelink/yeelink_lib.lua) |
 
 This Lua module provides a simple implementation of an [Yeelink](http://www.yeelink.net/) client.
 
@@ -55,4 +55,4 @@ Send data to Yeelink Sever.
 `nil`
 
 #### Notes
-Example of using this module can be found in [Example_for_Yeelink_Lib.lua](../../../lua_modules/yeelink/Example_for_Yeelink_Lib.lua) file.
\ No newline at end of file
+Example of using this module can be found in [Example_for_Yeelink_Lib.lua](../../lua_modules/yeelink/Example_for_Yeelink_Lib.lua) file.
diff --git a/docs/en/modules/adc.md b/docs/modules/adc.md
similarity index 96%
rename from docs/en/modules/adc.md
rename to docs/modules/adc.md
index b48b260f71..609f6bc268 100644
--- a/docs/en/modules/adc.md
+++ b/docs/modules/adc.md
@@ -1,7 +1,7 @@
 # ADC Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-24 | [Zeroday](https://github.com/funshine) | [jmattsson](https://github.com/jmattsson) | [adc.c](../../../app/modules/adc.c)|
+| 2014-12-24 | [Zeroday](https://github.com/funshine) | [jmattsson](https://github.com/jmattsson) | [adc.c](../../app/modules/adc.c)|
 
 The ADC module provides access to the in-built ADC.
 
diff --git a/docs/en/modules/ads1115.md b/docs/modules/ads1115.md
similarity index 98%
rename from docs/en/modules/ads1115.md
rename to docs/modules/ads1115.md
index 9ae4e120a4..a093586782 100644
--- a/docs/en/modules/ads1115.md
+++ b/docs/modules/ads1115.md
@@ -1,7 +1,7 @@
 # ADS1115 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-04-24 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [ads1115.c](../../../app/modules/ads1115.c)|
+| 2017-04-24 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [ads1115.c](../../app/modules/ads1115.c)|
 
 This module provides access to the ADS1115 (16-Bit) and ADS1015 (12-Bit) analog-to-digital converters.
 Other chips from the same family (ADS1113, ADS1114, ADS1013 and ADS1014) are likely to work. Missing hardware features will be silently ignored.
diff --git a/docs/en/modules/adxl345.md b/docs/modules/adxl345.md
similarity index 95%
rename from docs/en/modules/adxl345.md
rename to docs/modules/adxl345.md
index e2d8c3a331..8315f4c52b 100644
--- a/docs/en/modules/adxl345.md
+++ b/docs/modules/adxl345.md
@@ -1,7 +1,7 @@
 # ADXL345 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-04-08 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [adxl345.c](../../../app/modules/adxl345.c)|
+| 2016-04-08 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [adxl345.c](../../app/modules/adxl345.c)|
 
 
 This module provides access to the [ADXL345](https://www.sparkfun.com/products/9836) triple axis accelerometer.
diff --git a/docs/en/modules/am2320.md b/docs/modules/am2320.md
similarity index 94%
rename from docs/en/modules/am2320.md
rename to docs/modules/am2320.md
index a1b610b5f8..1f8c544bca 100644
--- a/docs/en/modules/am2320.md
+++ b/docs/modules/am2320.md
@@ -1,7 +1,7 @@
 # AM2320 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-14 | [Henk Vergonet](https://github.com/hvegh) | [Henk Vergonet](https://github.com/hvegh) | [am2320.c](../../../app/modules/am2320.c)|
+| 2016-02-14 | [Henk Vergonet](https://github.com/hvegh) | [Henk Vergonet](https://github.com/hvegh) | [am2320.c](../../app/modules/am2320.c)|
 
 
 This module provides access to the [AM2320](https://akizukidenshi.com/download/ds/aosong/AM2320.pdf) humidity and temperature sensor, using the i2c interface.
diff --git a/docs/en/modules/apa102.md b/docs/modules/apa102.md
similarity index 95%
rename from docs/en/modules/apa102.md
rename to docs/modules/apa102.md
index 5122e5e6c5..bc8ec15d73 100644
--- a/docs/en/modules/apa102.md
+++ b/docs/modules/apa102.md
@@ -1,7 +1,7 @@
 # APA102 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-01-26 | [Robert Foss](https://github.com/robertfoss)| [Robert Foss](https://github.com/robertfoss)| [apa102.c](../../../app/modules/apa102.c)|
+| 2016-01-26 | [Robert Foss](https://github.com/robertfoss)| [Robert Foss](https://github.com/robertfoss)| [apa102.c](../../app/modules/apa102.c)|
 
 This module provides Lua access to [APA102 RGB LEDs](https://youtu.be/UYvC-hukz-0) which are similar in function to the common [WS2812](ws2812) addressable LEDs.
 
diff --git a/docs/en/modules/bit.md b/docs/modules/bit.md
similarity index 98%
rename from docs/en/modules/bit.md
rename to docs/modules/bit.md
index 70b857c279..c4724744ca 100644
--- a/docs/en/modules/bit.md
+++ b/docs/modules/bit.md
@@ -1,7 +1,7 @@
 # bit Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-24 | [https://github.com/LuaDist/bitlib](https://github.com/LuaDist/bitlib), [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [bit.c](../../../app/modules/bit.c)|
+| 2014-12-24 | [https://github.com/LuaDist/bitlib](https://github.com/LuaDist/bitlib), [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [bit.c](../../app/modules/bit.c)|
 
 
 Bit manipulation support, on 32bit integers.
diff --git a/docs/en/modules/bloom.md b/docs/modules/bloom.md
similarity index 97%
rename from docs/en/modules/bloom.md
rename to docs/modules/bloom.md
index 6eca5a5d4a..95b8056b35 100644
--- a/docs/en/modules/bloom.md
+++ b/docs/modules/bloom.md
@@ -1,7 +1,7 @@
 # Bloom Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-11-13 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [bloom.c](../../../app/modules/bloom.c)|
+| 2017-11-13 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [bloom.c](../../app/modules/bloom.c)|
 
 
 This module implements a [Bloom filter](https://en.wikipedia.org/wiki/Bloom_filter). This is a probabilistic data structure that is used to test for set membership. There are two operations -- `add` and `check` that allow 
diff --git a/docs/en/modules/bme280.md b/docs/modules/bme280.md
similarity index 99%
rename from docs/en/modules/bme280.md
rename to docs/modules/bme280.md
index ae4d4674c8..cb30323566 100644
--- a/docs/en/modules/bme280.md
+++ b/docs/modules/bme280.md
@@ -1,7 +1,7 @@
 # BME280 module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-21 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [bme280.c](../../../app/modules/bme280.c)|
+| 2016-02-21 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [bme280.c](../../app/modules/bme280.c)|
 
 This module provides a simple interface to [BME280/BMP280 temperature/air presssure/humidity sensors](http://www.bosch-sensortec.com/bst/products/all_products/bme280) (Bosch Sensortec).
 
diff --git a/docs/en/modules/bme680.md b/docs/modules/bme680.md
similarity index 98%
rename from docs/en/modules/bme680.md
rename to docs/modules/bme680.md
index f268d0f905..c73d9182f2 100644
--- a/docs/en/modules/bme680.md
+++ b/docs/modules/bme680.md
@@ -1,7 +1,7 @@
 # BME680 module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-10-28 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [bme680.c](../../../app/modules/bme680.c)|
+| 2017-10-28 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [bme680.c](../../app/modules/bme680.c)|
 
 This module provides a simple interface to [BME680](https://www.bosch-sensortec.com/bst/products/all_products/bme680) temperature/air presssure/humidity sensors/air quality sensor (Bosch Sensortec). Compared to the BME280 module the sensor does not support automatic mode which means that it can be setup to perform regular measurements. Every measurement has to be triggered manually.
 
diff --git a/docs/en/modules/bmp085.md b/docs/modules/bmp085.md
similarity index 98%
rename from docs/en/modules/bmp085.md
rename to docs/modules/bmp085.md
index 1162d50be9..12d81eedd0 100644
--- a/docs/en/modules/bmp085.md
+++ b/docs/modules/bmp085.md
@@ -1,7 +1,7 @@
 # BMP085 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-08-03 | [Konrad Beckmann](https://github.com/kbeckmann) | [Konrad Beckmann](https://github.com/kbeckmann) | [bmp085.c](../../../app/modules/bmp085.c)|
+| 2015-08-03 | [Konrad Beckmann](https://github.com/kbeckmann) | [Konrad Beckmann](https://github.com/kbeckmann) | [bmp085.c](../../app/modules/bmp085.c)|
 
 
 This module provides access to the [BMP085](https://www.sparkfun.com/tutorials/253) temperature and pressure sensor. The module also works with BMP180.
diff --git a/docs/en/modules/cjson.md b/docs/modules/cjson.md
similarity index 100%
rename from docs/en/modules/cjson.md
rename to docs/modules/cjson.md
diff --git a/docs/en/modules/coap.md b/docs/modules/coap.md
similarity index 99%
rename from docs/en/modules/coap.md
rename to docs/modules/coap.md
index 04c8870d19..433e030246 100644
--- a/docs/en/modules/coap.md
+++ b/docs/modules/coap.md
@@ -1,7 +1,7 @@
 # CoAP Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-02-04 | Toby Jaffey <toby@1248.io>, [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [coap.c](../../../app/modules/coap.c) |
+| 2015-02-04 | Toby Jaffey <toby@1248.io>, [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [coap.c](../../app/modules/coap.c) |
 
 The CoAP module provides a simple implementation according to [CoAP](http://tools.ietf.org/html/rfc7252) protocol.
 The basic endpoint server part is based on [microcoap](https://github.com/1248/microcoap), and many other code reference [libcoap](https://github.com/obgm/libcoap).
diff --git a/docs/en/modules/color-utils.md b/docs/modules/color-utils.md
similarity index 98%
rename from docs/en/modules/color-utils.md
rename to docs/modules/color-utils.md
index e0369a1e29..569e0f1dae 100644
--- a/docs/en/modules/color-utils.md
+++ b/docs/modules/color-utils.md
@@ -1,7 +1,7 @@
 # color utils Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-12-30 | [Konrad Huebner](https://github.com/skycoders) | [Konrad Huebner](https://github.com/skycoders) | [color_utils.c](../../../app/modules/color_utils.c)|
+| 2017-12-30 | [Konrad Huebner](https://github.com/skycoders) | [Konrad Huebner](https://github.com/skycoders) | [color_utils.c](../../app/modules/color_utils.c)|
 
 This module provides basic color transformations useful for color LEDs. 
 
diff --git a/docs/en/modules/cron.md b/docs/modules/cron.md
similarity index 96%
rename from docs/en/modules/cron.md
rename to docs/modules/cron.md
index 2838c51192..0f1a108f1d 100644
--- a/docs/en/modules/cron.md
+++ b/docs/modules/cron.md
@@ -1,7 +1,7 @@
 # Cron Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-12-18 | [PhoeniX](https://github.com/djphoenix) | [PhoeniX](https://github.com/djphoenix) | [cron.c](../../../app/modules/cron.c)|
+| 2016-12-18 | [PhoeniX](https://github.com/djphoenix) | [PhoeniX](https://github.com/djphoenix) | [cron.c](../../app/modules/cron.c)|
 
 [Cron](https://en.wikipedia.org/wiki/Cron)-like scheduler module.
 
diff --git a/docs/en/modules/crypto.md b/docs/modules/crypto.md
similarity index 99%
rename from docs/en/modules/crypto.md
rename to docs/modules/crypto.md
index b853c10708..43a58bd1bd 100644
--- a/docs/en/modules/crypto.md
+++ b/docs/modules/crypto.md
@@ -1,7 +1,7 @@
 # crypto Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-02 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [crypto.c](../../../app/modules/crypto.c)|
+| 2015-06-02 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [crypto.c](../../app/modules/crypto.c)|
 
 The crypto modules provides various functions for working with cryptographic algorithms.
 
diff --git a/docs/en/modules/dht.md b/docs/modules/dht.md
similarity index 98%
rename from docs/en/modules/dht.md
rename to docs/modules/dht.md
index 2eebed5421..35bea003b8 100644
--- a/docs/en/modules/dht.md
+++ b/docs/modules/dht.md
@@ -1,7 +1,7 @@
 # DHT Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-17 | [RobTillaart](https://github.com/RobTillaart/Arduino/tree/master/libraries/DHTlib) | [Vowstar](https://github.com/vowstar) | [dhtlib](../../../app/dht/)|
+| 2015-06-17 | [RobTillaart](https://github.com/RobTillaart/Arduino/tree/master/libraries/DHTlib) | [Vowstar](https://github.com/vowstar) | [dhtlib](../../app/dht/)|
 
 ## Constants
 Constants for various functions.
diff --git a/docs/en/modules/ds18b20.md b/docs/modules/ds18b20.md
similarity index 98%
rename from docs/en/modules/ds18b20.md
rename to docs/modules/ds18b20.md
index b95512cfbf..33effd21d8 100644
--- a/docs/en/modules/ds18b20.md
+++ b/docs/modules/ds18b20.md
@@ -1,7 +1,7 @@
 # DS18B20 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-06-11 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [ds18b20.c](../../../app/modules/ds18b20.c)|
+| 2017-06-11 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [ds18b20.c](../../app/modules/ds18b20.c)|
 
 This module provides access to the DS18B20 1-Wire digital thermometer.
 
@@ -134,4 +134,4 @@ Initializes the onewire bus on the selected pin.
 ```lua
 local ow_pin = 3
 ds18b20.setup(ow_pin)
-```
\ No newline at end of file
+```
diff --git a/docs/en/modules/encoder.md b/docs/modules/encoder.md
similarity index 95%
rename from docs/en/modules/encoder.md
rename to docs/modules/encoder.md
index a7244d5ca4..d688fa2658 100644
--- a/docs/en/modules/encoder.md
+++ b/docs/modules/encoder.md
@@ -1,7 +1,7 @@
 # encoder Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-26 | [Terry Ellison](https://github.com/TerryE) | [Terry Ellison](https://github.com/TerryE) | [encoder.c](../../../app/modules/encoder.c)|
+| 2016-02-26 | [Terry Ellison](https://github.com/TerryE) | [Terry Ellison](https://github.com/TerryE) | [encoder.c](../../app/modules/encoder.c)|
 
 The encoder modules provides various functions for encoding and decoding byte data.
 
diff --git a/docs/en/modules/enduser-setup.md b/docs/modules/enduser-setup.md
similarity index 97%
rename from docs/en/modules/enduser-setup.md
rename to docs/modules/enduser-setup.md
index 7af924d23e..1057e7789c 100644
--- a/docs/en/modules/enduser-setup.md
+++ b/docs/modules/enduser-setup.md
@@ -1,11 +1,11 @@
 # enduser setup Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-09-02 | [Robert Foss](https://github.com/robertfoss) | [Robert Foss](https://github.com/robertfoss) | [enduser_setup.c](../../../app/modules/enduser_setup.c)|
+| 2015-09-02 | [Robert Foss](https://github.com/robertfoss) | [Robert Foss](https://github.com/robertfoss) | [enduser_setup.c](../../app/modules/enduser_setup.c)|
 
 This module provides a simple way of configuring ESP8266 chips without using a serial interface or pre-programming WiFi credentials onto the chip.
 
-![enduser setup config dialog](../../img/enduser-setup.jpg "enduser setup config dialog")
+![enduser setup config dialog](../img/enduser-setup.jpg "enduser setup config dialog")
 
 After running [`enduser_setup.start()`](#enduser_setupstart), a wireless network named "SetupGadget_XXXXXX" will start (this prefix can be overridden in `user_config.h` by defining 
 `ENDUSER_SETUP_AP_SSID`). Connect to that SSID and then navigate to the root
diff --git a/docs/en/modules/file.md b/docs/modules/file.md
similarity index 99%
rename from docs/en/modules/file.md
rename to docs/modules/file.md
index d2c4a59805..43f11b510f 100644
--- a/docs/en/modules/file.md
+++ b/docs/modules/file.md
@@ -1,7 +1,7 @@
 # file Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [file.c](../../../app/modules/file.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [file.c](../../app/modules/file.c)|
 
 The file module provides access to the file system and its individual files.
 
diff --git a/docs/en/modules/gdbstub.md b/docs/modules/gdbstub.md
similarity index 97%
rename from docs/en/modules/gdbstub.md
rename to docs/modules/gdbstub.md
index 75d233c342..6b377c1022 100644
--- a/docs/en/modules/gdbstub.md
+++ b/docs/modules/gdbstub.md
@@ -1,7 +1,7 @@
 # gdbstub Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-09-18 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [gdbstub.c](../../../app/modules/gdbstub.c)|
+| 2016-09-18 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [gdbstub.c](../../app/modules/gdbstub.c)|
 
 This module provides basic source code debugging of the firmware when used in conjunction with a version of gdb built for the lx106. If you enable this module, then fatal errors (like invalid memory reads) will trap into the gdbstub. This uses UART0 to talk to GDB. If this happens while the UART0 is connected to a terminal (or some IDE like esplorer) then you will see a string starting with `$T` and a few more characters after that. This is the signal that a trap has happened, and control should be passed to gdb.
 
diff --git a/docs/en/modules/gpio.md b/docs/modules/gpio.md
similarity index 99%
rename from docs/en/modules/gpio.md
rename to docs/modules/gpio.md
index 32aeb79d27..939e90cc83 100644
--- a/docs/en/modules/gpio.md
+++ b/docs/modules/gpio.md
@@ -1,7 +1,7 @@
 # GPIO Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [gpio.c](../../../app/modules/gpio.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [gpio.c](../../app/modules/gpio.c)|
 
 
 This module provides access to the [GPIO](https://en.wikipedia.org/wiki/General-purpose_input/output) (General Purpose Input/Output) subsystem.
diff --git a/docs/en/modules/hdc1080.md b/docs/modules/hdc1080.md
similarity index 91%
rename from docs/en/modules/hdc1080.md
rename to docs/modules/hdc1080.md
index bd38cd876b..c0d9c57209 100644
--- a/docs/en/modules/hdc1080.md
+++ b/docs/modules/hdc1080.md
@@ -1,7 +1,7 @@
 # HDC1080 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-04-01 | [Metin KOC](https://github.com/saucompeng) | [Metin KOC](https://github.com/saucompeng) | [hdc1080.c](../../../app/modules/hdc1080.c)|
+| 2017-04-01 | [Metin KOC](https://github.com/saucompeng) | [Metin KOC](https://github.com/saucompeng) | [hdc1080.c](../../app/modules/hdc1080.c)|
 
 
 This module provides access to the [HDC1080](http://www.ti.com/product/HDC1080) low power, high accuracy digital humidity sensor with temperature sensor.
diff --git a/docs/en/modules/hmc5883l.md b/docs/modules/hmc5883l.md
similarity index 95%
rename from docs/en/modules/hmc5883l.md
rename to docs/modules/hmc5883l.md
index 55fda4e2d6..65dc6e71cc 100644
--- a/docs/en/modules/hmc5883l.md
+++ b/docs/modules/hmc5883l.md
@@ -1,7 +1,7 @@
 # HMC5883L Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-04-09 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [hmc5883l.c](../../../app/modules/hmc5883l.c)|
+| 2016-04-09 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [hmc5883l.c](../../app/modules/hmc5883l.c)|
 
 
 This module provides access to the [HMC5883L](https://www.sparkfun.com/products/10530) three axis digital compass.
diff --git a/docs/en/modules/http.md b/docs/modules/http.md
similarity index 98%
rename from docs/en/modules/http.md
rename to docs/modules/http.md
index 68c552d28d..cdaf442b02 100644
--- a/docs/en/modules/http.md
+++ b/docs/modules/http.md
@@ -1,7 +1,7 @@
 # HTTP Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-01-15 | [esphttpclient](https://github.com/Caerbannog/esphttpclient) / [Vowstar](https://github.com/vowstar) | [Vowstar](https://github.com/vowstar) | [http.c](../../../app/modules/http.c)|
+| 2016-01-15 | [esphttpclient](https://github.com/Caerbannog/esphttpclient) / [Vowstar](https://github.com/vowstar) | [Vowstar](https://github.com/vowstar) | [http.c](../../app/modules/http.c)|
 
 Basic HTTP *client* module that provides an interface to do GET/POST/PUT/DELETE over HTTP(S), as well as customized requests. Due to the memory constraints on ESP8266, the supported page/body size is limited by available memory. Attempting to receive pages larger than this will fail. If larger page/body sizes are necessary, consider using [`net.createConnection()`](net.md#netcreateconnection) and stream in the data.
 
diff --git a/docs/en/modules/hx711.md b/docs/modules/hx711.md
similarity index 97%
rename from docs/en/modules/hx711.md
rename to docs/modules/hx711.md
index 7e10d3d1a3..0eaa3cff19 100644
--- a/docs/en/modules/hx711.md
+++ b/docs/modules/hx711.md
@@ -1,7 +1,7 @@
 # HX711 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-10-09 | [Chris Takahashi](https://github.com/christakahashi) | [Chris Takahashi](https://github.com/christakahashi) | [hx711.c](../../../app/modules/hx711.c)|
+| 2015-10-09 | [Chris Takahashi](https://github.com/christakahashi) | [Chris Takahashi](https://github.com/christakahashi) | [hx711.c](../../app/modules/hx711.c)|
 
 This module provides access to an [HX711 load cell amplifier/ADC](https://learn.sparkfun.com/tutorials/load-cell-amplifier-hx711-breakout-hookup-guide). The HX711 is an inexpensive 24bit ADC with programmable 128x, 64x, and 32x gain. Currently only channel A at 128x gain is supported.
 
diff --git a/docs/en/modules/i2c.md b/docs/modules/i2c.md
similarity index 97%
rename from docs/en/modules/i2c.md
rename to docs/modules/i2c.md
index 469bf8e427..dbec0c667a 100644
--- a/docs/en/modules/i2c.md
+++ b/docs/modules/i2c.md
@@ -1,7 +1,7 @@
 # I²C Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [i2c.c](../../../app/modules/i2c.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [i2c.c](../../app/modules/i2c.c)|
 
 ## i2c.address()
 Setup I²C address and read/write mode for the next transfer.
diff --git a/docs/en/modules/l3g4200d.md b/docs/modules/l3g4200d.md
similarity index 95%
rename from docs/en/modules/l3g4200d.md
rename to docs/modules/l3g4200d.md
index a2893ba968..7ec0ca056f 100644
--- a/docs/en/modules/l3g4200d.md
+++ b/docs/modules/l3g4200d.md
@@ -1,7 +1,7 @@
 # L3G4200D Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-04-09 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [l3g4200d.c](../../../app/modules/l3g4200d.c)|
+| 2015-04-09 | [Jason Schmidlapp](https://github.com/jschmidlapp) | [Jason Schmidlapp](https://github.com/jschmidlapp) | [l3g4200d.c](../../app/modules/l3g4200d.c)|
 
 
 This module provides access to the [L3G4200D](https://www.sparkfun.com/products/10612) three axis digital gyroscope.
diff --git a/docs/en/modules/mcp4725.md b/docs/modules/mcp4725.md
similarity index 98%
rename from docs/en/modules/mcp4725.md
rename to docs/modules/mcp4725.md
index 3c99cbf059..589bd10853 100644
--- a/docs/en/modules/mcp4725.md
+++ b/docs/modules/mcp4725.md
@@ -1,7 +1,7 @@
 # MCP4725 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-05-10 | [dnc40085](https://github.com/dnc40085) | [dnc40085](https://github.com/dnc40085) | [mcp4725.c](../../../app/modules/mcp4725.c)|
+| 2017-05-10 | [dnc40085](https://github.com/dnc40085) | [dnc40085](https://github.com/dnc40085) | [mcp4725.c](../../app/modules/mcp4725.c)|
 
 
 This module provides access to the [MCP4725 12-bit Digital to Analog Converter](http://ww1.microchip.com/downloads/en/DeviceDoc/22039d.pdf).
diff --git a/docs/en/modules/mdns.md b/docs/modules/mdns.md
similarity index 96%
rename from docs/en/modules/mdns.md
rename to docs/modules/mdns.md
index 6522c348cb..9f4e5aafcc 100644
--- a/docs/en/modules/mdns.md
+++ b/docs/modules/mdns.md
@@ -1,7 +1,7 @@
 # mDNS Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-24 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [mdns.c](../../../app/modules/mdns.c)|
+| 2016-02-24 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [mdns.c](../../app/modules/mdns.c)|
 
 [Multicast DNS](https://en.wikipedia.org/wiki/Multicast_DNS) is used as part of Bonjour / Zeroconf. This allows systems to identify themselves and the services that they provide on a local area network. Clients are then able to discover these systems and connect to them. 
 
diff --git a/docs/en/modules/mqtt.md b/docs/modules/mqtt.md
similarity index 99%
rename from docs/en/modules/mqtt.md
rename to docs/modules/mqtt.md
index 5c6704a0c5..cd39312bf7 100644
--- a/docs/en/modules/mqtt.md
+++ b/docs/modules/mqtt.md
@@ -1,7 +1,7 @@
 # MQTT Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-01-23 | [Stephen Robinson](https://github.com/esar/contiki-mqtt), [Tuan PM](https://github.com/tuanpmt/esp_mqtt) | [Vowstar](https://github.com/vowstar) | [mqtt.c](../../../app/modules/mqtt.c)|
+| 2015-01-23 | [Stephen Robinson](https://github.com/esar/contiki-mqtt), [Tuan PM](https://github.com/tuanpmt/esp_mqtt) | [Vowstar](https://github.com/vowstar) | [mqtt.c](../../app/modules/mqtt.c)|
 
 
 The client adheres to version 3.1.1 of the [MQTT](https://en.wikipedia.org/wiki/MQTT) protocol. Make sure that your broker supports and is correctly configured for version 3.1.1. The client is backwards incompatible with brokers running MQTT 3.1.
diff --git a/docs/en/modules/net.md b/docs/modules/net.md
similarity index 99%
rename from docs/en/modules/net.md
rename to docs/modules/net.md
index e258689933..8218e79d69 100644
--- a/docs/en/modules/net.md
+++ b/docs/modules/net.md
@@ -1,7 +1,7 @@
 # net Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [PhoeniX](https://github.com/djphoenix) | [net.c](../../../app/modules/net.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [PhoeniX](https://github.com/djphoenix) | [net.c](../../app/modules/net.c)|
 
 ** TLS operations was moved to the [TLS](tls.md) module **
 
diff --git a/docs/en/modules/node.md b/docs/modules/node.md
similarity index 99%
rename from docs/en/modules/node.md
rename to docs/modules/node.md
index 5cf0e29a05..2dac604b1d 100644
--- a/docs/en/modules/node.md
+++ b/docs/modules/node.md
@@ -1,7 +1,7 @@
 # node Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [node.c](../../../app/modules/node.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [node.c](../../app/modules/node.c)|
 
 The node module provides access to system-level features such as sleep, restart and various info and IDs.
 
diff --git a/docs/en/modules/ow.md b/docs/modules/ow.md
similarity index 98%
rename from docs/en/modules/ow.md
rename to docs/modules/ow.md
index 48187053ef..929fe8522d 100644
--- a/docs/en/modules/ow.md
+++ b/docs/modules/ow.md
@@ -1,7 +1,7 @@
 # 1-Wire Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [ow.c](../../../app/modules/ow.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [ow.c](../../app/modules/ow.c)|
 
 This module provides functions to work with the [1-Wire](https://en.wikipedia.org/wiki/1-Wire) device communications bus system.
 
diff --git a/docs/en/modules/pcm.md b/docs/modules/pcm.md
similarity index 92%
rename from docs/en/modules/pcm.md
rename to docs/modules/pcm.md
index 6c3c1d73fb..36b1afb530 100644
--- a/docs/en/modules/pcm.md
+++ b/docs/modules/pcm.md
@@ -1,7 +1,7 @@
 # pcm module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-06-05 | [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [pcm.c](../../../app/modules/pcm.c)|
+| 2016-06-05 | [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [pcm.c](../../app/modules/pcm.c)|
 
 Play sounds through various back-ends.
 
@@ -11,7 +11,7 @@ The ESP contains a sigma-delta generator that can be used to synthesize audio wi
 
 The external filter circuit is shown in the following schematic. Note that the voltage divider resistors limit the output voltage to 1&nbsp;V<sub>PP</sub>. This should match most amplifier boards, but cross-checking against your specific configuration is required.
 
-![low-pass filter](../../img/sigma_delta_audiofilter.png "low-pass filter for sigma-delta driver")
+![low-pass filter](../img/sigma_delta_audiofilter.png "low-pass filter for sigma-delta driver")
 
 
 !!! important
@@ -25,7 +25,7 @@ Audio is expected as a mono raw unsigned 8&nbsp;bit stream at sample rates betwe
 sox jump.wav -r 8000 -b 8 -c 1 jump_8k.u8
 ```
 
-Also see [play_file.lua](../../../lua_examples/pcm/play_file.lua) in the examples folder.
+Also see [play_file.lua](../../lua_examples/pcm/play_file.lua) in the examples folder.
 
 ## pcm.new()
 Initializes the audio driver.
diff --git a/docs/en/modules/perf.md b/docs/modules/perf.md
similarity index 96%
rename from docs/en/modules/perf.md
rename to docs/modules/perf.md
index 4d77468439..fedfcc7336 100644
--- a/docs/en/modules/perf.md
+++ b/docs/modules/perf.md
@@ -1,7 +1,7 @@
 # perf Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-26 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [perf.c](../../../app/modules/perf.c)|
+| 2016-02-26 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [perf.c](../../app/modules/perf.c)|
 
 
 This module provides simple performance measurement for an application. It samples the program counter roughly every 50 microseconds and builds a histogram of the values that it finds. Since there is only a small amount
diff --git a/docs/en/modules/pwm.md b/docs/modules/pwm.md
similarity index 97%
rename from docs/en/modules/pwm.md
rename to docs/modules/pwm.md
index 3c22b959ff..f335376256 100644
--- a/docs/en/modules/pwm.md
+++ b/docs/modules/pwm.md
@@ -1,7 +1,7 @@
 # PWM Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [pwm.c](../../../app/modules/pwm.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [pwm.c](../../app/modules/pwm.c)|
 
 ## pwm.close()
 Quit PWM mode for the specified GPIO pin.
diff --git a/docs/en/modules/rc.md b/docs/modules/rc.md
similarity index 98%
rename from docs/en/modules/rc.md
rename to docs/modules/rc.md
index 43cee05159..fe69b854e2 100644
--- a/docs/en/modules/rc.md
+++ b/docs/modules/rc.md
@@ -1,7 +1,7 @@
 # RC Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-12 | [Mike Wen](https://github.com/mikewen) | - | [rc.c](../../../app/modules/rc.c)|
+| 2015-06-12 | [Mike Wen](https://github.com/mikewen) | - | [rc.c](../../app/modules/rc.c)|
 
 Module to generate series of impulses for remote control via 433/315Mhz radio transmitter.
 Superseded by **[rfswitch](./rfswitch.md)** module which have same functionality, and supports more transmission protocols.
diff --git a/docs/en/modules/rfswitch.md b/docs/modules/rfswitch.md
similarity index 99%
rename from docs/en/modules/rfswitch.md
rename to docs/modules/rfswitch.md
index 0c8a82ef80..63cbe6d1d2 100644
--- a/docs/en/modules/rfswitch.md
+++ b/docs/modules/rfswitch.md
@@ -1,7 +1,7 @@
 # rfswitch Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-12-01 | [Roman Fedorov](https://github.com/ffedoroff) | [Roman Fedorov](https://github.com/ffedoroff) | [rfswitch.c](../../../app/modules/rfswitch.c)|
+| 2016-12-01 | [Roman Fedorov](https://github.com/ffedoroff) | [Roman Fedorov](https://github.com/ffedoroff) | [rfswitch.c](../../app/modules/rfswitch.c)|
 
 
 Module to operate 433/315Mhz devices like power outlet sockets, relays, etc. This will most likely work with all popular low cost power outlet sockets with a SC5262 / SC5272, HX2262 / HX2272, PT2262 / PT2272, EV1527, RT1527, FP1527 or HS1527 chipset.
diff --git a/docs/en/modules/rotary.md b/docs/modules/rotary.md
similarity index 98%
rename from docs/en/modules/rotary.md
rename to docs/modules/rotary.md
index 935cc98dd6..7d293d318a 100644
--- a/docs/en/modules/rotary.md
+++ b/docs/modules/rotary.md
@@ -1,7 +1,7 @@
 # rotary Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-03-01 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [rotary.c](../../../app/modules/rotary.c)|
+| 2016-03-01 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [rotary.c](../../app/modules/rotary.c)|
 
 
 This module can read the state of cheap rotary encoder switches. These are available at all the standard places for a dollar or two. They are five pin devices where three are used for a gray code encoder for rotation, and two are used for the push switch. These switches are commonly used in car audio systems. 
diff --git a/docs/en/modules/rtcfifo.md b/docs/modules/rtcfifo.md
similarity index 99%
rename from docs/en/modules/rtcfifo.md
rename to docs/modules/rtcfifo.md
index 8e712cf009..f6d34aae6f 100644
--- a/docs/en/modules/rtcfifo.md
+++ b/docs/modules/rtcfifo.md
@@ -1,7 +1,7 @@
 # RTC FIFO Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-26 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson), Bernd Meyer <bmeyer@dius.com.au> | [Johny Mattsson](https://github.com/jmattsson) | [rtcfifo.c](../../../app/modules/rtcfifo.c)|
+| 2015-06-26 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson), Bernd Meyer <bmeyer@dius.com.au> | [Johny Mattsson](https://github.com/jmattsson) | [rtcfifo.c](../../app/modules/rtcfifo.c)|
 
 The rtcfifo module implements a first-in,first-out storage intended for sensor readings. As the name suggests, it is backed by the [RTC](https://en.wikipedia.org/wiki/Real-time_clock) user memory and as such survives deep sleep cycles. Conceptually it can be thought of as a cyclic array of `{ timestamp, name, value }` tuples. Internally it uses a space-optimized storage format to allow the greatest number of samples to be kept. This comes with several trade-offs, and as such is not a one-solution-fits-all. Notably:
 
@@ -166,4 +166,4 @@ Non-zero if the rtcfifo has been prepared and is ready for use, zero if not.
 if not rtcfifo.ready() then
   rtcfifo.prepare()
 end
-```
\ No newline at end of file
+```
diff --git a/docs/en/modules/rtcmem.md b/docs/modules/rtcmem.md
similarity index 96%
rename from docs/en/modules/rtcmem.md
rename to docs/modules/rtcmem.md
index ca5648d8dd..f7f96a22b0 100644
--- a/docs/en/modules/rtcmem.md
+++ b/docs/modules/rtcmem.md
@@ -1,7 +1,7 @@
 # RTC User Memory Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-25 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [rtcmem.c](../../../app/modules/rtcmem.c)|
+| 2015-06-25 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [rtcmem.c](../../app/modules/rtcmem.c)|
 
 The rtcmem module provides basic access to the [RTC](https://en.wikipedia.org/wiki/Real-time_clock) (Real Time Clock) memory.
 
@@ -60,4 +60,4 @@ rtcmem.write32(0, 53) -- Store the value 53 in slot 0
 rtcmem.write32(42, 2, 5, 7) -- Store the values 2, 5 and 7 into slots 42, 43 and 44, respectively.
 ```
 #### See also
-[`rtcmem.read32()`](#rtcmemread32)
\ No newline at end of file
+[`rtcmem.read32()`](#rtcmemread32)
diff --git a/docs/en/modules/rtctime.md b/docs/modules/rtctime.md
similarity index 99%
rename from docs/en/modules/rtctime.md
rename to docs/modules/rtctime.md
index a1cd937ae2..b708137aab 100644
--- a/docs/en/modules/rtctime.md
+++ b/docs/modules/rtctime.md
@@ -1,7 +1,7 @@
 # RTC Time Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-25 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson), Bernd Meyer <bmeyer@dius.com.au> | [Johny Mattsson](https://github.com/jmattsson) | [rtctime.c](../../../app/modules/rtctime.c)|
+| 2015-06-25 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson), Bernd Meyer <bmeyer@dius.com.au> | [Johny Mattsson](https://github.com/jmattsson) | [rtctime.c](../../app/modules/rtctime.c)|
 
 The rtctime module provides advanced timekeeping support for NodeMCU, including keeping time across deep sleep cycles (provided [`rtctime.dsleep()`](#rtctimedsleep) is used instead of [`node.dsleep()`](node.md#nodedsleep)). This can be used to significantly extend battery life on battery powered sensor nodes, as it is no longer necessary to fire up the RF module each wake-up in order to obtain an accurate timestamp.
 
diff --git a/docs/en/modules/si7021.md b/docs/modules/si7021.md
similarity index 98%
rename from docs/en/modules/si7021.md
rename to docs/modules/si7021.md
index 9317d61355..e304ac4c1c 100644
--- a/docs/en/modules/si7021.md
+++ b/docs/modules/si7021.md
@@ -1,7 +1,7 @@
 # Si7021 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-04-19 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [si7021.c](../../../app/modules/si7021.c)|
+| 2017-04-19 | [fetchbot](https://github.com/fetchbot) | [fetchbot](https://github.com/fetchbot) | [si7021.c](../../app/modules/si7021.c)|
 
 This module provides access to the Si7021 humidity and temperature sensor.
 
diff --git a/docs/en/modules/sigma-delta.md b/docs/modules/sigma-delta.md
similarity index 98%
rename from docs/en/modules/sigma-delta.md
rename to docs/modules/sigma-delta.md
index dc27edf262..8aef7f457b 100644
--- a/docs/en/modules/sigma-delta.md
+++ b/docs/modules/sigma-delta.md
@@ -1,7 +1,7 @@
 # Sigma-delta Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-02-20 | [Espressif example](http://bbs.espressif.com/viewtopic.php?t=49), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [sigma_delta.c](../../../app/modules/sigma_delta.c)|
+| 2016-02-20 | [Espressif example](http://bbs.espressif.com/viewtopic.php?t=49), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [sigma_delta.c](../../app/modules/sigma_delta.c)|
 
 This module provides access to the [sigma-delta](https://en.wikipedia.org/wiki/Delta-sigma_modulation) component. It's a hardware signal generator that can be routed to any of the GPIOs except pin 0.
 
diff --git a/docs/en/modules/sjson.md b/docs/modules/sjson.md
similarity index 97%
rename from docs/en/modules/sjson.md
rename to docs/modules/sjson.md
index 03da3aff5b..52aa427336 100644
--- a/docs/en/modules/sjson.md
+++ b/docs/modules/sjson.md
@@ -1,7 +1,7 @@
 # SJSON Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-02-01 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [sjson](../../../app/modules/sjson.c) |
+| 2017-02-01 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [sjson](../../app/modules/sjson.c) |
 
 The JSON support module. Allows encoding and decoding to/from JSON.
 
@@ -23,7 +23,7 @@ When encoding a Lua object, if a function is found, then it is invoked (with no
 
 !!! note
 
-    All examples below use in-memory JSON or content read from the SPIFFS file system. However, where a streaming implementation really shines is in fetching large JSON structures from the remote resources and extracting values on-the-fly. An elaborate streaming example can be found in the [`/lua_examples`](../../../lua_examples/sjson-streaming.lua) folder.
+    All examples below use in-memory JSON or content read from the SPIFFS file system. However, where a streaming implementation really shines is in fetching large JSON structures from the remote resources and extracting values on-the-fly. An elaborate streaming example can be found in the [`/lua_examples`](../../lua_examples/sjson-streaming.lua) folder.
 
 ## sjson.encoder()
 
diff --git a/docs/en/modules/sntp.md b/docs/modules/sntp.md
similarity index 99%
rename from docs/en/modules/sntp.md
rename to docs/modules/sntp.md
index 12498622e0..85abc3a824 100644
--- a/docs/en/modules/sntp.md
+++ b/docs/modules/sntp.md
@@ -1,7 +1,7 @@
 # SNTP Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-06-30 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [sntp.c](../../../app/modules/sntp.c)|
+| 2015-06-30 | [DiUS](https://github.com/DiUS), [Johny Mattsson](https://github.com/jmattsson) | [Johny Mattsson](https://github.com/jmattsson) | [sntp.c](../../app/modules/sntp.c)|
 
 The SNTP module implements a [Simple Network Time Procotol](https://en.wikipedia.org/wiki/Network_Time_Protocol#SNTP) client. This includes support for the "anycast" [NTP](https://en.wikipedia.org/wiki/Network_Time_Protocol) mode where, if supported by the NTP server(s) in your network, it is not necessary to even know the IP address of the NTP server.
 By default, this will use the servers 0.nodemcu.pool.ntp.org through 3.nodemcu.pool.ntp.org. These servers will be adequate for nearly all usages.
diff --git a/docs/en/modules/somfy.md b/docs/modules/somfy.md
similarity index 97%
rename from docs/en/modules/somfy.md
rename to docs/modules/somfy.md
index cadaeafcad..2f5586071c 100644
--- a/docs/en/modules/somfy.md
+++ b/docs/modules/somfy.md
@@ -1,7 +1,7 @@
 # Somfy module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-09-27 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [somfy.c](../../../app/modules/somfy.c)|
+| 2016-09-27 | [vsky279](https://github.com/vsky279) | [vsky279](https://github.com/vsky279) | [somfy.c](../../app/modules/somfy.c)|
 
 This module provides a simple interface to control Somfy blinds via an RF transmitter (433.42 MHz). It is based on [Nickduino Somfy Remote Arduino skecth](https://github.com/Nickduino/Somfy_Remote). 
 
@@ -42,4 +42,4 @@ To start with controlling your Somfy blinds you need to:
 - execute `somfy.sendcommand(4, 123, somfy.PROG, 1, 2)` - the blinds will react and your ESP8266 remote control is now registered
 - running `somfy.sendcommand(4, 123, somfy.DOWN, 2, 16)` - fully closes the blinds
 
-For more elaborated example please refer to [`somfy.lua`](../../../lua_examples/somfy.lua).
+For more elaborated example please refer to [`somfy.lua`](../../lua_examples/somfy.lua).
diff --git a/docs/en/modules/spi.md b/docs/modules/spi.md
similarity index 99%
rename from docs/en/modules/spi.md
rename to docs/modules/spi.md
index 2c96fc03a4..fc1b340134 100644
--- a/docs/en/modules/spi.md
+++ b/docs/modules/spi.md
@@ -1,7 +1,7 @@
 # SPI Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-01-16 | [Ibrahim Abd Elkader](https://github.com/iabdalkader) |              [Arnim Läuger](https://github.com/devsaurus) | [spi.c](../../../app/modules/spi.c)|
+| 2015-01-16 | [Ibrahim Abd Elkader](https://github.com/iabdalkader) |              [Arnim Läuger](https://github.com/devsaurus) | [spi.c](../../app/modules/spi.c)|
 
 All transactions for sending and receiving are most-significant-bit first and least-significant last.
 For technical details of the underlying hardware refer to [metalphreak's ESP8266 HSPI articles](https://web.archive.org/web/20180425205107/http://d.av.id.au:80/blog/tag/hspi/).
diff --git a/docs/en/modules/sqlite3.md b/docs/modules/sqlite3.md
similarity index 90%
rename from docs/en/modules/sqlite3.md
rename to docs/modules/sqlite3.md
index bba6647c18..a98b3b7f40 100644
--- a/docs/en/modules/sqlite3.md
+++ b/docs/modules/sqlite3.md
@@ -1,7 +1,7 @@
 # sqlite3 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-06-20 | [Luiz Felipe Silva](https://github.com/luizfeliperj) | [Luiz Felipe Silva](https://github.com/luizfeliperj) | [sqlite3.c](../../../app/modules/sqlite3.c)|
+| 2017-06-20 | [Luiz Felipe Silva](https://github.com/luizfeliperj) | [Luiz Felipe Silva](https://github.com/luizfeliperj) | [sqlite3.c](../../app/modules/sqlite3.c)|
 
 This module is based on [LuaSQLite3](http://lua.sqlite.org/index.cgi/index) module developed by Tiago Dionizio and Doug Currie with contributions from Thomas Lauer, Michael Roth, and Wolfgang Oertl.
 
@@ -9,7 +9,7 @@ This module depens on [SQLite3](http://www.sqlite.org/) library developed by Dwa
 
 For instruction on how to use this module or further documentation, please, refer to [LuaSQLite3 Documentation](http://lua.sqlite.org/index.cgi/doc/tip/doc/lsqlite3.wiki).
 
-This module is a stripped down version of SQLite, with every possible OMIT_\* configuration enable. The enabled OMIT_\* directives are available in the module's [config file](../../../app/sqlite3/config_ext.h).
+This module is a stripped down version of SQLite, with every possible OMIT_\* configuration enable. The enabled OMIT_\* directives are available in the module's [config file](../../app/sqlite3/config_ext.h).
 
 The SQLite3 module vfs layer integration with NodeMCU was developed by me.
 
@@ -29,4 +29,4 @@ db:exec[[
 for row in db:nrows("SELECT * FROM test") do
   print(row.id, row.content)
 end
-```
\ No newline at end of file
+```
diff --git a/docs/en/modules/struct.md b/docs/modules/struct.md
similarity index 99%
rename from docs/en/modules/struct.md
rename to docs/modules/struct.md
index ea6319c997..3b4df0bb78 100644
--- a/docs/en/modules/struct.md
+++ b/docs/modules/struct.md
@@ -1,7 +1,7 @@
 # Struct Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-02-13 | [Roberto Ierusalimschy](http://www.inf.puc-rio.br/~roberto/struct/), [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [struct.c](../../../app/modules/struct.c)|
+| 2015-02-13 | [Roberto Ierusalimschy](http://www.inf.puc-rio.br/~roberto/struct/), [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [struct.c](../../app/modules/struct.c)|
 
 This module offers basic facilities to convert Lua values to and from C structs. Its main functions are `struct.pack`, which packs multiple Lua values into a struct-like string; and `struct.unpack`, which unpacks multiple Lua values from a given struct-like string.
 
diff --git a/docs/en/modules/switec.md b/docs/modules/switec.md
similarity index 98%
rename from docs/en/modules/switec.md
rename to docs/modules/switec.md
index 0742550c3c..bf13f57a05 100644
--- a/docs/en/modules/switec.md
+++ b/docs/modules/switec.md
@@ -1,7 +1,7 @@
 # Switec Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-06-26 |[Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [switec.c](../../../app/modules/switec.c)|
+| 2016-06-26 |[Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [switec.c](../../app/modules/switec.c)|
 
 This module controls a [Switec X.27](http://www.jukenswisstech.com/?page_id=103) (or compatible) instrument stepper motor. These are the 
 stepper motors that are used in modern automotive instrument clusters. They are incredibly cheap
diff --git a/docs/en/modules/tcs34725.md b/docs/modules/tcs34725.md
similarity index 96%
rename from docs/en/modules/tcs34725.md
rename to docs/modules/tcs34725.md
index bd1dd63d7c..9663009d88 100644
--- a/docs/en/modules/tcs34725.md
+++ b/docs/modules/tcs34725.md
@@ -1,7 +1,7 @@
 # TCS34725 module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-04-02 | [tjhowse](https://github.com/tjhowse) | [tjhowse](https://github.com/tjhowse) | [tcs34725.c](../../../app/modules/tcs34725.c)|
+| 2017-04-02 | [tjhowse](https://github.com/tjhowse) | [tjhowse](https://github.com/tjhowse) | [tcs34725.c](../../app/modules/tcs34725.c)|
 
 This module provides a simple interface to [TCS34725 colour/light sensors](https://www.adafruit.com/product/1334) (Adafruit).
 
diff --git a/docs/en/modules/tls.md b/docs/modules/tls.md
similarity index 97%
rename from docs/en/modules/tls.md
rename to docs/modules/tls.md
index 139625831f..67562dc58a 100644
--- a/docs/en/modules/tls.md
+++ b/docs/modules/tls.md
@@ -1,7 +1,7 @@
 # TLS Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-12-15 | [PhoeniX](https://github.com/djphoenix) | [PhoeniX](https://github.com/djphoenix) | [tls.c](../../../app/modules/tls.c)|
+| 2016-12-15 | [PhoeniX](https://github.com/djphoenix) | [PhoeniX](https://github.com/djphoenix) | [tls.c](../../app/modules/tls.c)|
 
 **SSL/TLS support**
 
@@ -11,7 +11,7 @@
 NodeMCU includes the open-source version of [mbed TLS library](https://tls.mbed.org/). With the NodeMCU default configuration it supports **TLS** 1.0 / 1.1 / 1.2 and the most common cipher suites, including DH/ECDH. ECDSA-based cipher suites are disabled by default.
 
 !!! tip
-	The complete configuration is stored in [user_mbedtls.h](../../../app/include/user_mbedtls.h). This is the file to edit if you build your own firmware and want to change mbed TLS behavior.
+	The complete configuration is stored in [user_mbedtls.h](../../app/include/user_mbedtls.h). This is the file to edit if you build your own firmware and want to change mbed TLS behavior.
 
 For a list of features have a look at the [mbed TLS features page](https://tls.mbed.org/core-features).
 
diff --git a/docs/en/modules/tm1829.md b/docs/modules/tm1829.md
similarity index 88%
rename from docs/en/modules/tm1829.md
rename to docs/modules/tm1829.md
index 7d1ca6df8f..b47904912c 100644
--- a/docs/en/modules/tm1829.md
+++ b/docs/modules/tm1829.md
@@ -1,7 +1,7 @@
 # TM1829 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-05-15 | [Sebastian Haas](https://github.com/sebi2k1) | [Sebastian Haas](https://github.com/sebi2k1) | [tm1829.c](../../../app/modules/tm1829.c)|
+| 2016-05-15 | [Sebastian Haas](https://github.com/sebi2k1) | [Sebastian Haas](https://github.com/sebi2k1) | [tm1829.c](../../app/modules/tm1829.c)|
 
 tm1829 is a library to handle led strips using Titan Micro tm1829
 led controller.
diff --git a/docs/en/modules/tmr.md b/docs/modules/tmr.md
similarity index 99%
rename from docs/en/modules/tmr.md
rename to docs/modules/tmr.md
index 919682d2f9..6f163c64c4 100644
--- a/docs/en/modules/tmr.md
+++ b/docs/modules/tmr.md
@@ -1,7 +1,7 @@
 # Timer Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-12 | [Zeroday](https://github.com/funshine) |              [dnc40085](https://github.com/dnc40085) | [tmr.c](../../../app/modules/tmr.c)|
+| 2014-12-12 | [Zeroday](https://github.com/funshine) |              [dnc40085](https://github.com/dnc40085) | [tmr.c](../../app/modules/tmr.c)|
 
 The tmr module allows access to simple timers, the system counter and uptime.
 
diff --git a/docs/en/modules/tsl2561.md b/docs/modules/tsl2561.md
similarity index 98%
rename from docs/en/modules/tsl2561.md
rename to docs/modules/tsl2561.md
index 8014aa3a55..e54004484e 100644
--- a/docs/en/modules/tsl2561.md
+++ b/docs/modules/tsl2561.md
@@ -1,7 +1,7 @@
 # TSL2561 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-08-22 | [Michael Lucas](https://github.com/Aeprox) | [Michael Lucas](https://github.com/Aeprox) | [tsl2561.c](../../../app/modules/tsl2561.c)|
+| 2015-08-22 | [Michael Lucas](https://github.com/Aeprox) | [Michael Lucas](https://github.com/Aeprox) | [tsl2561.c](../../app/modules/tsl2561.c)|
 
 ## tsl2561.getlux()
 Reads sensor values from the device and returns calculated lux value.
diff --git a/docs/en/modules/u8g2.md b/docs/modules/u8g2.md
similarity index 97%
rename from docs/en/modules/u8g2.md
rename to docs/modules/u8g2.md
index 349a147207..0caa7b9503 100644
--- a/docs/en/modules/u8g2.md
+++ b/docs/modules/u8g2.md
@@ -1,7 +1,7 @@
 # u8g2 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-06-02 | [Oli Kraus](https://github.com/olikraus/u8glib), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [u8g2.c](../../../app/modules/u8g2.c)|
+| 2017-06-02 | [Oli Kraus](https://github.com/olikraus/u8glib), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [u8g2.c](../../app/modules/u8g2.c)|
 
 U8g2 is a graphics library developed at [olikraus/u8g2](https://github.com/olikraus/u8g2) with support for many different displays. It is the successor of [U8glib](https://github.com/olikraus/u8glib) which is not developed any further. Please see [How to port U8g code](https://github.com/olikraus/u8g2/wiki/u8gvsu8g2) for generic porting instructions.
 
@@ -102,7 +102,7 @@ res = 0 -- RES is optional YMMV
 disp = u8g2.ssd1306_128x64_noname(bus, cs, dc, res)
 ```
 
-This object provides all of u8g2's methods to control the display. Refer to [graphics_test.lua](../../../lua_examples/u8g2/graphics_test.lua) to get an impression how this is achieved with Lua code. Visit the [u8g2 homepage](https://github.com/olikraus/u8g2) for technical details.
+This object provides all of u8g2's methods to control the display. Refer to [graphics_test.lua](../../lua_examples/u8g2/graphics_test.lua) to get an impression how this is achieved with Lua code. Visit the [u8g2 homepage](https://github.com/olikraus/u8g2) for technical details.
 
 ### Displays selection
 I²C and HW SPI based displays with support in u8g2 can be enabled.
@@ -110,7 +110,7 @@ I²C and HW SPI based displays with support in u8g2 can be enabled.
 The procedure is different for ESP8266 and ESP32 platforms.
 
 #### ESP8266
-Add the desired entries to the I²C or SPI display tables in [app/include/u8g2_displays.h](../../../app/include/u8g2_displays.h):
+Add the desired entries to the I²C or SPI display tables in [app/include/u8g2_displays.h](../../app/include/u8g2_displays.h):
 ```c
 #define U8G2_DISPLAY_TABLE_I2C \
   U8G2_DISPLAY_TABLE_ENTRY(u8g2_Setup_ssd1306_i2c_128x64_noname_f, ssd1306_i2c_128x64_noname) \
@@ -135,7 +135,7 @@ U8g2 comes with a wide range of fonts for small displays. Fonts can be supplied
 The procedure is different for ESP8266 and ESP32 platforms.
 
 #### ESP8266
-Add the desired fonts to the font table in [app/include/u8g2_fonts.h](../../../app/include/u8g2_fonts.h):
+Add the desired fonts to the font table in [app/include/u8g2_fonts.h](../../app/include/u8g2_fonts.h):
 ```c
 #define U8G2_FONT_TABLE \
   U8G2_FONT_TABLE_ENTRY(font_6x10_tf) \
@@ -151,7 +151,7 @@ make EXTRA_CCFLAGS='-include $(TOP_DIR)/my_extras.h'
 Add the desired fonts to the font selection sub-entry via `make menuconfig`.
 
 ### Bitmaps
-XBM bitmaps are supplied as strings to `drawXBM()` in contrast to the source code based inclusion of XBMs in upstream u8g2 library. This off-loads all data handling from the u8g2 module to generic methods for binary files. See [graphics_test.lua](../../../lua_examples/u8g2/graphics_test.lua).
+XBM bitmaps are supplied as strings to `drawXBM()` in contrast to the source code based inclusion of XBMs in upstream u8g2 library. This off-loads all data handling from the u8g2 module to generic methods for binary files. See [graphics_test.lua](../../lua_examples/u8g2/graphics_test.lua).
 
 Conversion of XBM bitmaps can be performed online with [Online-Utility's Image Converter](http://www.online-utility.org/image_converter.jsp): Convert from XBM to MONO format and upload the binary result.
 
@@ -482,7 +482,7 @@ Draw a XBM Bitmap.
 
 See [u8g2 drawXBM()](https://github.com/olikraus/u8g2/wiki/u8g2reference#drawxbm).
 
-XBM bitmaps are supplied as strings to `drawXBM()`. This off-loads all data handling from the u8g2 module to generic methods for binary files. See [graphics_test.lua](../../../lua_examples/u8g2/graphics_test.lua).
+XBM bitmaps are supplied as strings to `drawXBM()`. This off-loads all data handling from the u8g2 module to generic methods for binary files. See [graphics_test.lua](../../lua_examples/u8g2/graphics_test.lua).
 
 In contrast to the source code based inclusion of XBMs in upstream u8g2 library, it's required to provide precompiled binary files. This can be performed online with [Online-Utility's Image Converter](http://www.online-utility.org/image_converter.jsp): Convert from XBM to MONO format and upload the binary result.
 
diff --git a/docs/en/modules/uart.md b/docs/modules/uart.md
similarity index 98%
rename from docs/en/modules/uart.md
rename to docs/modules/uart.md
index 141b9aa4da..f308f04360 100644
--- a/docs/en/modules/uart.md
+++ b/docs/modules/uart.md
@@ -1,7 +1,7 @@
 # UART Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [uart.c](../../../app/modules/uart.c)|
+| 2014-12-22 | [Zeroday](https://github.com/funshine) | [Zeroday](https://github.com/funshine) | [uart.c](../../app/modules/uart.c)|
 
 The [UART](https://en.wikipedia.org/wiki/Universal_asynchronous_receiver/transmitter) (Universal asynchronous receiver/transmitter) module allows configuration of and communication over the UART serial port.
 
diff --git a/docs/en/modules/ucg.md b/docs/modules/ucg.md
similarity index 98%
rename from docs/en/modules/ucg.md
rename to docs/modules/ucg.md
index 05c0568dfa..88ea241ffc 100644
--- a/docs/en/modules/ucg.md
+++ b/docs/modules/ucg.md
@@ -1,7 +1,7 @@
 # ucg Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-08-05 | [Oli Kraus](https://github.com/olikraus/ucglib), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [ucglib](../../../app/ucglib/)|
+| 2015-08-05 | [Oli Kraus](https://github.com/olikraus/ucglib), [Arnim Läuger](https://github.com/devsaurus) | [Arnim Läuger](https://github.com/devsaurus) | [ucglib](../../app/ucglib/)|
 
 Ucglib is a graphics library developed at [olikraus/ucglib](https://github.com/olikraus/ucglib) with support for color TFT displays.
 
@@ -92,7 +92,7 @@ The procedure is different for ESP8266 and ESP32 platforms.
 
 #### ESP8266
 
-Add the desired entries to the display table in [app/include/ucg_config.h](../../../app/include/ucg_config.h):
+Add the desired entries to the display table in [app/include/ucg_config.h](../../app/include/ucg_config.h):
 ```c
 #define UCG_DISPLAY_TABLE                          \
     UCG_DISPLAY_TABLE_ENTRY(ili9341_18x240x320_hw_spi, ucg_dev_ili9341_18x240x320, ucg_ext_ili9341_18) \
@@ -109,7 +109,7 @@ The procedure is different for ESP8266 and ESP32 platforms.
 
 #### ESP8266
 
-Add the desired fonts to the font table in  [app/include/ucg_config.h](../../../app/include/ucg_config.h):
+Add the desired fonts to the font table in  [app/include/ucg_config.h](../../app/include/ucg_config.h):
 ```c
 #define UCG_FONT_TABLE                              \
     UCG_FONT_TABLE_ENTRY(font_7x13B_tr)             \
diff --git a/docs/en/modules/websocket.md b/docs/modules/websocket.md
similarity index 99%
rename from docs/en/modules/websocket.md
rename to docs/modules/websocket.md
index 8a75f87806..8e0464ed1e 100644
--- a/docs/en/modules/websocket.md
+++ b/docs/modules/websocket.md
@@ -1,7 +1,7 @@
 # Websocket Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2016-08-02 | [Luís Fonseca](https://github.com/luismfonseca) | [Luís Fonseca](https://github.com/luismfonseca) | [websocket.c](../../../app/modules/websocket.c)|
+| 2016-08-02 | [Luís Fonseca](https://github.com/luismfonseca) | [Luís Fonseca](https://github.com/luismfonseca) | [websocket.c](../../app/modules/websocket.c)|
 
 A websocket *client* module that implements [RFC6455](https://tools.ietf.org/html/rfc6455) (version 13) and provides a simple interface to send and receive messages.
 
diff --git a/docs/en/modules/wifi.md b/docs/modules/wifi.md
similarity index 99%
rename from docs/en/modules/wifi.md
rename to docs/modules/wifi.md
index 7d15923725..7ac1f77859 100644
--- a/docs/en/modules/wifi.md
+++ b/docs/modules/wifi.md
@@ -1,7 +1,7 @@
 # WiFi Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-05-12 | [Zeroday](https://github.com/funshine) | [dnc40085](https://github.com/dnc40085) | [wifi.c](../../../app/modules/wifi.c)|
+| 2015-05-12 | [Zeroday](https://github.com/funshine) | [dnc40085](https://github.com/dnc40085) | [wifi.c](../../app/modules/wifi.c)|
 
 !!! important
 	The WiFi subsystem is maintained by background tasks that must run periodically. Any function or task that takes longer than 15ms (milliseconds) may cause the WiFi subsystem to crash. To avoid these potential crashes, it is advised that the WiFi subsystem be suspended with [wifi.suspend()](#wifisuspend) prior to the execution of any tasks or functions that exceed this 15ms guideline.
@@ -16,12 +16,12 @@ Each ESP8266 module can operate as a station, so we can connect it to the WiFi n
 #### Station
 Station (STA) mode is used to get the ESP8266 connected to a WiFi network established by an access point.
 
-![ESP8266 operating in station mode](../../img/WiFi-station-mode.png)
+![ESP8266 operating in station mode](../img/WiFi-station-mode.png)
 
 #### Soft Access Point
 An access point (AP) is a device that provides access to Wi-Fi network to other devices (stations) and connects them further to a wired network. ESP8266 can provide similar functionality except it does not have interface to a wired network. Such mode of operation is called soft access point (soft-AP). The maximum number of stations connected to the soft-AP is five.
 
-![ESP8266 operating in Soft Access Point mode](../../img/WiFi-softap-mode.png)
+![ESP8266 operating in Soft Access Point mode](../img/WiFi-softap-mode.png)
 
 The soft-AP mode is often used and an intermediate step before connecting ESP to a WiFi in a station mode. This is when SSID and password to such network is not known upfront. The module first boots in soft-AP mode, so we can connect to it using a laptop or a mobile phone. Then we are able to provide credentials to the target network. Once done ESP is switched to the station mode and can connect to the target WiFi.
 
@@ -30,7 +30,7 @@ Such functionality is provided by the [NodeMCU enduser setup module](../modules/
 #### Station + Soft Access Point
 Another handy application of soft-AP mode is to set up [mesh networks](https://en.wikipedia.org/wiki/Mesh_networking). ESP can operate in both soft-AP and Station mode so it can act as a node of a mesh network.
 
-![ESP8266 operating in station AP mode](../../img/WiFi-stationap-mode.png)
+![ESP8266 operating in station AP mode](../img/WiFi-stationap-mode.png)
 
 
 ### Function reference
diff --git a/docs/en/modules/wifi_monitor.md b/docs/modules/wifi_monitor.md
similarity index 99%
rename from docs/en/modules/wifi_monitor.md
rename to docs/modules/wifi_monitor.md
index c7ea1d90f1..58eace3be0 100644
--- a/docs/en/modules/wifi_monitor.md
+++ b/docs/modules/wifi_monitor.md
@@ -1,7 +1,7 @@
 # WiFi.monitor Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-12-20 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [wifi_monitor.c](../../../app/modules/wifi_monitor.c)|
+| 2017-12-20 | [Philip Gladstone](https://github.com/pjsg) | [Philip Gladstone](https://github.com/pjsg) | [wifi_monitor.c](../../app/modules/wifi_monitor.c)|
 
 This is an optional module that is only included if `LUA_USE_MODULES_WIFI_MONITOR` is defined in the `user_modules.h` file. This module
 provides access to the monitor mode features of the ESP8266 chipset. In particular, it provides access to received WiFi management frames.
diff --git a/docs/en/modules/wps.md b/docs/modules/wps.md
similarity index 98%
rename from docs/en/modules/wps.md
rename to docs/modules/wps.md
index 8aca670a20..10d57f630b 100644
--- a/docs/en/modules/wps.md
+++ b/docs/modules/wps.md
@@ -1,7 +1,7 @@
 # WPS Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-01-01 | [Frank Exoo](https://github.com/FrankX0) | [Frank Exoo](https://github.com/FrankX0) | [wps.c](../../../app/modules/wps.c)|
+| 2017-01-01 | [Frank Exoo](https://github.com/FrankX0) | [Frank Exoo](https://github.com/FrankX0) | [wps.c](../../app/modules/wps.c)|
 
 [WPS](https://en.wikipedia.org/wiki/Wi-Fi_Protected_Setup) allows devices to be added to an existing network without entering the network credentials.
 
diff --git a/docs/en/modules/ws2801.md b/docs/modules/ws2801.md
similarity index 97%
rename from docs/en/modules/ws2801.md
rename to docs/modules/ws2801.md
index 06373bd562..c4e5f0bc75 100644
--- a/docs/en/modules/ws2801.md
+++ b/docs/modules/ws2801.md
@@ -1,7 +1,7 @@
 # WS2801 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-07-12 | [Espressif example](https://github.com/CHERTS/esp8266-devkit/blob/master/Espressif/examples/ESP8266/EspLightNode/user/ws2801.c), [Konrad Beckmann](https://github.com/kbeckmann) | [Konrad Beckmann](https://github.com/kbeckmann) | [ws2801.c](../../../app/modules/ws2801.c)|
+| 2015-07-12 | [Espressif example](https://github.com/CHERTS/esp8266-devkit/blob/master/Espressif/examples/ESP8266/EspLightNode/user/ws2801.c), [Konrad Beckmann](https://github.com/kbeckmann) | [Konrad Beckmann](https://github.com/kbeckmann) | [ws2801.c](../../app/modules/ws2801.c)|
 
 
 ## ws2801.init()
diff --git a/docs/en/modules/ws2812-effects.md b/docs/modules/ws2812-effects.md
similarity index 99%
rename from docs/en/modules/ws2812-effects.md
rename to docs/modules/ws2812-effects.md
index 011b643f70..e459a5f851 100644
--- a/docs/en/modules/ws2812-effects.md
+++ b/docs/modules/ws2812-effects.md
@@ -1,7 +1,7 @@
 # WS2812 effects Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-11-01 | [Konrad Huebner](https://github.com/skycoders) | [Konrad Huebner](https://github.com/skycoders) | [ws2812_effects.c](../../../app/modules/ws2812_effects.c)|
+| 2017-11-01 | [Konrad Huebner](https://github.com/skycoders) | [Konrad Huebner](https://github.com/skycoders) | [ws2812_effects.c](../../app/modules/ws2812_effects.c)|
 
 This module provides effects based on the [WS2812 library](ws2812.md). Some effects are inspired by / based on the [WS2812FX Library](https://github.com/kitesurfer1404/WS2812FX) but have been adopted to the specifics of the ws2812 library. The effects library works based on a buffer created through the ws2812 library and performs the operations on this buffer.
 
diff --git a/docs/en/modules/ws2812.md b/docs/modules/ws2812.md
similarity index 99%
rename from docs/en/modules/ws2812.md
rename to docs/modules/ws2812.md
index 24086f431c..bfec980bc8 100644
--- a/docs/en/modules/ws2812.md
+++ b/docs/modules/ws2812.md
@@ -1,7 +1,7 @@
 # WS2812 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2015-02-05 | [Till Klocke](https://github.com/dereulenspiegel), [Thomas Soëte](https://github.com/Alkorin) | [Till Klocke](https://github.com/dereulenspiegel) | [ws2812.c](../../../app/modules/ws2812.c)|
+| 2015-02-05 | [Till Klocke](https://github.com/dereulenspiegel), [Thomas Soëte](https://github.com/Alkorin) | [Till Klocke](https://github.com/dereulenspiegel) | [ws2812.c](../../app/modules/ws2812.c)|
 
 ws2812 is a library to handle ws2812-like led strips.
 It works at least on WS2812, WS2812b, APA104, SK6812 (RGB or RGBW).
diff --git a/docs/en/modules/xpt2046.md b/docs/modules/xpt2046.md
similarity index 97%
rename from docs/en/modules/xpt2046.md
rename to docs/modules/xpt2046.md
index b25035c581..d58927f105 100644
--- a/docs/en/modules/xpt2046.md
+++ b/docs/modules/xpt2046.md
@@ -1,7 +1,7 @@
 # XPT2046 Module
 | Since  | Origin / Contributor  | Maintainer  | Source  |
 | :----- | :-------------------- | :---------- | :------ |
-| 2017-03-09| [Starofall](https://github.com/nodemcu/nodemcu-firmware/pull/1242)/[Frank Exoo](https://github.com/FrankX0) | [Frank Exoo](https://github.com/FrankX0) | [xpt2046.c](../../../app/modules/xpt2046.c)|
+| 2017-03-09| [Starofall](https://github.com/nodemcu/nodemcu-firmware/pull/1242)/[Frank Exoo](https://github.com/FrankX0) | [Frank Exoo](https://github.com/FrankX0) | [xpt2046.c](../../app/modules/xpt2046.c)|
 
 XPT2046 is a touch controller used by several cheap displays - often in combination with the ILI9341 display controller.
 The module is built based on the libraries of [spapadim](https://github.com/spapadim/XPT2046/) and [PaulStoffregen](https://github.com/PaulStoffregen/XPT2046_Touchscreen).
diff --git a/docs/en/sdcard.md b/docs/sdcard.md
similarity index 84%
rename from docs/en/sdcard.md
rename to docs/sdcard.md
index 01f3a73133..4b5a9623b3 100644
--- a/docs/en/sdcard.md
+++ b/docs/sdcard.md
@@ -12,7 +12,7 @@ Work is in progress to extend the `file` API with support for the missing featur
 
 The FAT file system is implemented by [Chan's FatFs](http://elm-chan.org/fsw/ff/00index_e.html) version [R0.12a](http://elm-chan.org/fsw/ff/ff12a.zip). It's disabled by default to save memory space and has to be enabled before compiling the firmware:
 
-Uncomment `#define BUILD_FATFS` in [`user_config.h`](../../app/include/user_config.h).
+Uncomment `#define BUILD_FATFS` in [`user_config.h`](../app/include/user_config.h).
 
 ## SD Card connection
 
@@ -31,8 +31,8 @@ Connection of `SS/CS` can be done to any of the GPIOs on pins 1 to 12. This allo
 
     The adapter does not require level shifters since SD and ESP are supposed to be powered with the same voltage. If your specific model contains level shifters then make sure that both sides can be operated at 3V3.
 
-![1:1 micro-sd adapter](../img/micro_sd-small.jpg "1:1 micro-sd adapter")
-![micro-sd shield](../img/micro_sd_shield-small.jpg "micro-sd shield")
+![1:1 micro-sd adapter](img/micro_sd-small.jpg "1:1 micro-sd adapter")
+![micro-sd shield](img/micro_sd_shield-small.jpg "micro-sd shield")
 
 ## Lua bindings
 
@@ -69,4 +69,4 @@ Subdirectories are supported on FAT volumes only.
 
 ## Multiple partitions / multiple cards
 
-The mapping from logical volumes (eg. `/SD0`) to partitions on an SD card is defined in [`fatfs_config.h`](../../app/include/fatfs_config.h). More volumes can be added to the `VolToPart` array with any combination of physical drive number (aka SS/CS pin) and partition number. Their names have to be added to `_VOLUME_STRS` in [`ffconf.h`](../../../app/fatfs/ffconf.h) as well.
+The mapping from logical volumes (eg. `/SD0`) to partitions on an SD card is defined in [`fatfs_config.h`](../app/include/fatfs_config.h). More volumes can be added to the `VolToPart` array with any combination of physical drive number (aka SS/CS pin) and partition number. Their names have to be added to `_VOLUME_STRS` in [`ffconf.h`](../app/fatfs/ffconf.h) as well.
diff --git a/docs/en/spiffs.md b/docs/spiffs.md
similarity index 100%
rename from docs/en/spiffs.md
rename to docs/spiffs.md
diff --git a/docs/en/support.md b/docs/support.md
similarity index 97%
rename from docs/en/support.md
rename to docs/support.md
index 26d7bdcf59..db69bb2956 100644
--- a/docs/en/support.md
+++ b/docs/support.md
@@ -6,4 +6,4 @@ Which ever site you use you need to make sure the description of the problem is
 Stack Overflow is the perfect place to ask coding questions. Use one or several of the following tags: [esp8266](http://stackoverflow.com/tags/esp8266), [nodemcu](http://stackoverflow.com/tags/nodemcu) or [Lua](http://stackoverflow.com/tags/lua).
 
 ## esp8266.com Forums
-esp8266.com has a few [NodeMCU specific forums](http://www.esp8266.com/viewforum.php?f=17) where a number of our active community members tend to hang out.
\ No newline at end of file
+esp8266.com has a few [NodeMCU specific forums](http://www.esp8266.com/viewforum.php?f=17) where a number of our active community members tend to hang out.
diff --git a/docs/en/upload.md b/docs/upload.md
similarity index 99%
rename from docs/en/upload.md
rename to docs/upload.md
index 1349d1f3e8..52e175200b 100644
--- a/docs/en/upload.md
+++ b/docs/upload.md
@@ -13,7 +13,7 @@ The NodeMCU firmware team does not give any recommendations as for which uploade
 
 > The essential multiplatforms tools for any ESP8266 developer from luatool author’s, including Lua for NodeMCU and MicroPython. Also, all AT commands are supported. Requires Java (Standard Edition - SE ver 7 and above) installed.
 
-![ESPlorer](../img/ESPlorer.jpg "ESPlorer")
+![ESPlorer](img/ESPlorer.jpg "ESPlorer")
 
 Source: [https://github.com/4refr0nt/ESPlorer](https://github.com/4refr0nt/ESPlorer)
 
diff --git a/lua_modules/bh1750/README.md b/lua_modules/bh1750/README.md
index 57cf110664..3e39536895 100644
--- a/lua_modules/bh1750/README.md
+++ b/lua_modules/bh1750/README.md
@@ -1,3 +1,3 @@
 # BH1750 Module
 
-Documentation for this Lua module is available in the [bh1750.md](../../docs/en/lua-modules/bh1750.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [bh1750.md](../../docs/lua-modules/bh1750.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/ds18b20/README.md b/lua_modules/ds18b20/README.md
index d78013d29a..caf16a02b6 100644
--- a/lua_modules/ds18b20/README.md
+++ b/lua_modules/ds18b20/README.md
@@ -1,3 +1,3 @@
 # DS18B20 Module
 
-Documentation for this Lua module is available in the [ds18b20.md](../../docs/en/lua-modules/ds18b20.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [ds18b20.md](../../docs/lua-modules/ds18b20.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/ds3231/README.md b/lua_modules/ds3231/README.md
index 716d742617..b44a0e8d7c 100644
--- a/lua_modules/ds3231/README.md
+++ b/lua_modules/ds3231/README.md
@@ -1,3 +1,3 @@
 # DS3231 Module
 
-Documentation for this Lua module is available in the [ds3231.md](../../docs/en/lua-modules/ds3231.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [ds3231.md](../../docs/lua-modules/ds3231.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/email/README.md b/lua_modules/email/README.md
index 0dc730ae80..67d93b61eb 100644
--- a/lua_modules/email/README.md
+++ b/lua_modules/email/README.md
@@ -1,3 +1,3 @@
 # IMAP Module
 
-Documentation for this Lua module is available in the [imap.md](../../docs/en/lua-modules/imap.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [imap.md](../../docs/lua-modules/imap.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/ftp/README.md b/lua_modules/ftp/README.md
index 9b952a3e7c..eba447983c 100644
--- a/lua_modules/ftp/README.md
+++ b/lua_modules/ftp/README.md
@@ -1,3 +1,3 @@
 # FTP Server Module
 
-Documentation for this Lua module is available in the [ftpserver.md](../../docs/en/lua-modules/ftpserver.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [ftpserver.md](../../docs/lua-modules/ftpserver.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/hdc1000/README.md b/lua_modules/hdc1000/README.md
index 1b8d77079b..ce0db42890 100644
--- a/lua_modules/hdc1000/README.md
+++ b/lua_modules/hdc1000/README.md
@@ -1,3 +1,3 @@
 # HDC1000 Module
 
-Documentation for this Lua module is available in the [hdc1000.md](../../docs/en/lua-modules/hdc1000.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [hdc1000.md](../../docs/lua-modules/hdc1000.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/http/README.md b/lua_modules/http/README.md
index f103b496de..2bbe60775e 100644
--- a/lua_modules/http/README.md
+++ b/lua_modules/http/README.md
@@ -1,3 +1,3 @@
 # HTTP Server Module
 
-Documentation for this Lua module is available in the [http.md](../../docs/en/lua-modules/http.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [httpserver.md](../../docs/lua-modules/httpserver.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/lm92/README.md b/lua_modules/lm92/README.md
index 1827228c46..c0da7d512a 100644
--- a/lua_modules/lm92/README.md
+++ b/lua_modules/lm92/README.md
@@ -1,3 +1,3 @@
 # HTTP Server Module
 
-Documentation for this Lua module is available in the [lm92.md](../../docs/en/lua-modules/lm92.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [lm92.md](../../docs/lua-modules/lm92.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/mcp23008/README.md b/lua_modules/mcp23008/README.md
index 303429a28c..de122e2143 100644
--- a/lua_modules/mcp23008/README.md
+++ b/lua_modules/mcp23008/README.md
@@ -1,3 +1,3 @@
 # MCP23008 Module
 
-Documentation for this Lua module is available in the [mcp23008.md](../../docs/en/lua-modules/mcp23008.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [mcp23008.md](../../docs/lua-modules/mcp23008.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/redis/README.md b/lua_modules/redis/README.md
index 8d51fe6395..65ff26ab95 100644
--- a/lua_modules/redis/README.md
+++ b/lua_modules/redis/README.md
@@ -1,3 +1,3 @@
 # Redis Module
 
-Documentation for this Lua module is available in the [redis.md](../../docs/en/lua-modules/redis.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [redis.md](../../docs/lua-modules/redis.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/lua_modules/yeelink/README.md b/lua_modules/yeelink/README.md
index a48dccd1cf..8d356fce1d 100644
--- a/lua_modules/yeelink/README.md
+++ b/lua_modules/yeelink/README.md
@@ -1,3 +1,3 @@
 # Yeelink Module
 
-Documentation for this Lua module is available in the [yeelink.md](../../docs/en/lua-modules/yeelink.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
\ No newline at end of file
+Documentation for this Lua module is available in the [yeelink.md](../../docs/lua-modules/yeelink.md) file and in the [Official NodeMCU Documentation](https://nodemcu.readthedocs.io/) in `Lua Modules` section.
diff --git a/mkdocs.yml b/mkdocs.yml
index 96c9eaf0dd..54b25627b5 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -4,7 +4,7 @@ repo_url: https://github.com/nodemcu/nodemcu-firmware/
 
 theme:
   name: "readthedocs"
-strict: false #Allows to build and test documentation in local enviroment where some links are unreachable
+strict: false #Allows to build and test documentation in local environment where some links are unreachable
 
 markdown_extensions:
 #http://pythonhosted.org/Markdown/extensions/admonition.html
@@ -22,99 +22,99 @@ extra_javascript:
 pages:
 - Overview: 'index.md'
 - Basics:
-    - Getting started: 'en/getting-started.md'
-    - Building the firmware: 'en/build.md'
-    - Flashing the firmware: 'en/flash.md'
-    - Uploading code: 'en/upload.md'
-    - Compiling code: 'en/compiling.md'
-    - Support: 'en/support.md'
+    - Getting started: 'getting-started.md'
+    - Building the firmware: 'build.md'
+    - Flashing the firmware: 'flash.md'
+    - Uploading code: 'upload.md'
+    - Compiling code: 'compiling.md'
+    - Support: 'support.md'
 - FAQs:
-    - Lua Developer FAQ: 'en/lua-developer-faq.md'
-    - Extension Developer FAQ: 'en/extn-developer-faq.md'
-    - Hardware FAQ: 'en/hardware-faq.md'
+    - Lua Developer FAQ: 'lua-developer-faq.md'
+    - Extension Developer FAQ: 'extn-developer-faq.md'
+    - Hardware FAQ: 'hardware-faq.md'
 - Whitepapers:
-    - Filesystem on SD card: 'en/sdcard.md'
-    - Internal filesystem: 'en/spiffs.md'
-    - Lua Compact Debug (LCD): 'en/lcd.md'
-    - Lua Flash Store (LFS): 'en/lfs.md'
+    - Filesystem on SD card: 'sdcard.md'
+    - Internal filesystem: 'spiffs.md'
+    - Lua Compact Debug (LCD): 'lcd.md'
+    - Lua Flash Store (LFS): 'lfs.md'
 - Lua Modules:
-    - 'bh1750': 'en/lua-modules/bh1750.md'
-    - 'ds18b20': 'en/lua-modules/ds18b20.md'
-    - 'ds3231': 'en/lua-modules/ds3231.md'
-    - 'ftpserver': 'en/lua-modules/ftpserver.md'
-    - 'hdc1000': 'en/lua-modules/hdc1000.md'
-    - 'httpserver': 'en/lua-modules/httpserver.md'
-    - 'imap': 'en/lua-modules/imap.md'
-    - 'lm92': 'en/lua-modules/lm92.md'
-    - 'mcp23008': 'en/lua-modules/mcp23008.md'
-    - 'redis': 'en/lua-modules/redis.md'
-    - 'yeelink': 'en/lua-modules/yeelink.md'
+    - 'bh1750': 'lua-modules/bh1750.md'
+    - 'ds18b20': 'lua-modules/ds18b20.md'
+    - 'ds3231': 'lua-modules/ds3231.md'
+    - 'ftpserver': 'lua-modules/ftpserver.md'
+    - 'hdc1000': 'lua-modules/hdc1000.md'
+    - 'httpserver': 'lua-modules/httpserver.md'
+    - 'imap': 'lua-modules/imap.md'
+    - 'lm92': 'lua-modules/lm92.md'
+    - 'mcp23008': 'lua-modules/mcp23008.md'
+    - 'redis': 'lua-modules/redis.md'
+    - 'yeelink': 'lua-modules/yeelink.md'
 - C Modules:
-    - 'adc': 'en/modules/adc.md'
-    - 'ads1115': 'en/modules/ads1115.md'
-    - 'adxl345' : 'en/modules/adxl345.md'
-    - 'am2320': 'en/modules/am2320.md'
-    - 'apa102': 'en/modules/apa102.md'
-    - 'bit': 'en/modules/bit.md'
-    - 'bloom' : 'en/modules/bloom.md'
-    - 'bme280': 'en/modules/bme280.md'
-    - 'bme680': 'en/modules/bme680.md'
-    - 'bmp085': 'en/modules/bmp085.md'
-    - 'cjson': 'en/modules/cjson.md'
-    - 'coap': 'en/modules/coap.md'
-    - 'color-utils': 'en/modules/color-utils.md'
-    - 'cron': 'en/modules/cron.md'
-    - 'crypto': 'en/modules/crypto.md'
-    - 'dht': 'en/modules/dht.md'
-    - 'ds18b20': 'en/modules/ds18b20.md'
-    - 'encoder': 'en/modules/encoder.md'
-    - 'enduser setup': 'en/modules/enduser-setup.md'
-    - 'file': 'en/modules/file.md'
-    - 'gdbstub': 'en/modules/gdbstub.md'
-    - 'gpio': 'en/modules/gpio.md'
-    - 'hdc1080': 'en/modules/hdc1080.md'
-    - 'hmc5883l': 'en/modules/hmc5883l.md'
-    - 'http': 'en/modules/http.md'
-    - 'hx711' : 'en/modules/hx711.md'
-    - 'i2c' : 'en/modules/i2c.md'
-    - 'l3g4200d' : 'en/modules/l3g4200d.md'
-    - 'mcp4725': 'en/modules/mcp4725.md'
-    - 'mdns': 'en/modules/mdns.md'
-    - 'mqtt': 'en/modules/mqtt.md'
-    - 'net': 'en/modules/net.md'
-    - 'node': 'en/modules/node.md'
-    - 'ow (1-Wire)': 'en/modules/ow.md'
-    - 'pcm' : 'en/modules/pcm.md'
-    - 'perf': 'en/modules/perf.md'
-    - 'pwm' : 'en/modules/pwm.md'
-    - 'rc' : 'en/modules/rc.md'
-    - 'rfswitch' : 'en/modules/rfswitch.md'
-    - 'rotary' : 'en/modules/rotary.md'
-    - 'rtcfifo': 'en/modules/rtcfifo.md'
-    - 'rtcmem': 'en/modules/rtcmem.md'
-    - 'rtctime': 'en/modules/rtctime.md'
-    - 'si7021' : 'en/modules/si7021.md'
-    - 'sigma delta': 'en/modules/sigma-delta.md'
-    - 'sjson': 'en/modules/sjson.md'
-    - 'sntp': 'en/modules/sntp.md'
-    - 'somfy': 'en/modules/somfy.md'
-    - 'spi': 'en/modules/spi.md'
-    - 'sqlite3': 'en/modules/sqlite3.md'
-    - 'struct': 'en/modules/struct.md'
-    - 'switec': 'en/modules/switec.md'
-    - 'tcs34725': 'en/modules/tcs34725.md'
-    - 'tls': 'en/modules/tls.md'
-    - 'tm1829': 'en/modules/tm1829.md'
-    - 'tmr': 'en/modules/tmr.md'
-    - 'tsl2561': 'en/modules/tsl2561.md'
-    - 'u8g2': 'en/modules/u8g2.md'
-    - 'uart': 'en/modules/uart.md'
-    - 'ucg': 'en/modules/ucg.md'
-    - 'websocket': 'en/modules/websocket.md'
-    - 'wifi': 'en/modules/wifi.md'
-    - 'wifi.monitor': 'en/modules/wifi_monitor.md'
-    - 'wps': 'en/modules/wps.md'
-    - 'ws2801': 'en/modules/ws2801.md'
-    - 'ws2812': 'en/modules/ws2812.md'
-    - 'ws2812-effects': 'en/modules/ws2812-effects.md'
-    - 'xpt2046': 'en/modules/xpt2046.md'
\ No newline at end of file
+    - 'adc': 'modules/adc.md'
+    - 'ads1115': 'modules/ads1115.md'
+    - 'adxl345' : 'modules/adxl345.md'
+    - 'am2320': 'modules/am2320.md'
+    - 'apa102': 'modules/apa102.md'
+    - 'bit': 'modules/bit.md'
+    - 'bloom' : 'modules/bloom.md'
+    - 'bme280': 'modules/bme280.md'
+    - 'bme680': 'modules/bme680.md'
+    - 'bmp085': 'modules/bmp085.md'
+    - 'cjson': 'modules/cjson.md'
+    - 'coap': 'modules/coap.md'
+    - 'color-utils': 'modules/color-utils.md'
+    - 'cron': 'modules/cron.md'
+    - 'crypto': 'modules/crypto.md'
+    - 'dht': 'modules/dht.md'
+    - 'ds18b20': 'modules/ds18b20.md'
+    - 'encoder': 'modules/encoder.md'
+    - 'enduser setup': 'modules/enduser-setup.md'
+    - 'file': 'modules/file.md'
+    - 'gdbstub': 'modules/gdbstub.md'
+    - 'gpio': 'modules/gpio.md'
+    - 'hdc1080': 'modules/hdc1080.md'
+    - 'hmc5883l': 'modules/hmc5883l.md'
+    - 'http': 'modules/http.md'
+    - 'hx711' : 'modules/hx711.md'
+    - 'i2c' : 'modules/i2c.md'
+    - 'l3g4200d' : 'modules/l3g4200d.md'
+    - 'mcp4725': 'modules/mcp4725.md'
+    - 'mdns': 'modules/mdns.md'
+    - 'mqtt': 'modules/mqtt.md'
+    - 'net': 'modules/net.md'
+    - 'node': 'modules/node.md'
+    - 'ow (1-Wire)': 'modules/ow.md'
+    - 'pcm' : 'modules/pcm.md'
+    - 'perf': 'modules/perf.md'
+    - 'pwm' : 'modules/pwm.md'
+    - 'rc' : 'modules/rc.md'
+    - 'rfswitch' : 'modules/rfswitch.md'
+    - 'rotary' : 'modules/rotary.md'
+    - 'rtcfifo': 'modules/rtcfifo.md'
+    - 'rtcmem': 'modules/rtcmem.md'
+    - 'rtctime': 'modules/rtctime.md'
+    - 'si7021' : 'modules/si7021.md'
+    - 'sigma delta': 'modules/sigma-delta.md'
+    - 'sjson': 'modules/sjson.md'
+    - 'sntp': 'modules/sntp.md'
+    - 'somfy': 'modules/somfy.md'
+    - 'spi': 'modules/spi.md'
+    - 'sqlite3': 'modules/sqlite3.md'
+    - 'struct': 'modules/struct.md'
+    - 'switec': 'modules/switec.md'
+    - 'tcs34725': 'modules/tcs34725.md'
+    - 'tls': 'modules/tls.md'
+    - 'tm1829': 'modules/tm1829.md'
+    - 'tmr': 'modules/tmr.md'
+    - 'tsl2561': 'modules/tsl2561.md'
+    - 'u8g2': 'modules/u8g2.md'
+    - 'uart': 'modules/uart.md'
+    - 'ucg': 'modules/ucg.md'
+    - 'websocket': 'modules/websocket.md'
+    - 'wifi': 'modules/wifi.md'
+    - 'wifi.monitor': 'modules/wifi_monitor.md'
+    - 'wps': 'modules/wps.md'
+    - 'ws2801': 'modules/ws2801.md'
+    - 'ws2812': 'modules/ws2812.md'
+    - 'ws2812-effects': 'modules/ws2812-effects.md'
+    - 'xpt2046': 'modules/xpt2046.md'