diff --git a/_SUMMARY.md b/_SUMMARY.md
index 5e26edca8..1ddf725cf 100644
--- a/_SUMMARY.md
+++ b/_SUMMARY.md
@@ -4,6 +4,9 @@
     Also you can use HTML-comments.
 -->
 
+* [Test page from subfolder](subfolder/sub-subfolder/page.html)
+* [Test subpage from subfolder](another-subfolder/page.html)
+    * [Test another page from subfolder](another-subfolder/another-sub-subfolder/page.html)
 * [Basic Topics](basic_topics.html)
     * [Getting Started](getting_started.html)
         * [Check Out And Build Community Edition](checkout_and_build_community.html)
diff --git a/_config.yml b/_config.yml
index 4a020f1f5..47cec39c7 100644
--- a/_config.yml
+++ b/_config.yml
@@ -17,7 +17,6 @@ exclude:
   - '*.scss'
   - README*
   - Rakefile
-  - lib
   - webhelp-template
   - code_samples
 
diff --git a/_layouts/webhelp.html b/_layouts/webhelp.html
index 17ff80991..c606c7e36 100644
--- a/_layouts/webhelp.html
+++ b/_layouts/webhelp.html
@@ -3,7 +3,7 @@
     {% assign product_version = site.product_version %}
     {% assign page_title = page.title %}
     {% assign page_title_with_h1 = '' %}
-    {% assign page_id = page.name | replace:'.md','' %}
+    {% assign page_id = page.url %}
     {% assign page_content = content %}
     {% capture shortcut_switcher %}
         <div class="shortcuts-switcher"><label for="switch-shortcuts">Keymap:</label><select id="switch-shortcuts" class="select _shortcuts" height="1">
diff --git a/lib/toc_generator.rb b/_lib/toc_generator.rb
similarity index 94%
rename from lib/toc_generator.rb
rename to _lib/toc_generator.rb
index 490fe6305..fd35c251f 100644
--- a/lib/toc_generator.rb
+++ b/_lib/toc_generator.rb
@@ -1,5 +1,6 @@
 require 'yaml'
 require 'json'
+require 'uri'
 require 'kramdown'
 require 'rexml/document'
 require 'rexml/xpath'
@@ -89,8 +90,11 @@ module Docs
 
       REXML::XPath.each(li_node, 'a') do |link|
         href = link.attribute('href').to_s
-        id = File.basename(href, File.extname(href))
+        uri = URI.parse(href)
+        is_absolute_path = href.start_with?('/')
         is_external = href.start_with?('http://', 'https://', 'ftp://', '//')
+        id = href
+        id = '/' + id if !is_absolute_path
         item = {
             :id => id,
             :title => link.text(),
diff --git a/lib/util/erb.rb b/_lib/util/erb.rb
similarity index 100%
rename from lib/util/erb.rb
rename to _lib/util/erb.rb
diff --git a/_rake/build_toc.rake b/_rake/build_toc.rake
index 524b5443c..e95568d0e 100644
--- a/_rake/build_toc.rake
+++ b/_rake/build_toc.rake
@@ -3,7 +3,7 @@ task :build_toc do
   src_dir = CONFIG[:source_dir]
   toc_file = ENV['dest'] || "#{src_dir}/HelpTOC.json"
 
-  load "#{src_dir}/lib/toc_generator.rb"
+  load "#{src_dir}/_lib/toc_generator.rb"
 
   kramdown_config = YAML::load_file("#{src_dir}/_config.yml")['kramdown']
   toc = Docs::TocGenerator.extract("#{src_dir}/_SUMMARY.md", kramdown_config)
diff --git a/another-subfolder/another-sub-subfolder/page.md b/another-subfolder/another-sub-subfolder/page.md
new file mode 100644
index 000000000..65368ce29
--- /dev/null
+++ b/another-subfolder/another-sub-subfolder/page.md
@@ -0,0 +1,9 @@
+---
+title: Another subfolder test
+---
+
+# Another subfolder Test
+
+subfolders test
+
+[Link to page in other folder](../page.html)
diff --git a/another-subfolder/page.md b/another-subfolder/page.md
new file mode 100644
index 000000000..f133e0118
--- /dev/null
+++ b/another-subfolder/page.md
@@ -0,0 +1,7 @@
+---
+title: Another folder test
+---
+
+# Another folder Test
+
+Test
diff --git a/subfolder/sub-subfolder/page.md b/subfolder/sub-subfolder/page.md
new file mode 100644
index 000000000..451c1ed37
--- /dev/null
+++ b/subfolder/sub-subfolder/page.md
@@ -0,0 +1,8 @@
+---
+title: Subfolder test
+---
+
+# Test
+
+subfolders test
+