diff --git a/config.toml b/config.toml
index 6466cf108..ef1e003b6 100644
--- a/config.toml
+++ b/config.toml
@@ -271,3 +271,10 @@ anchor = "smart"
     identifier = "github"
     post = "external"
     url = "https://github.com/gohugoio/hugo"
+
+
+[languages]
+  [languages.en]
+    contentDir = "content/en"
+    languageName = "English"
+    weight = 1
diff --git a/content/_index.md b/content/en/_index.md
similarity index 100%
rename from content/_index.md
rename to content/en/_index.md
diff --git a/content/about/_index.md b/content/en/about/_index.md
similarity index 100%
rename from content/about/_index.md
rename to content/en/about/_index.md
diff --git a/content/about/benefits.md b/content/en/about/benefits.md
similarity index 100%
rename from content/about/benefits.md
rename to content/en/about/benefits.md
diff --git a/content/about/features.md b/content/en/about/features.md
similarity index 100%
rename from content/about/features.md
rename to content/en/about/features.md
diff --git a/content/about/license.md b/content/en/about/license.md
similarity index 100%
rename from content/about/license.md
rename to content/en/about/license.md
diff --git a/content/about/new-in-032/index.md b/content/en/about/new-in-032/index.md
similarity index 100%
rename from content/about/new-in-032/index.md
rename to content/en/about/new-in-032/index.md
diff --git a/content/about/new-in-032/sunset.jpg b/content/en/about/new-in-032/sunset.jpg
similarity index 100%
rename from content/about/new-in-032/sunset.jpg
rename to content/en/about/new-in-032/sunset.jpg
diff --git a/content/about/what-is-hugo.md b/content/en/about/what-is-hugo.md
similarity index 100%
rename from content/about/what-is-hugo.md
rename to content/en/about/what-is-hugo.md
diff --git a/content/commands/hugo.md b/content/en/commands/hugo.md
similarity index 100%
rename from content/commands/hugo.md
rename to content/en/commands/hugo.md
diff --git a/content/commands/hugo_benchmark.md b/content/en/commands/hugo_benchmark.md
similarity index 100%
rename from content/commands/hugo_benchmark.md
rename to content/en/commands/hugo_benchmark.md
diff --git a/content/commands/hugo_check.md b/content/en/commands/hugo_check.md
similarity index 100%
rename from content/commands/hugo_check.md
rename to content/en/commands/hugo_check.md
diff --git a/content/commands/hugo_check_ulimit.md b/content/en/commands/hugo_check_ulimit.md
similarity index 100%
rename from content/commands/hugo_check_ulimit.md
rename to content/en/commands/hugo_check_ulimit.md
diff --git a/content/commands/hugo_config.md b/content/en/commands/hugo_config.md
similarity index 100%
rename from content/commands/hugo_config.md
rename to content/en/commands/hugo_config.md
diff --git a/content/commands/hugo_convert.md b/content/en/commands/hugo_convert.md
similarity index 100%
rename from content/commands/hugo_convert.md
rename to content/en/commands/hugo_convert.md
diff --git a/content/commands/hugo_convert_toJSON.md b/content/en/commands/hugo_convert_toJSON.md
similarity index 100%
rename from content/commands/hugo_convert_toJSON.md
rename to content/en/commands/hugo_convert_toJSON.md
diff --git a/content/commands/hugo_convert_toTOML.md b/content/en/commands/hugo_convert_toTOML.md
similarity index 100%
rename from content/commands/hugo_convert_toTOML.md
rename to content/en/commands/hugo_convert_toTOML.md
diff --git a/content/commands/hugo_convert_toYAML.md b/content/en/commands/hugo_convert_toYAML.md
similarity index 100%
rename from content/commands/hugo_convert_toYAML.md
rename to content/en/commands/hugo_convert_toYAML.md
diff --git a/content/commands/hugo_env.md b/content/en/commands/hugo_env.md
similarity index 100%
rename from content/commands/hugo_env.md
rename to content/en/commands/hugo_env.md
diff --git a/content/commands/hugo_gen.md b/content/en/commands/hugo_gen.md
similarity index 100%
rename from content/commands/hugo_gen.md
rename to content/en/commands/hugo_gen.md
diff --git a/content/commands/hugo_gen_autocomplete.md b/content/en/commands/hugo_gen_autocomplete.md
similarity index 100%
rename from content/commands/hugo_gen_autocomplete.md
rename to content/en/commands/hugo_gen_autocomplete.md
diff --git a/content/commands/hugo_gen_chromastyles.md b/content/en/commands/hugo_gen_chromastyles.md
similarity index 100%
rename from content/commands/hugo_gen_chromastyles.md
rename to content/en/commands/hugo_gen_chromastyles.md
diff --git a/content/commands/hugo_gen_doc.md b/content/en/commands/hugo_gen_doc.md
similarity index 100%
rename from content/commands/hugo_gen_doc.md
rename to content/en/commands/hugo_gen_doc.md
diff --git a/content/commands/hugo_gen_man.md b/content/en/commands/hugo_gen_man.md
similarity index 100%
rename from content/commands/hugo_gen_man.md
rename to content/en/commands/hugo_gen_man.md
diff --git a/content/commands/hugo_import.md b/content/en/commands/hugo_import.md
similarity index 100%
rename from content/commands/hugo_import.md
rename to content/en/commands/hugo_import.md
diff --git a/content/commands/hugo_import_jekyll.md b/content/en/commands/hugo_import_jekyll.md
similarity index 100%
rename from content/commands/hugo_import_jekyll.md
rename to content/en/commands/hugo_import_jekyll.md
diff --git a/content/commands/hugo_list.md b/content/en/commands/hugo_list.md
similarity index 100%
rename from content/commands/hugo_list.md
rename to content/en/commands/hugo_list.md
diff --git a/content/commands/hugo_list_drafts.md b/content/en/commands/hugo_list_drafts.md
similarity index 100%
rename from content/commands/hugo_list_drafts.md
rename to content/en/commands/hugo_list_drafts.md
diff --git a/content/commands/hugo_list_expired.md b/content/en/commands/hugo_list_expired.md
similarity index 100%
rename from content/commands/hugo_list_expired.md
rename to content/en/commands/hugo_list_expired.md
diff --git a/content/commands/hugo_list_future.md b/content/en/commands/hugo_list_future.md
similarity index 100%
rename from content/commands/hugo_list_future.md
rename to content/en/commands/hugo_list_future.md
diff --git a/content/commands/hugo_new.md b/content/en/commands/hugo_new.md
similarity index 100%
rename from content/commands/hugo_new.md
rename to content/en/commands/hugo_new.md
diff --git a/content/commands/hugo_new_site.md b/content/en/commands/hugo_new_site.md
similarity index 100%
rename from content/commands/hugo_new_site.md
rename to content/en/commands/hugo_new_site.md
diff --git a/content/commands/hugo_new_theme.md b/content/en/commands/hugo_new_theme.md
similarity index 100%
rename from content/commands/hugo_new_theme.md
rename to content/en/commands/hugo_new_theme.md
diff --git a/content/commands/hugo_server.md b/content/en/commands/hugo_server.md
similarity index 100%
rename from content/commands/hugo_server.md
rename to content/en/commands/hugo_server.md
diff --git a/content/commands/hugo_version.md b/content/en/commands/hugo_version.md
similarity index 100%
rename from content/commands/hugo_version.md
rename to content/en/commands/hugo_version.md
diff --git a/content/content-management/_index.md b/content/en/content-management/_index.md
similarity index 100%
rename from content/content-management/_index.md
rename to content/en/content-management/_index.md
diff --git a/content/content-management/archetypes.md b/content/en/content-management/archetypes.md
similarity index 100%
rename from content/content-management/archetypes.md
rename to content/en/content-management/archetypes.md
diff --git a/content/content-management/authors.md b/content/en/content-management/authors.md
similarity index 100%
rename from content/content-management/authors.md
rename to content/en/content-management/authors.md
diff --git a/content/content-management/comments.md b/content/en/content-management/comments.md
similarity index 100%
rename from content/content-management/comments.md
rename to content/en/content-management/comments.md
diff --git a/content/content-management/cross-references.md b/content/en/content-management/cross-references.md
similarity index 100%
rename from content/content-management/cross-references.md
rename to content/en/content-management/cross-references.md
diff --git a/content/content-management/formats.md b/content/en/content-management/formats.md
similarity index 99%
rename from content/content-management/formats.md
rename to content/en/content-management/formats.md
index be6fb40e4..6c53ab467 100644
--- a/content/content-management/formats.md
+++ b/content/en/content-management/formats.md
@@ -29,7 +29,7 @@ Before you begin writing your content in markdown, Blackfriday has a known issue
 
 You can configure multiple aspects of Blackfriday as show in the following list. See the docs on [Configuration][config] for the full list of explicit directions you can give to Hugo when rendering your site.
 
-{{< readfile file="/content/readfiles/bfconfig.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/bfconfig.md" markdown="true" >}}
 
 ## Extend Markdown
 
diff --git a/content/content-management/front-matter.md b/content/en/content-management/front-matter.md
similarity index 100%
rename from content/content-management/front-matter.md
rename to content/en/content-management/front-matter.md
diff --git a/content/content-management/image-processing/index.md b/content/en/content-management/image-processing/index.md
similarity index 100%
rename from content/content-management/image-processing/index.md
rename to content/en/content-management/image-processing/index.md
diff --git a/content/content-management/image-processing/sunset.jpg b/content/en/content-management/image-processing/sunset.jpg
similarity index 100%
rename from content/content-management/image-processing/sunset.jpg
rename to content/en/content-management/image-processing/sunset.jpg
diff --git a/content/content-management/menus.md b/content/en/content-management/menus.md
similarity index 100%
rename from content/content-management/menus.md
rename to content/en/content-management/menus.md
diff --git a/content/content-management/multilingual.md b/content/en/content-management/multilingual.md
similarity index 100%
rename from content/content-management/multilingual.md
rename to content/en/content-management/multilingual.md
diff --git a/content/content-management/organization/1-featured-content-bundles.png b/content/en/content-management/organization/1-featured-content-bundles.png
similarity index 100%
rename from content/content-management/organization/1-featured-content-bundles.png
rename to content/en/content-management/organization/1-featured-content-bundles.png
diff --git a/content/content-management/organization/index.md b/content/en/content-management/organization/index.md
similarity index 100%
rename from content/content-management/organization/index.md
rename to content/en/content-management/organization/index.md
diff --git a/content/content-management/page-bundles.md b/content/en/content-management/page-bundles.md
similarity index 100%
rename from content/content-management/page-bundles.md
rename to content/en/content-management/page-bundles.md
diff --git a/content/content-management/page-resources.md b/content/en/content-management/page-resources.md
similarity index 100%
rename from content/content-management/page-resources.md
rename to content/en/content-management/page-resources.md
diff --git a/content/content-management/related.md b/content/en/content-management/related.md
similarity index 100%
rename from content/content-management/related.md
rename to content/en/content-management/related.md
diff --git a/content/content-management/sections.md b/content/en/content-management/sections.md
similarity index 97%
rename from content/content-management/sections.md
rename to content/en/content-management/sections.md
index e53e0feb7..79ae201d4 100644
--- a/content/content-management/sections.md
+++ b/content/en/content-management/sections.md
@@ -81,7 +81,7 @@ With the available [section variables and methods](#section-page-variables-and-m
 
 Also see [Page Variables](/variables/page/).
 
-{{< readfile file="/content/readfiles/sectionvars.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/sectionvars.md" markdown="true" >}}
 
 ## Content Section Lists
 
diff --git a/content/content-management/shortcodes.md b/content/en/content-management/shortcodes.md
similarity index 100%
rename from content/content-management/shortcodes.md
rename to content/en/content-management/shortcodes.md
diff --git a/content/content-management/static-files.md b/content/en/content-management/static-files.md
similarity index 100%
rename from content/content-management/static-files.md
rename to content/en/content-management/static-files.md
diff --git a/content/content-management/summaries.md b/content/en/content-management/summaries.md
similarity index 100%
rename from content/content-management/summaries.md
rename to content/en/content-management/summaries.md
diff --git a/content/content-management/syntax-highlighting.md b/content/en/content-management/syntax-highlighting.md
similarity index 100%
rename from content/content-management/syntax-highlighting.md
rename to content/en/content-management/syntax-highlighting.md
diff --git a/content/content-management/taxonomies.md b/content/en/content-management/taxonomies.md
similarity index 100%
rename from content/content-management/taxonomies.md
rename to content/en/content-management/taxonomies.md
diff --git a/content/content-management/toc.md b/content/en/content-management/toc.md
similarity index 100%
rename from content/content-management/toc.md
rename to content/en/content-management/toc.md
diff --git a/content/content-management/types.md b/content/en/content-management/types.md
similarity index 100%
rename from content/content-management/types.md
rename to content/en/content-management/types.md
diff --git a/content/content-management/urls.md b/content/en/content-management/urls.md
similarity index 100%
rename from content/content-management/urls.md
rename to content/en/content-management/urls.md
diff --git a/content/contribute/_index.md b/content/en/contribute/_index.md
similarity index 100%
rename from content/contribute/_index.md
rename to content/en/contribute/_index.md
diff --git a/content/contribute/development.md b/content/en/contribute/development.md
similarity index 100%
rename from content/contribute/development.md
rename to content/en/contribute/development.md
diff --git a/content/contribute/documentation.md b/content/en/contribute/documentation.md
similarity index 100%
rename from content/contribute/documentation.md
rename to content/en/contribute/documentation.md
diff --git a/content/contribute/themes.md b/content/en/contribute/themes.md
similarity index 100%
rename from content/contribute/themes.md
rename to content/en/contribute/themes.md
diff --git a/content/documentation.md b/content/en/documentation.md
similarity index 100%
rename from content/documentation.md
rename to content/en/documentation.md
diff --git a/content/functions/GetPage.md b/content/en/functions/GetPage.md
similarity index 100%
rename from content/functions/GetPage.md
rename to content/en/functions/GetPage.md
diff --git a/content/functions/NumFmt.md b/content/en/functions/NumFmt.md
similarity index 100%
rename from content/functions/NumFmt.md
rename to content/en/functions/NumFmt.md
diff --git a/content/functions/_index.md b/content/en/functions/_index.md
similarity index 100%
rename from content/functions/_index.md
rename to content/en/functions/_index.md
diff --git a/content/functions/abslangurl.md b/content/en/functions/abslangurl.md
similarity index 100%
rename from content/functions/abslangurl.md
rename to content/en/functions/abslangurl.md
diff --git a/content/functions/absurl.md b/content/en/functions/absurl.md
similarity index 100%
rename from content/functions/absurl.md
rename to content/en/functions/absurl.md
diff --git a/content/functions/adddate.md b/content/en/functions/adddate.md
similarity index 100%
rename from content/functions/adddate.md
rename to content/en/functions/adddate.md
diff --git a/content/functions/after.md b/content/en/functions/after.md
similarity index 100%
rename from content/functions/after.md
rename to content/en/functions/after.md
diff --git a/content/functions/apply.md b/content/en/functions/apply.md
similarity index 100%
rename from content/functions/apply.md
rename to content/en/functions/apply.md
diff --git a/content/functions/base64.md b/content/en/functions/base64.md
similarity index 100%
rename from content/functions/base64.md
rename to content/en/functions/base64.md
diff --git a/content/functions/chomp.md b/content/en/functions/chomp.md
similarity index 100%
rename from content/functions/chomp.md
rename to content/en/functions/chomp.md
diff --git a/content/functions/cond.md b/content/en/functions/cond.md
similarity index 100%
rename from content/functions/cond.md
rename to content/en/functions/cond.md
diff --git a/content/functions/countrunes.md b/content/en/functions/countrunes.md
similarity index 100%
rename from content/functions/countrunes.md
rename to content/en/functions/countrunes.md
diff --git a/content/functions/countwords.md b/content/en/functions/countwords.md
similarity index 100%
rename from content/functions/countwords.md
rename to content/en/functions/countwords.md
diff --git a/content/functions/dateformat.md b/content/en/functions/dateformat.md
similarity index 100%
rename from content/functions/dateformat.md
rename to content/en/functions/dateformat.md
diff --git a/content/functions/default.md b/content/en/functions/default.md
similarity index 100%
rename from content/functions/default.md
rename to content/en/functions/default.md
diff --git a/content/functions/delimit.md b/content/en/functions/delimit.md
similarity index 100%
rename from content/functions/delimit.md
rename to content/en/functions/delimit.md
diff --git a/content/functions/dict.md b/content/en/functions/dict.md
similarity index 100%
rename from content/functions/dict.md
rename to content/en/functions/dict.md
diff --git a/content/functions/echoparam.md b/content/en/functions/echoparam.md
similarity index 100%
rename from content/functions/echoparam.md
rename to content/en/functions/echoparam.md
diff --git a/content/functions/emojify.md b/content/en/functions/emojify.md
similarity index 100%
rename from content/functions/emojify.md
rename to content/en/functions/emojify.md
diff --git a/content/functions/eq.md b/content/en/functions/eq.md
similarity index 100%
rename from content/functions/eq.md
rename to content/en/functions/eq.md
diff --git a/content/functions/errorf.md b/content/en/functions/errorf.md
similarity index 100%
rename from content/functions/errorf.md
rename to content/en/functions/errorf.md
diff --git a/content/functions/fileExists.md b/content/en/functions/fileExists.md
similarity index 100%
rename from content/functions/fileExists.md
rename to content/en/functions/fileExists.md
diff --git a/content/functions/findRe.md b/content/en/functions/findRe.md
similarity index 100%
rename from content/functions/findRe.md
rename to content/en/functions/findRe.md
diff --git a/content/functions/first.md b/content/en/functions/first.md
similarity index 100%
rename from content/functions/first.md
rename to content/en/functions/first.md
diff --git a/content/functions/float.md b/content/en/functions/float.md
similarity index 100%
rename from content/functions/float.md
rename to content/en/functions/float.md
diff --git a/content/functions/format.md b/content/en/functions/format.md
similarity index 100%
rename from content/functions/format.md
rename to content/en/functions/format.md
diff --git a/content/functions/ge.md b/content/en/functions/ge.md
similarity index 100%
rename from content/functions/ge.md
rename to content/en/functions/ge.md
diff --git a/content/functions/get.md b/content/en/functions/get.md
similarity index 100%
rename from content/functions/get.md
rename to content/en/functions/get.md
diff --git a/content/functions/getenv.md b/content/en/functions/getenv.md
similarity index 100%
rename from content/functions/getenv.md
rename to content/en/functions/getenv.md
diff --git a/content/functions/gt.md b/content/en/functions/gt.md
similarity index 100%
rename from content/functions/gt.md
rename to content/en/functions/gt.md
diff --git a/content/functions/hasPrefix.md b/content/en/functions/hasPrefix.md
similarity index 100%
rename from content/functions/hasPrefix.md
rename to content/en/functions/hasPrefix.md
diff --git a/content/functions/haschildren.md b/content/en/functions/haschildren.md
similarity index 100%
rename from content/functions/haschildren.md
rename to content/en/functions/haschildren.md
diff --git a/content/functions/hasmenucurrent.md b/content/en/functions/hasmenucurrent.md
similarity index 100%
rename from content/functions/hasmenucurrent.md
rename to content/en/functions/hasmenucurrent.md
diff --git a/content/functions/highlight.md b/content/en/functions/highlight.md
similarity index 100%
rename from content/functions/highlight.md
rename to content/en/functions/highlight.md
diff --git a/content/functions/htmlEscape.md b/content/en/functions/htmlEscape.md
similarity index 100%
rename from content/functions/htmlEscape.md
rename to content/en/functions/htmlEscape.md
diff --git a/content/functions/htmlUnescape.md b/content/en/functions/htmlUnescape.md
similarity index 100%
rename from content/functions/htmlUnescape.md
rename to content/en/functions/htmlUnescape.md
diff --git a/content/functions/humanize.md b/content/en/functions/humanize.md
similarity index 100%
rename from content/functions/humanize.md
rename to content/en/functions/humanize.md
diff --git a/content/functions/i18n.md b/content/en/functions/i18n.md
similarity index 100%
rename from content/functions/i18n.md
rename to content/en/functions/i18n.md
diff --git a/content/functions/imageConfig.md b/content/en/functions/imageConfig.md
similarity index 100%
rename from content/functions/imageConfig.md
rename to content/en/functions/imageConfig.md
diff --git a/content/functions/in.md b/content/en/functions/in.md
similarity index 100%
rename from content/functions/in.md
rename to content/en/functions/in.md
diff --git a/content/functions/index-function.md b/content/en/functions/index-function.md
similarity index 100%
rename from content/functions/index-function.md
rename to content/en/functions/index-function.md
diff --git a/content/functions/int.md b/content/en/functions/int.md
similarity index 100%
rename from content/functions/int.md
rename to content/en/functions/int.md
diff --git a/content/functions/intersect.md b/content/en/functions/intersect.md
similarity index 100%
rename from content/functions/intersect.md
rename to content/en/functions/intersect.md
diff --git a/content/functions/ismenucurrent.md b/content/en/functions/ismenucurrent.md
similarity index 100%
rename from content/functions/ismenucurrent.md
rename to content/en/functions/ismenucurrent.md
diff --git a/content/functions/isset.md b/content/en/functions/isset.md
similarity index 100%
rename from content/functions/isset.md
rename to content/en/functions/isset.md
diff --git a/content/functions/jsonify.md b/content/en/functions/jsonify.md
similarity index 100%
rename from content/functions/jsonify.md
rename to content/en/functions/jsonify.md
diff --git a/content/functions/lang.Merge.md b/content/en/functions/lang.Merge.md
similarity index 100%
rename from content/functions/lang.Merge.md
rename to content/en/functions/lang.Merge.md
diff --git a/content/functions/last.md b/content/en/functions/last.md
similarity index 100%
rename from content/functions/last.md
rename to content/en/functions/last.md
diff --git a/content/functions/le.md b/content/en/functions/le.md
similarity index 100%
rename from content/functions/le.md
rename to content/en/functions/le.md
diff --git a/content/functions/len.md b/content/en/functions/len.md
similarity index 100%
rename from content/functions/len.md
rename to content/en/functions/len.md
diff --git a/content/functions/lower.md b/content/en/functions/lower.md
similarity index 100%
rename from content/functions/lower.md
rename to content/en/functions/lower.md
diff --git a/content/functions/lt.md b/content/en/functions/lt.md
similarity index 100%
rename from content/functions/lt.md
rename to content/en/functions/lt.md
diff --git a/content/functions/markdownify.md b/content/en/functions/markdownify.md
similarity index 100%
rename from content/functions/markdownify.md
rename to content/en/functions/markdownify.md
diff --git a/content/functions/math.md b/content/en/functions/math.md
similarity index 100%
rename from content/functions/math.md
rename to content/en/functions/math.md
diff --git a/content/functions/md5.md b/content/en/functions/md5.md
similarity index 100%
rename from content/functions/md5.md
rename to content/en/functions/md5.md
diff --git a/content/functions/ne.md b/content/en/functions/ne.md
similarity index 100%
rename from content/functions/ne.md
rename to content/en/functions/ne.md
diff --git a/content/functions/now.md b/content/en/functions/now.md
similarity index 100%
rename from content/functions/now.md
rename to content/en/functions/now.md
diff --git a/content/functions/param.md b/content/en/functions/param.md
similarity index 100%
rename from content/functions/param.md
rename to content/en/functions/param.md
diff --git a/content/functions/partialCached.md b/content/en/functions/partialCached.md
similarity index 100%
rename from content/functions/partialCached.md
rename to content/en/functions/partialCached.md
diff --git a/content/functions/plainify.md b/content/en/functions/plainify.md
similarity index 100%
rename from content/functions/plainify.md
rename to content/en/functions/plainify.md
diff --git a/content/functions/pluralize.md b/content/en/functions/pluralize.md
similarity index 100%
rename from content/functions/pluralize.md
rename to content/en/functions/pluralize.md
diff --git a/content/functions/print.md b/content/en/functions/print.md
similarity index 100%
rename from content/functions/print.md
rename to content/en/functions/print.md
diff --git a/content/functions/printf.md b/content/en/functions/printf.md
similarity index 100%
rename from content/functions/printf.md
rename to content/en/functions/printf.md
diff --git a/content/functions/println.md b/content/en/functions/println.md
similarity index 100%
rename from content/functions/println.md
rename to content/en/functions/println.md
diff --git a/content/functions/querify.md b/content/en/functions/querify.md
similarity index 100%
rename from content/functions/querify.md
rename to content/en/functions/querify.md
diff --git a/content/functions/range.md b/content/en/functions/range.md
similarity index 100%
rename from content/functions/range.md
rename to content/en/functions/range.md
diff --git a/content/functions/readdir.md b/content/en/functions/readdir.md
similarity index 100%
rename from content/functions/readdir.md
rename to content/en/functions/readdir.md
diff --git a/content/functions/readfile.md b/content/en/functions/readfile.md
similarity index 100%
rename from content/functions/readfile.md
rename to content/en/functions/readfile.md
diff --git a/content/functions/ref.md b/content/en/functions/ref.md
similarity index 100%
rename from content/functions/ref.md
rename to content/en/functions/ref.md
diff --git a/content/functions/relLangURL.md b/content/en/functions/relLangURL.md
similarity index 100%
rename from content/functions/relLangURL.md
rename to content/en/functions/relLangURL.md
diff --git a/content/functions/relref.md b/content/en/functions/relref.md
similarity index 100%
rename from content/functions/relref.md
rename to content/en/functions/relref.md
diff --git a/content/functions/relurl.md b/content/en/functions/relurl.md
similarity index 100%
rename from content/functions/relurl.md
rename to content/en/functions/relurl.md
diff --git a/content/functions/render.md b/content/en/functions/render.md
similarity index 100%
rename from content/functions/render.md
rename to content/en/functions/render.md
diff --git a/content/functions/replace.md b/content/en/functions/replace.md
similarity index 100%
rename from content/functions/replace.md
rename to content/en/functions/replace.md
diff --git a/content/functions/replacere.md b/content/en/functions/replacere.md
similarity index 100%
rename from content/functions/replacere.md
rename to content/en/functions/replacere.md
diff --git a/content/functions/safeCSS.md b/content/en/functions/safeCSS.md
similarity index 100%
rename from content/functions/safeCSS.md
rename to content/en/functions/safeCSS.md
diff --git a/content/functions/safeHTML.md b/content/en/functions/safeHTML.md
similarity index 100%
rename from content/functions/safeHTML.md
rename to content/en/functions/safeHTML.md
diff --git a/content/functions/safeHTMLAttr.md b/content/en/functions/safeHTMLAttr.md
similarity index 100%
rename from content/functions/safeHTMLAttr.md
rename to content/en/functions/safeHTMLAttr.md
diff --git a/content/functions/safeJS.md b/content/en/functions/safeJS.md
similarity index 100%
rename from content/functions/safeJS.md
rename to content/en/functions/safeJS.md
diff --git a/content/functions/safeURL.md b/content/en/functions/safeURL.md
similarity index 100%
rename from content/functions/safeURL.md
rename to content/en/functions/safeURL.md
diff --git a/content/functions/scratch.md b/content/en/functions/scratch.md
similarity index 100%
rename from content/functions/scratch.md
rename to content/en/functions/scratch.md
diff --git a/content/functions/seq.md b/content/en/functions/seq.md
similarity index 100%
rename from content/functions/seq.md
rename to content/en/functions/seq.md
diff --git a/content/functions/sha.md b/content/en/functions/sha.md
similarity index 100%
rename from content/functions/sha.md
rename to content/en/functions/sha.md
diff --git a/content/functions/shuffle.md b/content/en/functions/shuffle.md
similarity index 100%
rename from content/functions/shuffle.md
rename to content/en/functions/shuffle.md
diff --git a/content/functions/singularize.md b/content/en/functions/singularize.md
similarity index 100%
rename from content/functions/singularize.md
rename to content/en/functions/singularize.md
diff --git a/content/functions/slice.md b/content/en/functions/slice.md
similarity index 100%
rename from content/functions/slice.md
rename to content/en/functions/slice.md
diff --git a/content/functions/slicestr.md b/content/en/functions/slicestr.md
similarity index 100%
rename from content/functions/slicestr.md
rename to content/en/functions/slicestr.md
diff --git a/content/functions/sort.md b/content/en/functions/sort.md
similarity index 100%
rename from content/functions/sort.md
rename to content/en/functions/sort.md
diff --git a/content/functions/split.md b/content/en/functions/split.md
similarity index 100%
rename from content/functions/split.md
rename to content/en/functions/split.md
diff --git a/content/functions/string.md b/content/en/functions/string.md
similarity index 100%
rename from content/functions/string.md
rename to content/en/functions/string.md
diff --git a/content/functions/strings.TrimLeft.md b/content/en/functions/strings.TrimLeft.md
similarity index 100%
rename from content/functions/strings.TrimLeft.md
rename to content/en/functions/strings.TrimLeft.md
diff --git a/content/functions/strings.TrimPrefix.md b/content/en/functions/strings.TrimPrefix.md
similarity index 100%
rename from content/functions/strings.TrimPrefix.md
rename to content/en/functions/strings.TrimPrefix.md
diff --git a/content/functions/strings.TrimRight.md b/content/en/functions/strings.TrimRight.md
similarity index 100%
rename from content/functions/strings.TrimRight.md
rename to content/en/functions/strings.TrimRight.md
diff --git a/content/functions/strings.TrimSuffix.md b/content/en/functions/strings.TrimSuffix.md
similarity index 100%
rename from content/functions/strings.TrimSuffix.md
rename to content/en/functions/strings.TrimSuffix.md
diff --git a/content/functions/substr.md b/content/en/functions/substr.md
similarity index 100%
rename from content/functions/substr.md
rename to content/en/functions/substr.md
diff --git a/content/functions/time.md b/content/en/functions/time.md
similarity index 100%
rename from content/functions/time.md
rename to content/en/functions/time.md
diff --git a/content/functions/title.md b/content/en/functions/title.md
similarity index 100%
rename from content/functions/title.md
rename to content/en/functions/title.md
diff --git a/content/functions/trim.md b/content/en/functions/trim.md
similarity index 100%
rename from content/functions/trim.md
rename to content/en/functions/trim.md
diff --git a/content/functions/truncate.md b/content/en/functions/truncate.md
similarity index 100%
rename from content/functions/truncate.md
rename to content/en/functions/truncate.md
diff --git a/content/functions/union.md b/content/en/functions/union.md
similarity index 100%
rename from content/functions/union.md
rename to content/en/functions/union.md
diff --git a/content/functions/uniq.md b/content/en/functions/uniq.md
similarity index 100%
rename from content/functions/uniq.md
rename to content/en/functions/uniq.md
diff --git a/content/functions/unix.md b/content/en/functions/unix.md
similarity index 100%
rename from content/functions/unix.md
rename to content/en/functions/unix.md
diff --git a/content/functions/upper.md b/content/en/functions/upper.md
similarity index 100%
rename from content/functions/upper.md
rename to content/en/functions/upper.md
diff --git a/content/functions/urlize.md b/content/en/functions/urlize.md
similarity index 100%
rename from content/functions/urlize.md
rename to content/en/functions/urlize.md
diff --git a/content/functions/urls.Parse.md b/content/en/functions/urls.Parse.md
similarity index 100%
rename from content/functions/urls.Parse.md
rename to content/en/functions/urls.Parse.md
diff --git a/content/functions/where.md b/content/en/functions/where.md
similarity index 100%
rename from content/functions/where.md
rename to content/en/functions/where.md
diff --git a/content/functions/with.md b/content/en/functions/with.md
similarity index 100%
rename from content/functions/with.md
rename to content/en/functions/with.md
diff --git a/content/getting-started/_index.md b/content/en/getting-started/_index.md
similarity index 100%
rename from content/getting-started/_index.md
rename to content/en/getting-started/_index.md
diff --git a/content/getting-started/code-toggle.md b/content/en/getting-started/code-toggle.md
similarity index 100%
rename from content/getting-started/code-toggle.md
rename to content/en/getting-started/code-toggle.md
diff --git a/content/getting-started/configuration.md b/content/en/getting-started/configuration.md
similarity index 99%
rename from content/getting-started/configuration.md
rename to content/en/getting-started/configuration.md
index 23fceb56f..518e4a2cc 100644
--- a/content/getting-started/configuration.md
+++ b/content/en/getting-started/configuration.md
@@ -369,7 +369,7 @@ Hugo typically configures Blackfriday with sane default values that should fit m
 
 However, if you have specific needs with respect to Markdown, Hugo exposes some of its Blackfriday behavior options for you to alter. The following table lists these Hugo options, paired with the corresponding flags from Blackfriday's source code ( [html.go](https://github.com/russross/blackfriday/blob/master/html.go) and [markdown.go](https://github.com/russross/blackfriday/blob/master/markdown.go)).
 
-{{< readfile file="/content/readfiles/bfconfig.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/bfconfig.md" markdown="true" >}}
 
 {{% note %}}
 1. Blackfriday flags are *case sensitive* as of Hugo v0.15.
diff --git a/content/getting-started/directory-structure.md b/content/en/getting-started/directory-structure.md
similarity index 100%
rename from content/getting-started/directory-structure.md
rename to content/en/getting-started/directory-structure.md
diff --git a/content/getting-started/installing.md b/content/en/getting-started/installing.md
similarity index 100%
rename from content/getting-started/installing.md
rename to content/en/getting-started/installing.md
diff --git a/content/getting-started/quick-start.md b/content/en/getting-started/quick-start.md
similarity index 100%
rename from content/getting-started/quick-start.md
rename to content/en/getting-started/quick-start.md
diff --git a/content/getting-started/usage.md b/content/en/getting-started/usage.md
similarity index 100%
rename from content/getting-started/usage.md
rename to content/en/getting-started/usage.md
diff --git a/content/hosting-and-deployment/_index.md b/content/en/hosting-and-deployment/_index.md
similarity index 100%
rename from content/hosting-and-deployment/_index.md
rename to content/en/hosting-and-deployment/_index.md
diff --git a/content/hosting-and-deployment/deployment-with-nanobox.md b/content/en/hosting-and-deployment/deployment-with-nanobox.md
similarity index 100%
rename from content/hosting-and-deployment/deployment-with-nanobox.md
rename to content/en/hosting-and-deployment/deployment-with-nanobox.md
diff --git a/content/hosting-and-deployment/deployment-with-rsync.md b/content/en/hosting-and-deployment/deployment-with-rsync.md
similarity index 100%
rename from content/hosting-and-deployment/deployment-with-rsync.md
rename to content/en/hosting-and-deployment/deployment-with-rsync.md
diff --git a/content/hosting-and-deployment/deployment-with-wercker.md b/content/en/hosting-and-deployment/deployment-with-wercker.md
similarity index 100%
rename from content/hosting-and-deployment/deployment-with-wercker.md
rename to content/en/hosting-and-deployment/deployment-with-wercker.md
diff --git a/content/hosting-and-deployment/hosting-on-bitbucket.md b/content/en/hosting-and-deployment/hosting-on-bitbucket.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-bitbucket.md
rename to content/en/hosting-and-deployment/hosting-on-bitbucket.md
diff --git a/content/hosting-and-deployment/hosting-on-firebase.md b/content/en/hosting-and-deployment/hosting-on-firebase.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-firebase.md
rename to content/en/hosting-and-deployment/hosting-on-firebase.md
diff --git a/content/hosting-and-deployment/hosting-on-github.md b/content/en/hosting-and-deployment/hosting-on-github.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-github.md
rename to content/en/hosting-and-deployment/hosting-on-github.md
diff --git a/content/hosting-and-deployment/hosting-on-gitlab.md b/content/en/hosting-and-deployment/hosting-on-gitlab.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-gitlab.md
rename to content/en/hosting-and-deployment/hosting-on-gitlab.md
diff --git a/content/hosting-and-deployment/hosting-on-keycdn.md b/content/en/hosting-and-deployment/hosting-on-keycdn.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-keycdn.md
rename to content/en/hosting-and-deployment/hosting-on-keycdn.md
diff --git a/content/hosting-and-deployment/hosting-on-netlify.md b/content/en/hosting-and-deployment/hosting-on-netlify.md
similarity index 100%
rename from content/hosting-and-deployment/hosting-on-netlify.md
rename to content/en/hosting-and-deployment/hosting-on-netlify.md
diff --git a/content/maintenance/_index.md b/content/en/maintenance/_index.md
similarity index 100%
rename from content/maintenance/_index.md
rename to content/en/maintenance/_index.md
diff --git a/content/news/0-16.md b/content/en/news/0-16.md
similarity index 100%
rename from content/news/0-16.md
rename to content/en/news/0-16.md
diff --git a/content/news/0-17.md b/content/en/news/0-17.md
similarity index 100%
rename from content/news/0-17.md
rename to content/en/news/0-17.md
diff --git a/content/news/0-18.md b/content/en/news/0-18.md
similarity index 100%
rename from content/news/0-18.md
rename to content/en/news/0-18.md
diff --git a/content/news/0-19.md b/content/en/news/0-19.md
similarity index 100%
rename from content/news/0-19.md
rename to content/en/news/0-19.md
diff --git a/content/news/0-20-1.md b/content/en/news/0-20-1.md
similarity index 100%
rename from content/news/0-20-1.md
rename to content/en/news/0-20-1.md
diff --git a/content/news/0-20-2.md b/content/en/news/0-20-2.md
similarity index 100%
rename from content/news/0-20-2.md
rename to content/en/news/0-20-2.md
diff --git a/content/news/0-20-3.md b/content/en/news/0-20-3.md
similarity index 100%
rename from content/news/0-20-3.md
rename to content/en/news/0-20-3.md
diff --git a/content/news/0-20-4.md b/content/en/news/0-20-4.md
similarity index 100%
rename from content/news/0-20-4.md
rename to content/en/news/0-20-4.md
diff --git a/content/news/0-20-5.md b/content/en/news/0-20-5.md
similarity index 100%
rename from content/news/0-20-5.md
rename to content/en/news/0-20-5.md
diff --git a/content/news/0-20-6.md b/content/en/news/0-20-6.md
similarity index 100%
rename from content/news/0-20-6.md
rename to content/en/news/0-20-6.md
diff --git a/content/news/0-20-7.md b/content/en/news/0-20-7.md
similarity index 100%
rename from content/news/0-20-7.md
rename to content/en/news/0-20-7.md
diff --git a/content/news/0-20.md b/content/en/news/0-20.md
similarity index 100%
rename from content/news/0-20.md
rename to content/en/news/0-20.md
diff --git a/content/news/0-21.md b/content/en/news/0-21.md
similarity index 100%
rename from content/news/0-21.md
rename to content/en/news/0-21.md
diff --git a/content/news/0-22-1.md b/content/en/news/0-22-1.md
similarity index 100%
rename from content/news/0-22-1.md
rename to content/en/news/0-22-1.md
diff --git a/content/news/0-22.md b/content/en/news/0-22.md
similarity index 100%
rename from content/news/0-22.md
rename to content/en/news/0-22.md
diff --git a/content/news/0-23.md b/content/en/news/0-23.md
similarity index 100%
rename from content/news/0-23.md
rename to content/en/news/0-23.md
diff --git a/content/news/0-24-1.md b/content/en/news/0-24-1.md
similarity index 100%
rename from content/news/0-24-1.md
rename to content/en/news/0-24-1.md
diff --git a/content/news/0-24.md b/content/en/news/0-24.md
similarity index 100%
rename from content/news/0-24.md
rename to content/en/news/0-24.md
diff --git a/content/news/0-25-1.md b/content/en/news/0-25-1.md
similarity index 100%
rename from content/news/0-25-1.md
rename to content/en/news/0-25-1.md
diff --git a/content/news/0-25.md b/content/en/news/0-25.md
similarity index 100%
rename from content/news/0-25.md
rename to content/en/news/0-25.md
diff --git a/content/news/0.26-relnotes.md b/content/en/news/0.26-relnotes.md
similarity index 100%
rename from content/news/0.26-relnotes.md
rename to content/en/news/0.26-relnotes.md
diff --git a/content/news/0.27-relnotes.md b/content/en/news/0.27-relnotes.md
similarity index 100%
rename from content/news/0.27-relnotes.md
rename to content/en/news/0.27-relnotes.md
diff --git a/content/news/0.27.1-relnotes.md b/content/en/news/0.27.1-relnotes.md
similarity index 100%
rename from content/news/0.27.1-relnotes.md
rename to content/en/news/0.27.1-relnotes.md
diff --git a/content/news/0.28-relnotes-ready.md b/content/en/news/0.28-relnotes-ready.md
similarity index 100%
rename from content/news/0.28-relnotes-ready.md
rename to content/en/news/0.28-relnotes-ready.md
diff --git a/content/news/0.29-relnotes-ready.md b/content/en/news/0.29-relnotes-ready.md
similarity index 100%
rename from content/news/0.29-relnotes-ready.md
rename to content/en/news/0.29-relnotes-ready.md
diff --git a/content/news/0.30-relnotes-ready.md b/content/en/news/0.30-relnotes-ready.md
similarity index 100%
rename from content/news/0.30-relnotes-ready.md
rename to content/en/news/0.30-relnotes-ready.md
diff --git a/content/news/0.30.1-relnotes-ready.md b/content/en/news/0.30.1-relnotes-ready.md
similarity index 100%
rename from content/news/0.30.1-relnotes-ready.md
rename to content/en/news/0.30.1-relnotes-ready.md
diff --git a/content/news/0.30.2-relnotes-ready.md b/content/en/news/0.30.2-relnotes-ready.md
similarity index 100%
rename from content/news/0.30.2-relnotes-ready.md
rename to content/en/news/0.30.2-relnotes-ready.md
diff --git a/content/news/0.31-relnotes-ready.md b/content/en/news/0.31-relnotes-ready.md
similarity index 100%
rename from content/news/0.31-relnotes-ready.md
rename to content/en/news/0.31-relnotes-ready.md
diff --git a/content/news/0.31.1-relnotes-ready.md b/content/en/news/0.31.1-relnotes-ready.md
similarity index 100%
rename from content/news/0.31.1-relnotes-ready.md
rename to content/en/news/0.31.1-relnotes-ready.md
diff --git a/content/news/0.32-relnotes-ready.md b/content/en/news/0.32-relnotes-ready.md
similarity index 100%
rename from content/news/0.32-relnotes-ready.md
rename to content/en/news/0.32-relnotes-ready.md
diff --git a/content/news/0.32.1-relnotes-ready.md b/content/en/news/0.32.1-relnotes-ready.md
similarity index 100%
rename from content/news/0.32.1-relnotes-ready.md
rename to content/en/news/0.32.1-relnotes-ready.md
diff --git a/content/news/0.32.2-relnotes-ready.md b/content/en/news/0.32.2-relnotes-ready.md
similarity index 100%
rename from content/news/0.32.2-relnotes-ready.md
rename to content/en/news/0.32.2-relnotes-ready.md
diff --git a/content/news/0.32.3-relnotes-ready.md b/content/en/news/0.32.3-relnotes-ready.md
similarity index 100%
rename from content/news/0.32.3-relnotes-ready.md
rename to content/en/news/0.32.3-relnotes-ready.md
diff --git a/content/news/0.32.4-relnotes-ready.md b/content/en/news/0.32.4-relnotes-ready.md
similarity index 100%
rename from content/news/0.32.4-relnotes-ready.md
rename to content/en/news/0.32.4-relnotes-ready.md
diff --git a/content/news/0.33-relnotes/featured-hugo-33-poster.png b/content/en/news/0.33-relnotes/featured-hugo-33-poster.png
similarity index 100%
rename from content/news/0.33-relnotes/featured-hugo-33-poster.png
rename to content/en/news/0.33-relnotes/featured-hugo-33-poster.png
diff --git a/content/news/0.33-relnotes/index.md b/content/en/news/0.33-relnotes/index.md
similarity index 100%
rename from content/news/0.33-relnotes/index.md
rename to content/en/news/0.33-relnotes/index.md
diff --git a/content/news/0.34-relnotes/featured-34-poster.png b/content/en/news/0.34-relnotes/featured-34-poster.png
similarity index 100%
rename from content/news/0.34-relnotes/featured-34-poster.png
rename to content/en/news/0.34-relnotes/featured-34-poster.png
diff --git a/content/news/0.34-relnotes/index.md b/content/en/news/0.34-relnotes/index.md
similarity index 100%
rename from content/news/0.34-relnotes/index.md
rename to content/en/news/0.34-relnotes/index.md
diff --git a/content/news/0.35-relnotes/featured-hugo-35-poster.png b/content/en/news/0.35-relnotes/featured-hugo-35-poster.png
similarity index 100%
rename from content/news/0.35-relnotes/featured-hugo-35-poster.png
rename to content/en/news/0.35-relnotes/featured-hugo-35-poster.png
diff --git a/content/news/0.35-relnotes/index.md b/content/en/news/0.35-relnotes/index.md
similarity index 100%
rename from content/news/0.35-relnotes/index.md
rename to content/en/news/0.35-relnotes/index.md
diff --git a/content/news/0.36-relnotes/featured-hugo-36-poster.png b/content/en/news/0.36-relnotes/featured-hugo-36-poster.png
similarity index 100%
rename from content/news/0.36-relnotes/featured-hugo-36-poster.png
rename to content/en/news/0.36-relnotes/featured-hugo-36-poster.png
diff --git a/content/news/0.36-relnotes/index.md b/content/en/news/0.36-relnotes/index.md
similarity index 100%
rename from content/news/0.36-relnotes/index.md
rename to content/en/news/0.36-relnotes/index.md
diff --git a/content/news/0.36.1-relnotes-ready.md b/content/en/news/0.36.1-relnotes-ready.md
similarity index 100%
rename from content/news/0.36.1-relnotes-ready.md
rename to content/en/news/0.36.1-relnotes-ready.md
diff --git a/content/news/0.37-relnotes/featured-hugo-37-poster.png b/content/en/news/0.37-relnotes/featured-hugo-37-poster.png
similarity index 100%
rename from content/news/0.37-relnotes/featured-hugo-37-poster.png
rename to content/en/news/0.37-relnotes/featured-hugo-37-poster.png
diff --git a/content/news/0.37-relnotes/index.md b/content/en/news/0.37-relnotes/index.md
similarity index 100%
rename from content/news/0.37-relnotes/index.md
rename to content/en/news/0.37-relnotes/index.md
diff --git a/content/news/0.37.1-relnotes/index.md b/content/en/news/0.37.1-relnotes/index.md
similarity index 100%
rename from content/news/0.37.1-relnotes/index.md
rename to content/en/news/0.37.1-relnotes/index.md
diff --git a/content/news/0.38-relnotes/featured-poster.png b/content/en/news/0.38-relnotes/featured-poster.png
similarity index 100%
rename from content/news/0.38-relnotes/featured-poster.png
rename to content/en/news/0.38-relnotes/featured-poster.png
diff --git a/content/news/0.38-relnotes/index.md b/content/en/news/0.38-relnotes/index.md
similarity index 100%
rename from content/news/0.38-relnotes/index.md
rename to content/en/news/0.38-relnotes/index.md
diff --git a/content/news/0.38.1-relnotes/index.md b/content/en/news/0.38.1-relnotes/index.md
similarity index 100%
rename from content/news/0.38.1-relnotes/index.md
rename to content/en/news/0.38.1-relnotes/index.md
diff --git a/content/news/0.38.2-relnotes/index.md b/content/en/news/0.38.2-relnotes/index.md
similarity index 100%
rename from content/news/0.38.2-relnotes/index.md
rename to content/en/news/0.38.2-relnotes/index.md
diff --git a/content/news/0.39-relnotes/featured-hugo-39-poster.png b/content/en/news/0.39-relnotes/featured-hugo-39-poster.png
similarity index 100%
rename from content/news/0.39-relnotes/featured-hugo-39-poster.png
rename to content/en/news/0.39-relnotes/featured-hugo-39-poster.png
diff --git a/content/news/0.39-relnotes/index.md b/content/en/news/0.39-relnotes/index.md
similarity index 100%
rename from content/news/0.39-relnotes/index.md
rename to content/en/news/0.39-relnotes/index.md
diff --git a/content/news/0.40-relnotes/featured-hugo-40-poster.png b/content/en/news/0.40-relnotes/featured-hugo-40-poster.png
similarity index 100%
rename from content/news/0.40-relnotes/featured-hugo-40-poster.png
rename to content/en/news/0.40-relnotes/featured-hugo-40-poster.png
diff --git a/content/news/0.40-relnotes/index.md b/content/en/news/0.40-relnotes/index.md
similarity index 100%
rename from content/news/0.40-relnotes/index.md
rename to content/en/news/0.40-relnotes/index.md
diff --git a/content/news/0.40.1-relnotes/index.md b/content/en/news/0.40.1-relnotes/index.md
similarity index 100%
rename from content/news/0.40.1-relnotes/index.md
rename to content/en/news/0.40.1-relnotes/index.md
diff --git a/content/news/_index.md b/content/en/news/_index.md
similarity index 100%
rename from content/news/_index.md
rename to content/en/news/_index.md
diff --git a/content/news/http2-server-push-in-hugo.md b/content/en/news/http2-server-push-in-hugo.md
similarity index 100%
rename from content/news/http2-server-push-in-hugo.md
rename to content/en/news/http2-server-push-in-hugo.md
diff --git a/content/readfiles/README.md b/content/en/readfiles/README.md
similarity index 100%
rename from content/readfiles/README.md
rename to content/en/readfiles/README.md
diff --git a/content/readfiles/bfconfig.md b/content/en/readfiles/bfconfig.md
similarity index 100%
rename from content/readfiles/bfconfig.md
rename to content/en/readfiles/bfconfig.md
diff --git a/content/readfiles/dateformatting.md b/content/en/readfiles/dateformatting.md
similarity index 100%
rename from content/readfiles/dateformatting.md
rename to content/en/readfiles/dateformatting.md
diff --git a/content/readfiles/index.md b/content/en/readfiles/index.md
similarity index 100%
rename from content/readfiles/index.md
rename to content/en/readfiles/index.md
diff --git a/content/readfiles/menuvars.md b/content/en/readfiles/menuvars.md
similarity index 100%
rename from content/readfiles/menuvars.md
rename to content/en/readfiles/menuvars.md
diff --git a/content/readfiles/sectionvars.md b/content/en/readfiles/sectionvars.md
similarity index 100%
rename from content/readfiles/sectionvars.md
rename to content/en/readfiles/sectionvars.md
diff --git a/content/readfiles/testing.txt b/content/en/readfiles/testing.txt
similarity index 100%
rename from content/readfiles/testing.txt
rename to content/en/readfiles/testing.txt
diff --git a/content/showcase/1password-support/bio.md b/content/en/showcase/1password-support/bio.md
similarity index 100%
rename from content/showcase/1password-support/bio.md
rename to content/en/showcase/1password-support/bio.md
diff --git a/content/showcase/1password-support/featured.png b/content/en/showcase/1password-support/featured.png
similarity index 100%
rename from content/showcase/1password-support/featured.png
rename to content/en/showcase/1password-support/featured.png
diff --git a/content/showcase/1password-support/index.md b/content/en/showcase/1password-support/index.md
similarity index 100%
rename from content/showcase/1password-support/index.md
rename to content/en/showcase/1password-support/index.md
diff --git a/content/showcase/flesland-flis/bio.md b/content/en/showcase/flesland-flis/bio.md
similarity index 100%
rename from content/showcase/flesland-flis/bio.md
rename to content/en/showcase/flesland-flis/bio.md
diff --git a/content/showcase/flesland-flis/featured.png b/content/en/showcase/flesland-flis/featured.png
similarity index 100%
rename from content/showcase/flesland-flis/featured.png
rename to content/en/showcase/flesland-flis/featured.png
diff --git a/content/showcase/flesland-flis/index.md b/content/en/showcase/flesland-flis/index.md
similarity index 100%
rename from content/showcase/flesland-flis/index.md
rename to content/en/showcase/flesland-flis/index.md
diff --git a/content/showcase/forestry/bio.md b/content/en/showcase/forestry/bio.md
similarity index 100%
rename from content/showcase/forestry/bio.md
rename to content/en/showcase/forestry/bio.md
diff --git a/content/showcase/forestry/featured.png b/content/en/showcase/forestry/featured.png
similarity index 100%
rename from content/showcase/forestry/featured.png
rename to content/en/showcase/forestry/featured.png
diff --git a/content/showcase/forestry/index.md b/content/en/showcase/forestry/index.md
similarity index 100%
rename from content/showcase/forestry/index.md
rename to content/en/showcase/forestry/index.md
diff --git a/content/showcase/hartwell-insurance/bio.md b/content/en/showcase/hartwell-insurance/bio.md
similarity index 100%
rename from content/showcase/hartwell-insurance/bio.md
rename to content/en/showcase/hartwell-insurance/bio.md
diff --git a/content/showcase/hartwell-insurance/featured.png b/content/en/showcase/hartwell-insurance/featured.png
similarity index 100%
rename from content/showcase/hartwell-insurance/featured.png
rename to content/en/showcase/hartwell-insurance/featured.png
diff --git a/content/showcase/hartwell-insurance/hartwell-columns.png b/content/en/showcase/hartwell-insurance/hartwell-columns.png
similarity index 100%
rename from content/showcase/hartwell-insurance/hartwell-columns.png
rename to content/en/showcase/hartwell-insurance/hartwell-columns.png
diff --git a/content/showcase/hartwell-insurance/hartwell-lighthouse.png b/content/en/showcase/hartwell-insurance/hartwell-lighthouse.png
similarity index 100%
rename from content/showcase/hartwell-insurance/hartwell-lighthouse.png
rename to content/en/showcase/hartwell-insurance/hartwell-lighthouse.png
diff --git a/content/showcase/hartwell-insurance/hartwell-webpagetest.png b/content/en/showcase/hartwell-insurance/hartwell-webpagetest.png
similarity index 100%
rename from content/showcase/hartwell-insurance/hartwell-webpagetest.png
rename to content/en/showcase/hartwell-insurance/hartwell-webpagetest.png
diff --git a/content/showcase/hartwell-insurance/index.md b/content/en/showcase/hartwell-insurance/index.md
similarity index 100%
rename from content/showcase/hartwell-insurance/index.md
rename to content/en/showcase/hartwell-insurance/index.md
diff --git a/content/showcase/letsencrypt/bio.md b/content/en/showcase/letsencrypt/bio.md
similarity index 100%
rename from content/showcase/letsencrypt/bio.md
rename to content/en/showcase/letsencrypt/bio.md
diff --git a/content/showcase/letsencrypt/featured.png b/content/en/showcase/letsencrypt/featured.png
similarity index 100%
rename from content/showcase/letsencrypt/featured.png
rename to content/en/showcase/letsencrypt/featured.png
diff --git a/content/showcase/letsencrypt/index.md b/content/en/showcase/letsencrypt/index.md
similarity index 100%
rename from content/showcase/letsencrypt/index.md
rename to content/en/showcase/letsencrypt/index.md
diff --git a/content/showcase/linode/bio.md b/content/en/showcase/linode/bio.md
similarity index 100%
rename from content/showcase/linode/bio.md
rename to content/en/showcase/linode/bio.md
diff --git a/content/showcase/linode/featured.png b/content/en/showcase/linode/featured.png
similarity index 100%
rename from content/showcase/linode/featured.png
rename to content/en/showcase/linode/featured.png
diff --git a/content/showcase/linode/index.md b/content/en/showcase/linode/index.md
similarity index 100%
rename from content/showcase/linode/index.md
rename to content/en/showcase/linode/index.md
diff --git a/content/showcase/pace-revenue-management/bio.md b/content/en/showcase/pace-revenue-management/bio.md
similarity index 100%
rename from content/showcase/pace-revenue-management/bio.md
rename to content/en/showcase/pace-revenue-management/bio.md
diff --git a/content/showcase/pace-revenue-management/featured.png b/content/en/showcase/pace-revenue-management/featured.png
similarity index 100%
rename from content/showcase/pace-revenue-management/featured.png
rename to content/en/showcase/pace-revenue-management/featured.png
diff --git a/content/showcase/pace-revenue-management/index.md b/content/en/showcase/pace-revenue-management/index.md
similarity index 100%
rename from content/showcase/pace-revenue-management/index.md
rename to content/en/showcase/pace-revenue-management/index.md
diff --git a/content/showcase/quiply-employee-communications-app/bio.md b/content/en/showcase/quiply-employee-communications-app/bio.md
similarity index 100%
rename from content/showcase/quiply-employee-communications-app/bio.md
rename to content/en/showcase/quiply-employee-communications-app/bio.md
diff --git a/content/showcase/quiply-employee-communications-app/featured.png b/content/en/showcase/quiply-employee-communications-app/featured.png
similarity index 100%
rename from content/showcase/quiply-employee-communications-app/featured.png
rename to content/en/showcase/quiply-employee-communications-app/featured.png
diff --git a/content/showcase/quiply-employee-communications-app/index.md b/content/en/showcase/quiply-employee-communications-app/index.md
similarity index 100%
rename from content/showcase/quiply-employee-communications-app/index.md
rename to content/en/showcase/quiply-employee-communications-app/index.md
diff --git a/content/showcase/small-multiples/bio.md b/content/en/showcase/small-multiples/bio.md
similarity index 100%
rename from content/showcase/small-multiples/bio.md
rename to content/en/showcase/small-multiples/bio.md
diff --git a/content/showcase/small-multiples/featured-small-multiples.png b/content/en/showcase/small-multiples/featured-small-multiples.png
similarity index 100%
rename from content/showcase/small-multiples/featured-small-multiples.png
rename to content/en/showcase/small-multiples/featured-small-multiples.png
diff --git a/content/showcase/small-multiples/index.md b/content/en/showcase/small-multiples/index.md
similarity index 100%
rename from content/showcase/small-multiples/index.md
rename to content/en/showcase/small-multiples/index.md
diff --git a/content/showcase/stackimpact/bio.md b/content/en/showcase/stackimpact/bio.md
similarity index 100%
rename from content/showcase/stackimpact/bio.md
rename to content/en/showcase/stackimpact/bio.md
diff --git a/content/showcase/stackimpact/featured.png b/content/en/showcase/stackimpact/featured.png
similarity index 100%
rename from content/showcase/stackimpact/featured.png
rename to content/en/showcase/stackimpact/featured.png
diff --git a/content/showcase/stackimpact/index.md b/content/en/showcase/stackimpact/index.md
similarity index 100%
rename from content/showcase/stackimpact/index.md
rename to content/en/showcase/stackimpact/index.md
diff --git a/content/showcase/template/bio.md b/content/en/showcase/template/bio.md
similarity index 100%
rename from content/showcase/template/bio.md
rename to content/en/showcase/template/bio.md
diff --git a/content/showcase/template/featured-template.png b/content/en/showcase/template/featured-template.png
similarity index 100%
rename from content/showcase/template/featured-template.png
rename to content/en/showcase/template/featured-template.png
diff --git a/content/showcase/template/index.md b/content/en/showcase/template/index.md
similarity index 100%
rename from content/showcase/template/index.md
rename to content/en/showcase/template/index.md
diff --git a/content/templates/404.md b/content/en/templates/404.md
similarity index 100%
rename from content/templates/404.md
rename to content/en/templates/404.md
diff --git a/content/templates/_index.md b/content/en/templates/_index.md
similarity index 100%
rename from content/templates/_index.md
rename to content/en/templates/_index.md
diff --git a/content/templates/alternatives.md b/content/en/templates/alternatives.md
similarity index 100%
rename from content/templates/alternatives.md
rename to content/en/templates/alternatives.md
diff --git a/content/templates/base.md b/content/en/templates/base.md
similarity index 100%
rename from content/templates/base.md
rename to content/en/templates/base.md
diff --git a/content/templates/data-templates.md b/content/en/templates/data-templates.md
similarity index 100%
rename from content/templates/data-templates.md
rename to content/en/templates/data-templates.md
diff --git a/content/templates/files.md b/content/en/templates/files.md
similarity index 94%
rename from content/templates/files.md
rename to content/en/templates/files.md
index b7fbf66a2..6e6f3ec4e 100644
--- a/content/templates/files.md
+++ b/content/en/templates/files.md
@@ -85,24 +85,24 @@ Here is the templating for our new `readfile` shortcode:
 This `readfile` shortcode is [also part of the Hugo docs][readfilesource]. So is [`testing.txt`][testfile], which we will call in this example by passing it into our new `readfile` shortcode as follows:
 
 ```
-{{</* readfile file="/content/readfiles/testing.txt" */>}}
+{{</* readfile file="/content/en/readfiles/testing.txt" */>}}
 ```
 
 The output "string" for this shortcode declaration will be the following:
 
 ```
-{{< readfile file="/content/readfiles/testing.txt" >}}
+{{< readfile file="/content/en/readfiles/testing.txt" >}}
 ```
 
 However, if we want Hugo to pass this string through Blackfriday, we should add the `markdown="true"` optional parameter:
 
 ```
-{{</* readfile file="/content/readfiles/testing.txt" markdown="true" */>}}
+{{</* readfile file="/content/en/readfiles/testing.txt" markdown="true" */>}}
 ```
 
 And here is the result as [called directly in the Hugo docs][] and rendered for display:
 
-{{< readfile file="/content/readfiles/testing.txt" markdown="true">}}
+{{< readfile file="/content/en/readfiles/testing.txt" markdown="true">}}
 
 [called directly in the Hugo docs]: https://github.com/gohugoio/hugo/blob/master/docs/content/templates/files.md
 [dirindex]: https://github.com/gohugoio/hugo/blob/master/docs/layouts/shortcodes/directoryindex.html
diff --git a/content/templates/homepage.md b/content/en/templates/homepage.md
similarity index 100%
rename from content/templates/homepage.md
rename to content/en/templates/homepage.md
diff --git a/content/templates/internal.md b/content/en/templates/internal.md
similarity index 100%
rename from content/templates/internal.md
rename to content/en/templates/internal.md
diff --git a/content/templates/introduction.md b/content/en/templates/introduction.md
similarity index 100%
rename from content/templates/introduction.md
rename to content/en/templates/introduction.md
diff --git a/content/templates/lists.md b/content/en/templates/lists.md
similarity index 100%
rename from content/templates/lists.md
rename to content/en/templates/lists.md
diff --git a/content/templates/lookup-order.md b/content/en/templates/lookup-order.md
similarity index 100%
rename from content/templates/lookup-order.md
rename to content/en/templates/lookup-order.md
diff --git a/content/templates/menu-templates.md b/content/en/templates/menu-templates.md
similarity index 100%
rename from content/templates/menu-templates.md
rename to content/en/templates/menu-templates.md
diff --git a/content/templates/ordering-and-grouping.md b/content/en/templates/ordering-and-grouping.md
similarity index 100%
rename from content/templates/ordering-and-grouping.md
rename to content/en/templates/ordering-and-grouping.md
diff --git a/content/templates/output-formats.md b/content/en/templates/output-formats.md
similarity index 100%
rename from content/templates/output-formats.md
rename to content/en/templates/output-formats.md
diff --git a/content/templates/pagination.md b/content/en/templates/pagination.md
similarity index 100%
rename from content/templates/pagination.md
rename to content/en/templates/pagination.md
diff --git a/content/templates/partials.md b/content/en/templates/partials.md
similarity index 100%
rename from content/templates/partials.md
rename to content/en/templates/partials.md
diff --git a/content/templates/robots.md b/content/en/templates/robots.md
similarity index 100%
rename from content/templates/robots.md
rename to content/en/templates/robots.md
diff --git a/content/templates/rss.md b/content/en/templates/rss.md
similarity index 100%
rename from content/templates/rss.md
rename to content/en/templates/rss.md
diff --git a/content/templates/section-templates.md b/content/en/templates/section-templates.md
similarity index 100%
rename from content/templates/section-templates.md
rename to content/en/templates/section-templates.md
diff --git a/content/templates/shortcode-templates.md b/content/en/templates/shortcode-templates.md
similarity index 100%
rename from content/templates/shortcode-templates.md
rename to content/en/templates/shortcode-templates.md
diff --git a/content/templates/single-page-templates.md b/content/en/templates/single-page-templates.md
similarity index 100%
rename from content/templates/single-page-templates.md
rename to content/en/templates/single-page-templates.md
diff --git a/content/templates/sitemap-template.md b/content/en/templates/sitemap-template.md
similarity index 100%
rename from content/templates/sitemap-template.md
rename to content/en/templates/sitemap-template.md
diff --git a/content/templates/taxonomy-templates.md b/content/en/templates/taxonomy-templates.md
similarity index 100%
rename from content/templates/taxonomy-templates.md
rename to content/en/templates/taxonomy-templates.md
diff --git a/content/templates/template-debugging.md b/content/en/templates/template-debugging.md
similarity index 100%
rename from content/templates/template-debugging.md
rename to content/en/templates/template-debugging.md
diff --git a/content/templates/views.md b/content/en/templates/views.md
similarity index 100%
rename from content/templates/views.md
rename to content/en/templates/views.md
diff --git a/content/themes/_index.md b/content/en/themes/_index.md
similarity index 100%
rename from content/themes/_index.md
rename to content/en/themes/_index.md
diff --git a/content/themes/creating.md b/content/en/themes/creating.md
similarity index 100%
rename from content/themes/creating.md
rename to content/en/themes/creating.md
diff --git a/content/themes/customizing.md b/content/en/themes/customizing.md
similarity index 100%
rename from content/themes/customizing.md
rename to content/en/themes/customizing.md
diff --git a/content/themes/installing-and-using-themes.md b/content/en/themes/installing-and-using-themes.md
similarity index 100%
rename from content/themes/installing-and-using-themes.md
rename to content/en/themes/installing-and-using-themes.md
diff --git a/content/tools/_index.md b/content/en/tools/_index.md
similarity index 100%
rename from content/tools/_index.md
rename to content/en/tools/_index.md
diff --git a/content/tools/editors.md b/content/en/tools/editors.md
similarity index 100%
rename from content/tools/editors.md
rename to content/en/tools/editors.md
diff --git a/content/tools/frontends.md b/content/en/tools/frontends.md
similarity index 100%
rename from content/tools/frontends.md
rename to content/en/tools/frontends.md
diff --git a/content/tools/migrations.md b/content/en/tools/migrations.md
similarity index 100%
rename from content/tools/migrations.md
rename to content/en/tools/migrations.md
diff --git a/content/tools/other.md b/content/en/tools/other.md
similarity index 100%
rename from content/tools/other.md
rename to content/en/tools/other.md
diff --git a/content/tools/search.md b/content/en/tools/search.md
similarity index 100%
rename from content/tools/search.md
rename to content/en/tools/search.md
diff --git a/content/tools/starter-kits.md b/content/en/tools/starter-kits.md
similarity index 100%
rename from content/tools/starter-kits.md
rename to content/en/tools/starter-kits.md
diff --git a/content/troubleshooting/_index.md b/content/en/troubleshooting/_index.md
similarity index 100%
rename from content/troubleshooting/_index.md
rename to content/en/troubleshooting/_index.md
diff --git a/content/troubleshooting/build-performance.md b/content/en/troubleshooting/build-performance.md
similarity index 100%
rename from content/troubleshooting/build-performance.md
rename to content/en/troubleshooting/build-performance.md
diff --git a/content/troubleshooting/faq.md b/content/en/troubleshooting/faq.md
similarity index 100%
rename from content/troubleshooting/faq.md
rename to content/en/troubleshooting/faq.md
diff --git a/content/variables/_index.md b/content/en/variables/_index.md
similarity index 100%
rename from content/variables/_index.md
rename to content/en/variables/_index.md
diff --git a/content/variables/files.md b/content/en/variables/files.md
similarity index 100%
rename from content/variables/files.md
rename to content/en/variables/files.md
diff --git a/content/variables/git.md b/content/en/variables/git.md
similarity index 100%
rename from content/variables/git.md
rename to content/en/variables/git.md
diff --git a/content/variables/hugo.md b/content/en/variables/hugo.md
similarity index 100%
rename from content/variables/hugo.md
rename to content/en/variables/hugo.md
diff --git a/content/variables/menus.md b/content/en/variables/menus.md
similarity index 100%
rename from content/variables/menus.md
rename to content/en/variables/menus.md
diff --git a/content/variables/page.md b/content/en/variables/page.md
similarity index 99%
rename from content/variables/page.md
rename to content/en/variables/page.md
index f3a50d21d..4e3673559 100644
--- a/content/variables/page.md
+++ b/content/en/variables/page.md
@@ -183,7 +183,7 @@ http://remarkjs.com)
 
 Also see [Sections](/content-management/sections/).
 
-{{< readfile file="/content/readfiles/sectionvars.md" markdown="true" >}}
+{{< readfile file="/content/en/readfiles/sectionvars.md" markdown="true" >}}
 
 ## Page-level Params
 
diff --git a/content/variables/shortcodes.md b/content/en/variables/shortcodes.md
similarity index 100%
rename from content/variables/shortcodes.md
rename to content/en/variables/shortcodes.md
diff --git a/content/variables/site.md b/content/en/variables/site.md
similarity index 100%
rename from content/variables/site.md
rename to content/en/variables/site.md
diff --git a/content/variables/sitemap.md b/content/en/variables/sitemap.md
similarity index 100%
rename from content/variables/sitemap.md
rename to content/en/variables/sitemap.md
diff --git a/content/variables/taxonomy.md b/content/en/variables/taxonomy.md
similarity index 100%
rename from content/variables/taxonomy.md
rename to content/en/variables/taxonomy.md