From 5af8db00865d36174d8e45d951195e816dd16346 Mon Sep 17 00:00:00 2001
From: jvican <jorgevc@fastmail.es>
Date: Mon, 13 Feb 2017 11:03:49 +0100
Subject: [PATCH 1/3] Fix #607: Improve build times drastically
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Per @dragos's suggestion, this commit implements a new approach to
generate table of contents that uses internally populated Jekyll data
structures to speed up listing and matching posts that are from the same
category.

As categories are only populated by posts and our current tutorials are
pages, this commits turns pages into posts and makes sure that their
permalinks correspond to the current ones.

Build times are now around two minutes, see the following profile
information from Jekyll:

```
jvican in /data/rw/code/scala/scala.github.com                                                                                                                 [11:02:40]
> $ bundle exec jekyll serve --profile                                                                                                           [±drone-integration ●●●]
Configuration file: /data/rw/code/scala/scala.github.com/_config.yml
Configuration file: /data/rw/code/scala/scala.github.com/_config.yml
            Source: /data/rw/code/scala/scala.github.com
       Destination: /data/rw/code/scala/scala.github.com/_site
 Incremental build: disabled. Enable with --incremental
      Generating...

Filename                                                           | Count |     Bytes |   Time
-------------------------------------------------------------------+-------+-----------+-------
_layouts/overview-large.html                                       |   164 | 26568.57K | 92.778
_includes/toc-large.txt                                            |   164 | 23156.00K | 88.934
_layouts/tutorial.html                                             |   199 |  3005.98K |  1.350
_layouts/overview.html                                             |    37 |  1190.86K |  0.953
_includes/tutorial-toc.txt                                         |   199 |   267.11K |  0.455
es/overviews/index.md                                              |     1 |    46.66K |  0.443
_includes/localized-overview-index.txt                             |     1 |    46.49K |  0.443
_includes/tutorial-tour-list.txt                                   |   200 |   244.89K |  0.432
_includes/header.txt                                               |   439 |  2114.25K |  0.347
_layouts/cheatsheet.html                                           |     6 |   225.08K |  0.217
_includes/cheatsheet-sidebar.txt                                   |     6 |    42.70K |  0.207
style/index.md                                                     |     1 |    68.00K |  0.184
_includes/footer.txt                                               |   449 |   855.91K |  0.175
tutorials/index.md                                                 |     1 |    54.34K |  0.168
_includes/footerbar.txt                                            |   458 |   767.51K |  0.116
_includes/topbar.txt                                               |   419 |   822.04K |  0.110
_includes/pager.txt                                                |   363 |    27.10K |  0.079
_layouts/sip.html                                                  |    29 |   626.83K |  0.079
_layouts/guides-index.html                                         |     4 |    55.73K |  0.069
_includes/disqus.txt                                               |   386 |   324.89K |  0.044
_layouts/sip-landing.html                                          |    10 |   171.17K |  0.038
_includes/toc.txt                                                  |    66 |    17.62K |  0.034
_layouts/default.html                                              |   261 | 29198.78K |  0.030
_includes/allsids.txt                                              |    10 |    17.88K |  0.019
_layouts/index.html                                                |     7 |   261.62K |  0.011
_includes/sips-topbar.txt                                          |    39 |    31.73K |  0.008
sips/pending/_posts/2016-01-11-static-members.md                   |     1 |    10.23K |  0.004
_includes/index-header.txt                                         |     7 |    53.96K |  0.004
_includes/cheatsheet-header.txt                                    |     6 |    57.92K |  0.003
_layouts/contribute.html                                           |     1 |    21.40K |  0.003
_includes/frontpage-footer.txt                                     |     9 |    15.29K |  0.003
sips/sip-list.md                                                   |     1 |     3.19K |  0.003
sips/completed/_posts/2016-06-25-trailing-commas.md                |     1 |    10.62K |  0.002
_layouts/news-coursera.html                                        |     1 |    26.31K |  0.002
_layouts/frontpage.html                                            |     1 |    13.17K |  0.002
_layouts/page.html                                                 |     1 |    14.69K |  0.002
_layouts/glossary.html                                             |     1 |    65.08K |  0.002
_layouts/search.html                                               |     1 |    12.77K |  0.002
_includes/contributing-header.txt                                  |     2 |    12.13K |  0.001
sips/minutes-list.md                                               |     1 |     0.76K |  0.001
ja/overviews/collections/concrete-mutable-collection-classes.md    |     1 |    13.02K |  0.001
overviews/collections/concrete-mutable-collection-classes.md       |     1 |    11.09K |  0.001
ja/overviews/collections/overview.md                               |     1 |     8.73K |  0.001
_includes/header-coursera.txt                                      |     1 |     5.21K |  0.001
_includes/frontpage-header.txt                                     |     1 |     4.94K |  0.001
es/overviews/parallel-collections/concrete-parallel-collections.md |     1 |    13.97K |  0.001
overviews/parallel-collections/concrete-parallel-collections.md    |     1 |    12.57K |  0.001
sips/sip-template.md                                               |     1 |     4.30K |  0.001
overviews/collections/concrete-immutable-collection-classes.md     |     1 |    14.17K |  0.001
_includes/glossary-header.txt                                      |     1 |    10.10K |  0.001

                    done in 123.422 seconds.
```
---
 _includes/tutorial-tour-list.txt                  | 15 +++++----------
 _layouts/tutorial.html                            |  7 ++++---
 .../2017-02-13-2017-02-13-abstract-types.md}      |  1 +
 .../2017-02-13-annotations.md}                    |  1 +
 .../2017-02-13-anonymous-function-syntax.md}      |  1 +
 .../2017-02-13-automatic-closures.md}             |  1 +
 .../{basics.md => _posts/2017-02-13-basics.md}    |  1 +
 .../2017-02-13-case-classes.md}                   |  1 +
 .../{classes.md => _posts/2017-02-13-classes.md}  |  1 +
 .../2017-02-13-compound-types.md}                 |  1 +
 .../2017-02-13-currying.md}                       |  1 +
 .../2017-02-13-default-parameter-values.md}       |  1 +
 ...017-02-13-explicitly-typed-self-references.md} |  1 +
 .../2017-02-13-extractor-objects.md}              |  1 +
 .../2017-02-13-generic-classes.md}                |  1 +
 .../2017-02-13-higher-order-functions.md}         |  1 +
 .../2017-02-13-implicit-conversions.md}           |  1 +
 .../2017-02-13-implicit-parameters.md}            |  1 +
 .../2017-02-13-inner-classes.md}                  |  1 +
 .../2017-02-13-local-type-inference.md}           |  1 +
 .../2017-02-13-lower-type-bounds.md}              |  1 +
 .../2017-02-13-mixin-class-composition.md}        |  1 +
 .../2017-02-13-named-parameters.md}               |  1 +
 .../2017-02-13-nested-functions.md}               |  1 +
 .../2017-02-13-operators.md}                      |  1 +
 .../2017-02-13-pattern-matching.md}               |  1 +
 .../2017-02-13-polymorphic-methods.md}            |  1 +
 .../2017-02-13-regular-expression-patterns.md}    |  1 +
 .../2017-02-13-sequence-comprehensions.md}        |  1 +
 .../2017-02-13-singleton-objects.md}              |  1 +
 .../2017-02-13-tour-of-scala.md}                  |  1 +
 .../{traits.md => _posts/2017-02-13-traits.md}    |  1 +
 .../2017-02-13-unified-types.md}                  |  1 +
 .../2017-02-13-upper-type-bounds.md}              |  1 +
 .../2017-02-13-variances.md}                      |  0
 .../2017-02-13-xml-processing.md}                 |  1 +
 36 files changed, 42 insertions(+), 13 deletions(-)
 rename tutorials/tour/{abstract-types.md => _posts/2017-02-13-2017-02-13-abstract-types.md} (99%)
 rename tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename tutorials/tour/{basics.md => _posts/2017-02-13-basics.md} (99%)
 rename tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (98%)
 rename tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (98%)
 rename tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename tutorials/tour/{implicit-conversions.md => _posts/2017-02-13-implicit-conversions.md} (99%)
 rename tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (98%)
 rename tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (99%)
 rename tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename tutorials/tour/{singleton-objects.md => _posts/2017-02-13-singleton-objects.md} (99%)
 rename tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (99%)
 rename tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (98%)
 rename tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (100%)
 rename tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (99%)

diff --git a/_includes/tutorial-tour-list.txt b/_includes/tutorial-tour-list.txt
index 0f35588b0b..3c78fd8b16 100644
--- a/_includes/tutorial-tour-list.txt
+++ b/_includes/tutorial-tour-list.txt
@@ -1,20 +1,15 @@
-{% for pg in site.pages %}
-  {% if pg.tutorial == "scala-tour" and pg.outof and pg.language == page.language %}
-    {% assign totalPagesTour = pg.outof %}
-  {% endif %}
-{% endfor %}
+{% assign sorted_tour_posts = site.categories.tour | sort: 'num' %}
+{% assign tour_posts_size = sorted_tour_posts | size %}
 
-{% if totalPagesTour %}
+{% if tour_posts_size %}
   <ul>
-  {% for i in (1..totalPagesTour) %}
-    {% for pg in site.pages %}
-      {% if pg.tutorial == "scala-tour" and pg.num and pg.num == i and pg.language == page.language %}
+    {% for pg in sorted_tour_posts %}
+      {% if pg.language == page.language %}
         <li class="tour-of-scala {% if page.title == pg.title %} current-page {% endif %}">
           <a href="{{ pg.url }}">{{ pg.title }}</a>
         </li>
       {% endif %}
     {% endfor %}
-  {% endfor %}
   </ul>
 {% else %} **ERROR**. Couldn't find the total number of pages in this set of tutorial articles. Have you declared the `outof` tag in your YAML front matter?
 {% endif %}
diff --git a/_layouts/tutorial.html b/_layouts/tutorial.html
index 829cca9071..574ac30e82 100644
--- a/_layouts/tutorial.html
+++ b/_layouts/tutorial.html
@@ -1,5 +1,6 @@
 ---
-layout: default
+layout: post
+permalink: /tutorials/:categories/:title/
 ---
 {% include header.txt %}
 <div class="wrapper">
@@ -10,8 +11,8 @@
 
       <div class="span10">{% if page.title %}<h1>{{ page.title }}</h1>{% else %}<h1>{{ site.title }}</h1>{% endif %}</div>
 
-      {% for pg in site.pages %}
-        {% if pg.tutorial == "scala-tour" and pg.languages %}
+      {% for pg in site.categories.tour %}
+        {% if pg.languages %}
           {% assign languages = pg.languages %}
         {% endif %}
       {% endfor %}
diff --git a/tutorials/tour/abstract-types.md b/tutorials/tour/_posts/2017-02-13-2017-02-13-abstract-types.md
similarity index 99%
rename from tutorials/tour/abstract-types.md
rename to tutorials/tour/_posts/2017-02-13-2017-02-13-abstract-types.md
index a8f8d7ab70..eabd7a3558 100644
--- a/tutorials/tour/abstract-types.md
+++ b/tutorials/tour/_posts/2017-02-13-2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Abstract Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 next-page: compound-types
 previous-page: inner-classes
diff --git a/tutorials/tour/annotations.md b/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from tutorials/tour/annotations.md
rename to tutorials/tour/_posts/2017-02-13-annotations.md
index 84b0269957..0a3132d9fa 100644
--- a/tutorials/tour/annotations.md
+++ b/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Annotations
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 next-page: default-parameter-values
 previous-page: automatic-closures
diff --git a/tutorials/tour/anonymous-function-syntax.md b/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from tutorials/tour/anonymous-function-syntax.md
rename to tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index 34e5cf2907..bd0b26bb1b 100644
--- a/tutorials/tour/anonymous-function-syntax.md
+++ b/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Anonymous Function Syntax
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 next-page: higher-order-functions
 previous-page: mixin-class-composition
diff --git a/tutorials/tour/automatic-closures.md b/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from tutorials/tour/automatic-closures.md
rename to tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 1ff73ada4e..bfc47bce94 100644
--- a/tutorials/tour/automatic-closures.md
+++ b/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Automatic Type-Dependent Closure Construction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 next-page: annotations
 previous-page: operators
diff --git a/tutorials/tour/basics.md b/tutorials/tour/_posts/2017-02-13-basics.md
similarity index 99%
rename from tutorials/tour/basics.md
rename to tutorials/tour/_posts/2017-02-13-basics.md
index 1afe78d1cf..ff47dc3e9c 100644
--- a/tutorials/tour/basics.md
+++ b/tutorials/tour/_posts/2017-02-13-basics.md
@@ -5,6 +5,7 @@ title: Basics
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 next-page: unified-types
 previous-page: tour-of-scala
diff --git a/tutorials/tour/case-classes.md b/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from tutorials/tour/case-classes.md
rename to tutorials/tour/_posts/2017-02-13-case-classes.md
index f2db56cc74..2b1df15082 100644
--- a/tutorials/tour/case-classes.md
+++ b/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Case Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 next-page: pattern-matching
 previous-page: currying
diff --git a/tutorials/tour/classes.md b/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from tutorials/tour/classes.md
rename to tutorials/tour/_posts/2017-02-13-classes.md
index 4cd5c4aaeb..ba6df31033 100644
--- a/tutorials/tour/classes.md
+++ b/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 next-page: traits
 previous-page: unified-types
diff --git a/tutorials/tour/compound-types.md b/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 98%
rename from tutorials/tour/compound-types.md
rename to tutorials/tour/_posts/2017-02-13-compound-types.md
index dd7ddac256..d7b44ce37f 100644
--- a/tutorials/tour/compound-types.md
+++ b/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Compound Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 next-page: explicitly-typed-self-references
 previous-page: abstract-types
diff --git a/tutorials/tour/currying.md b/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from tutorials/tour/currying.md
rename to tutorials/tour/_posts/2017-02-13-currying.md
index ac64eb65c5..7f04699f50 100644
--- a/tutorials/tour/currying.md
+++ b/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 next-page: case-classes
 previous-page: nested-functions
diff --git a/tutorials/tour/default-parameter-values.md b/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from tutorials/tour/default-parameter-values.md
rename to tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index da3d919104..0a882f0527 100644
--- a/tutorials/tour/default-parameter-values.md
+++ b/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Default Parameter Values
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 next-page: named-parameters
 previous-page: annotations
diff --git a/tutorials/tour/explicitly-typed-self-references.md b/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from tutorials/tour/explicitly-typed-self-references.md
rename to tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index 8ed5579b26..fe074ee196 100644
--- a/tutorials/tour/explicitly-typed-self-references.md
+++ b/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Explicitly Typed Self References
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 next-page: implicit-parameters
 previous-page: compound-types
diff --git a/tutorials/tour/extractor-objects.md b/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from tutorials/tour/extractor-objects.md
rename to tutorials/tour/_posts/2017-02-13-extractor-objects.md
index 2ddb001e50..b66efc08eb 100644
--- a/tutorials/tour/extractor-objects.md
+++ b/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Extractor Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 next-page: sequence-comprehensions
 previous-page: regular-expression-patterns
diff --git a/tutorials/tour/generic-classes.md b/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 98%
rename from tutorials/tour/generic-classes.md
rename to tutorials/tour/_posts/2017-02-13-generic-classes.md
index 468d8aa117..b9ceca9a5f 100644
--- a/tutorials/tour/generic-classes.md
+++ b/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Generic Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 next-page: variances
 previous-page: sequence-comprehensions
diff --git a/tutorials/tour/higher-order-functions.md b/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from tutorials/tour/higher-order-functions.md
rename to tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index a042b9625d..74377d07a7 100644
--- a/tutorials/tour/higher-order-functions.md
+++ b/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Higher-order Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 next-page: nested-functions
 previous-page: anonymous-function-syntax
diff --git a/tutorials/tour/implicit-conversions.md b/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
similarity index 99%
rename from tutorials/tour/implicit-conversions.md
rename to tutorials/tour/_posts/2017-02-13-implicit-conversions.md
index e12f7507f1..87dfa4a132 100644
--- a/tutorials/tour/implicit-conversions.md
+++ b/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Implicit Conversions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 next-page: polymorphic-methods
 previous-page: implicit-parameters
diff --git a/tutorials/tour/implicit-parameters.md b/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from tutorials/tour/implicit-parameters.md
rename to tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index 0319b475a1..40e72ab3ac 100644
--- a/tutorials/tour/implicit-parameters.md
+++ b/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Implicit Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 next-page: implicit-conversions
 previous-page: explicitly-typed-self-references
diff --git a/tutorials/tour/inner-classes.md b/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from tutorials/tour/inner-classes.md
rename to tutorials/tour/_posts/2017-02-13-inner-classes.md
index cf7bb31900..618a91e3f4 100644
--- a/tutorials/tour/inner-classes.md
+++ b/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Inner Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 next-page: abstract-types
 previous-page: lower-type-bounds
diff --git a/tutorials/tour/local-type-inference.md b/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from tutorials/tour/local-type-inference.md
rename to tutorials/tour/_posts/2017-02-13-local-type-inference.md
index 3e3a14a43b..b8096a5f2f 100644
--- a/tutorials/tour/local-type-inference.md
+++ b/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Local Type Inference
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 next-page: operators
 previous-page: polymorphic-methods
diff --git a/tutorials/tour/lower-type-bounds.md b/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from tutorials/tour/lower-type-bounds.md
rename to tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index 58ce21e5ef..4cfe283938 100644
--- a/tutorials/tour/lower-type-bounds.md
+++ b/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Lower Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 next-page: inner-classes
 previous-page: upper-type-bounds
diff --git a/tutorials/tour/mixin-class-composition.md b/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from tutorials/tour/mixin-class-composition.md
rename to tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index c6a482e4be..6fd5dd2cbc 100644
--- a/tutorials/tour/mixin-class-composition.md
+++ b/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Mixin Class Composition
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 next-page: anonymous-function-syntax
 previous-page: traits
diff --git a/tutorials/tour/named-parameters.md b/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from tutorials/tour/named-parameters.md
rename to tutorials/tour/_posts/2017-02-13-named-parameters.md
index e4b6c78872..058d75599f 100644
--- a/tutorials/tour/named-parameters.md
+++ b/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Named Parameters
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 34
 previous-page: default-parameter-values
 ---
diff --git a/tutorials/tour/nested-functions.md b/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from tutorials/tour/nested-functions.md
rename to tutorials/tour/_posts/2017-02-13-nested-functions.md
index 075db24f46..cb9ac90321 100644
--- a/tutorials/tour/nested-functions.md
+++ b/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Nested Functions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 next-page: currying
 previous-page: higher-order-functions
diff --git a/tutorials/tour/operators.md b/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from tutorials/tour/operators.md
rename to tutorials/tour/_posts/2017-02-13-operators.md
index 8bab378aef..1c29573c49 100644
--- a/tutorials/tour/operators.md
+++ b/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operators
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 next-page: automatic-closures
 previous-page: local-type-inference
diff --git a/tutorials/tour/pattern-matching.md b/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 98%
rename from tutorials/tour/pattern-matching.md
rename to tutorials/tour/_posts/2017-02-13-pattern-matching.md
index c52647f634..9eea0e31e5 100644
--- a/tutorials/tour/pattern-matching.md
+++ b/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Pattern Matching
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 next-page: singleton-objects
diff --git a/tutorials/tour/polymorphic-methods.md b/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from tutorials/tour/polymorphic-methods.md
rename to tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index 2faa3146f6..b6117a4069 100644
--- a/tutorials/tour/polymorphic-methods.md
+++ b/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Polymorphic Methods
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 
 next-page: local-type-inference
diff --git a/tutorials/tour/regular-expression-patterns.md b/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 99%
rename from tutorials/tour/regular-expression-patterns.md
rename to tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index 46a9c7b596..735a1d76a6 100644
--- a/tutorials/tour/regular-expression-patterns.md
+++ b/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Regular Expression Patterns
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 
 next-page: extractor-objects
diff --git a/tutorials/tour/sequence-comprehensions.md b/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from tutorials/tour/sequence-comprehensions.md
rename to tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index 621fb60978..c410c53f9d 100644
--- a/tutorials/tour/sequence-comprehensions.md
+++ b/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Sequence Comprehensions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 next-page: generic-classes
 previous-page: extractor-objects
diff --git a/tutorials/tour/singleton-objects.md b/tutorials/tour/_posts/2017-02-13-singleton-objects.md
similarity index 99%
rename from tutorials/tour/singleton-objects.md
rename to tutorials/tour/_posts/2017-02-13-singleton-objects.md
index ad739f7132..96b7c40017 100644
--- a/tutorials/tour/singleton-objects.md
+++ b/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Singleton Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 
 next-page: xml-processing
diff --git a/tutorials/tour/tour-of-scala.md b/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from tutorials/tour/tour-of-scala.md
rename to tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index 88876ccff6..bfc486b12d 100644
--- a/tutorials/tour/tour-of-scala.md
+++ b/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Introduction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 languages: [ba, es, ko, pt-br, pl]
 outof: 34
diff --git a/tutorials/tour/traits.md b/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 99%
rename from tutorials/tour/traits.md
rename to tutorials/tour/_posts/2017-02-13-traits.md
index eb76b84320..0bc24f8dda 100644
--- a/tutorials/tour/traits.md
+++ b/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Traits
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 next-page: mixin-class-composition
 previous-page: classes
diff --git a/tutorials/tour/unified-types.md b/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 98%
rename from tutorials/tour/unified-types.md
rename to tutorials/tour/_posts/2017-02-13-unified-types.md
index 9e4db09738..fc016eee6f 100644
--- a/tutorials/tour/unified-types.md
+++ b/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Unified Types
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 next-page: classes
 previous-page: basics
diff --git a/tutorials/tour/upper-type-bounds.md b/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from tutorials/tour/upper-type-bounds.md
rename to tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index 6bbfb0ae3b..05100f5b56 100644
--- a/tutorials/tour/upper-type-bounds.md
+++ b/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Upper Type Bounds
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 next-page: lower-type-bounds
 previous-page: variances
diff --git a/tutorials/tour/variances.md b/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 100%
rename from tutorials/tour/variances.md
rename to tutorials/tour/_posts/2017-02-13-variances.md
diff --git a/tutorials/tour/xml-processing.md b/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 99%
rename from tutorials/tour/xml-processing.md
rename to tutorials/tour/_posts/2017-02-13-xml-processing.md
index c77bf44800..e81fd5c433 100644
--- a/tutorials/tour/xml-processing.md
+++ b/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: XML Processing
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 next-page: regular-expression-patterns
 previous-page: singleton-objects

From e1682f8158eb6558273d6e067840b2d8963300d0 Mon Sep 17 00:00:00 2001
From: jvican <jorgevc@fastmail.es>
Date: Mon, 13 Feb 2017 12:25:38 +0100
Subject: [PATCH 2/3] Convert translated pages into posts with category

---
 .../{abstract-types.md => _posts/2017-02-13-abstract-types.md}   | 1 +
 .../tour/{annotations.md => _posts/2017-02-13-annotations.md}    | 1 +
 .../2017-02-13-anonymous-function-syntax.md}                     | 1 +
 .../2017-02-13-automatic-closures.md}                            | 1 +
 .../tour/{case-classes.md => _posts/2017-02-13-case-classes.md}  | 1 +
 ba/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md}   | 1 +
 .../{compound-types.md => _posts/2017-02-13-compound-types.md}   | 1 +
 ba/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} | 1 +
 .../2017-02-13-default-parameter-values.md}                      | 1 +
 .../2017-02-13-explicitly-typed-self-references.md}              | 1 +
 .../2017-02-13-extractor-objects.md}                             | 1 +
 .../{generic-classes.md => _posts/2017-02-13-generic-classes.md} | 1 +
 .../2017-02-13-higher-order-functions.md}                        | 1 +
 .../2017-02-13-implicit-conversions.md}                          | 1 +
 .../2017-02-13-implicit-parameters.md}                           | 1 +
 .../{inner-classes.md => _posts/2017-02-13-inner-classes.md}     | 1 +
 .../2017-02-13-local-type-inference.md}                          | 1 +
 .../2017-02-13-lower-type-bounds.md}                             | 1 +
 .../2017-02-13-mixin-class-composition.md}                       | 1 +
 .../2017-02-13-named-parameters.md}                              | 1 +
 .../2017-02-13-nested-functions.md}                              | 1 +
 .../tour/{operators.md => _posts/2017-02-13-operators.md}        | 1 +
 .../2017-02-13-pattern-matching.md}                              | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../2017-02-13-regular-expression-patterns.md}                   | 1 +
 .../2017-02-13-sequence-comprehensions.md}                       | 1 +
 .../2017-02-13-singleton-objects.md}                             | 1 +
 .../{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md}     | 1 +
 ba/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md}     | 1 +
 .../{unified-types.md => _posts/2017-02-13-unified-types.md}     | 1 +
 .../2017-02-13-upper-type-bounds.md}                             | 1 +
 .../tour/{variances.md => _posts/2017-02-13-variances.md}        | 1 +
 .../{xml-processing.md => _posts/2017-02-13-xml-processing.md}   | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../{abstract-types.md => _posts/2017-02-13-abstract-types.md}   | 1 +
 .../tour/{annotations.md => _posts/2017-02-13-annotations.md}    | 1 +
 .../2017-02-13-anonymous-function-syntax.md}                     | 1 +
 .../2017-02-13-automatic-closures.md}                            | 1 +
 .../tour/{case-classes.md => _posts/2017-02-13-case-classes.md}  | 1 +
 es/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md}   | 1 +
 .../{compound-types.md => _posts/2017-02-13-compound-types.md}   | 1 +
 es/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} | 1 +
 .../2017-02-13-default-parameter-values.md}                      | 1 +
 .../2017-02-13-explicitly-typed-self-references.md}              | 1 +
 .../2017-02-13-extractor-objects.md}                             | 1 +
 .../{generic-classes.md => _posts/2017-02-13-generic-classes.md} | 1 +
 .../2017-02-13-higher-order-functions.md}                        | 1 +
 .../2017-02-13-implicit-conversions.md}                          | 1 +
 .../2017-02-13-implicit-parameters.md}                           | 1 +
 .../{inner-classes.md => _posts/2017-02-13-inner-classes.md}     | 1 +
 .../2017-02-13-local-type-inference.md}                          | 1 +
 .../2017-02-13-lower-type-bounds.md}                             | 1 +
 .../2017-02-13-mixin-class-composition.md}                       | 1 +
 .../2017-02-13-named-parameters.md}                              | 1 +
 .../2017-02-13-nested-functions.md}                              | 1 +
 .../tour/{operators.md => _posts/2017-02-13-operators.md}        | 1 +
 .../2017-02-13-pattern-matching.md}                              | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../2017-02-13-regular-expression-patterns.md}                   | 1 +
 .../2017-02-13-sequence-comprehensions.md}                       | 1 +
 .../2017-02-13-singleton-objects.md}                             | 1 +
 .../{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md}     | 1 +
 es/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md}     | 1 +
 .../{unified-types.md => _posts/2017-02-13-unified-types.md}     | 1 +
 .../2017-02-13-upper-type-bounds.md}                             | 1 +
 .../tour/{variances.md => _posts/2017-02-13-variances.md}        | 1 +
 .../{xml-processing.md => _posts/2017-02-13-xml-processing.md}   | 1 +
 .../{abstract-types.md => _posts/2017-02-13-abstract-types.md}   | 1 +
 .../tour/{annotations.md => _posts/2017-02-13-annotations.md}    | 1 +
 .../2017-02-13-anonymous-function-syntax.md}                     | 1 +
 .../2017-02-13-automatic-closures.md}                            | 1 +
 .../tour/{case-classes.md => _posts/2017-02-13-case-classes.md}  | 1 +
 ko/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md}   | 1 +
 .../{compound-types.md => _posts/2017-02-13-compound-types.md}   | 1 +
 ko/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} | 1 +
 .../2017-02-13-default-parameter-values.md}                      | 1 +
 .../2017-02-13-explicitly-typed-self-references.md}              | 1 +
 .../2017-02-13-extractor-objects.md}                             | 1 +
 .../{generic-classes.md => _posts/2017-02-13-generic-classes.md} | 1 +
 .../2017-02-13-higher-order-functions.md}                        | 1 +
 .../2017-02-13-implicit-parameters.md}                           | 1 +
 .../{inner-classes.md => _posts/2017-02-13-inner-classes.md}     | 1 +
 .../2017-02-13-local-type-inference.md}                          | 1 +
 .../2017-02-13-lower-type-bounds.md}                             | 1 +
 .../2017-02-13-mixin-class-composition.md}                       | 1 +
 .../2017-02-13-named-parameters.md}                              | 1 +
 .../2017-02-13-nested-functions.md}                              | 1 +
 .../tour/{operators.md => _posts/2017-02-13-operators.md}        | 1 +
 .../2017-02-13-pattern-matching.md}                              | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../2017-02-13-regular-expression-patterns.md}                   | 1 +
 .../2017-02-13-sequence-comprehensions.md}                       | 1 +
 .../{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md}     | 1 +
 ko/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md}     | 1 +
 .../{unified-types.md => _posts/2017-02-13-unified-types.md}     | 1 +
 .../2017-02-13-upper-type-bounds.md}                             | 1 +
 .../tour/{variances.md => _posts/2017-02-13-variances.md}        | 1 +
 ko/tutorials/tour/{views.md => _posts/2017-02-13-views.md}       | 1 +
 .../{xml-processing.md => _posts/2017-02-13-xml-processing.md}   | 1 +
 .../{abstract-types.md => _posts/2017-02-13-abstract-types.md}   | 1 +
 .../tour/{annotations.md => _posts/2017-02-13-annotations.md}    | 1 +
 .../2017-02-13-anonymous-function-syntax.md}                     | 1 +
 .../2017-02-13-automatic-closures.md}                            | 1 +
 .../tour/{case-classes.md => _posts/2017-02-13-case-classes.md}  | 1 +
 pl/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md}   | 1 +
 .../{compound-types.md => _posts/2017-02-13-compound-types.md}   | 1 +
 pl/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} | 1 +
 .../2017-02-13-default-parameter-values.md}                      | 1 +
 .../2017-02-13-explicitly-typed-self-references.md}              | 1 +
 .../2017-02-13-extractor-objects.md}                             | 1 +
 .../{generic-classes.md => _posts/2017-02-13-generic-classes.md} | 1 +
 .../2017-02-13-higher-order-functions.md}                        | 1 +
 .../2017-02-13-implicit-conversions.md}                          | 1 +
 .../2017-02-13-implicit-parameters.md}                           | 1 +
 .../{inner-classes.md => _posts/2017-02-13-inner-classes.md}     | 1 +
 .../2017-02-13-local-type-inference.md}                          | 1 +
 .../2017-02-13-lower-type-bounds.md}                             | 1 +
 .../2017-02-13-mixin-class-composition.md}                       | 1 +
 .../2017-02-13-named-parameters.md}                              | 1 +
 .../2017-02-13-nested-functions.md}                              | 1 +
 .../tour/{operators.md => _posts/2017-02-13-operators.md}        | 1 +
 .../2017-02-13-pattern-matching.md}                              | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../2017-02-13-regular-expression-patterns.md}                   | 1 +
 .../2017-02-13-sequence-comprehensions.md}                       | 1 +
 .../2017-02-13-singleton-objects.md}                             | 1 +
 .../{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md}     | 1 +
 pl/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md}     | 1 +
 .../{unified-types.md => _posts/2017-02-13-unified-types.md}     | 1 +
 .../2017-02-13-upper-type-bounds.md}                             | 1 +
 .../tour/{variances.md => _posts/2017-02-13-variances.md}        | 1 +
 .../{xml-processing.md => _posts/2017-02-13-xml-processing.md}   | 1 +
 .../{abstract-types.md => _posts/2017-02-13-abstract-types.md}   | 1 +
 .../tour/{annotations.md => _posts/2017-02-13-annotations.md}    | 1 +
 .../2017-02-13-anonymous-function-syntax.md}                     | 1 +
 .../2017-02-13-automatic-closures.md}                            | 1 +
 .../tour/{case-classes.md => _posts/2017-02-13-case-classes.md}  | 1 +
 .../tutorials/tour/{classes.md => _posts/2017-02-13-classes.md}  | 1 +
 .../{compound-types.md => _posts/2017-02-13-compound-types.md}   | 1 +
 .../tour/{currying.md => _posts/2017-02-13-currying.md}          | 1 +
 .../2017-02-13-default-parameter-values.md}                      | 1 +
 .../2017-02-13-explicitly-typed-self-references.md}              | 1 +
 .../2017-02-13-extractor-objects.md}                             | 1 +
 .../{generic-classes.md => _posts/2017-02-13-generic-classes.md} | 1 +
 .../2017-02-13-higher-order-functions.md}                        | 1 +
 .../2017-02-13-implicit-conversions.md}                          | 1 +
 .../2017-02-13-implicit-parameters.md}                           | 1 +
 .../{inner-classes.md => _posts/2017-02-13-inner-classes.md}     | 1 +
 .../2017-02-13-local-type-inference.md}                          | 1 +
 .../2017-02-13-lower-type-bounds.md}                             | 1 +
 .../2017-02-13-mixin-class-composition.md}                       | 1 +
 .../2017-02-13-named-parameters.md}                              | 1 +
 .../2017-02-13-nested-functions.md}                              | 1 +
 .../tour/{operators.md => _posts/2017-02-13-operators.md}        | 1 +
 .../2017-02-13-pattern-matching.md}                              | 1 +
 .../2017-02-13-polymorphic-methods.md}                           | 1 +
 .../2017-02-13-regular-expression-patterns.md}                   | 1 +
 .../2017-02-13-sequence-comprehensions.md}                       | 1 +
 .../2017-02-13-singleton-objects.md}                             | 1 +
 .../{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md}     | 1 +
 pt-br/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md}  | 1 +
 .../{unified-types.md => _posts/2017-02-13-unified-types.md}     | 1 +
 .../2017-02-13-upper-type-bounds.md}                             | 1 +
 .../tour/{variances.md => _posts/2017-02-13-variances.md}        | 1 +
 .../{xml-processing.md => _posts/2017-02-13-xml-processing.md}   | 1 +
 165 files changed, 165 insertions(+)
 rename ba/tutorials/tour/{abstract-types.md => _posts/2017-02-13-abstract-types.md} (99%)
 rename ba/tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename ba/tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename ba/tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename ba/tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename ba/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename ba/tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (98%)
 rename ba/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename ba/tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename ba/tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename ba/tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename ba/tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (98%)
 rename ba/tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename ba/tutorials/tour/{implicit-conversions.md => _posts/2017-02-13-implicit-conversions.md} (99%)
 rename ba/tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename ba/tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename ba/tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename ba/tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename ba/tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename ba/tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename ba/tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename ba/tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename ba/tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (98%)
 rename ba/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename ba/tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (99%)
 rename ba/tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename ba/tutorials/tour/{singleton-objects.md => _posts/2017-02-13-singleton-objects.md} (99%)
 rename ba/tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename ba/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (98%)
 rename ba/tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (99%)
 rename ba/tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename ba/tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (99%)
 rename ba/tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (99%)
 rename de/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename es/tutorials/tour/{abstract-types.md => _posts/2017-02-13-abstract-types.md} (99%)
 rename es/tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename es/tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename es/tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename es/tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename es/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename es/tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (99%)
 rename es/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename es/tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename es/tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename es/tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename es/tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (99%)
 rename es/tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename es/tutorials/tour/{implicit-conversions.md => _posts/2017-02-13-implicit-conversions.md} (90%)
 rename es/tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename es/tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename es/tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename es/tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename es/tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename es/tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename es/tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename es/tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename es/tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (99%)
 rename es/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename es/tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (99%)
 rename es/tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename es/tutorials/tour/{singleton-objects.md => _posts/2017-02-13-singleton-objects.md} (99%)
 rename es/tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename es/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (99%)
 rename es/tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (99%)
 rename es/tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename es/tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (99%)
 rename es/tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (99%)
 rename ko/tutorials/tour/{abstract-types.md => _posts/2017-02-13-abstract-types.md} (99%)
 rename ko/tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename ko/tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename ko/tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename ko/tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename ko/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename ko/tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (99%)
 rename ko/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename ko/tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename ko/tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename ko/tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename ko/tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (99%)
 rename ko/tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename ko/tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename ko/tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename ko/tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename ko/tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename ko/tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename ko/tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename ko/tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename ko/tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename ko/tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (99%)
 rename ko/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename ko/tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (99%)
 rename ko/tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename ko/tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename ko/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (99%)
 rename ko/tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (99%)
 rename ko/tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename ko/tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (99%)
 rename ko/tutorials/tour/{views.md => _posts/2017-02-13-views.md} (99%)
 rename ko/tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (99%)
 rename pl/tutorials/tour/{abstract-types.md => _posts/2017-02-13-abstract-types.md} (99%)
 rename pl/tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename pl/tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename pl/tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename pl/tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename pl/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename pl/tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (99%)
 rename pl/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename pl/tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename pl/tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename pl/tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename pl/tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (98%)
 rename pl/tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename pl/tutorials/tour/{implicit-conversions.md => _posts/2017-02-13-implicit-conversions.md} (99%)
 rename pl/tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename pl/tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename pl/tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename pl/tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename pl/tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename pl/tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename pl/tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename pl/tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename pl/tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (99%)
 rename pl/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename pl/tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (98%)
 rename pl/tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename pl/tutorials/tour/{singleton-objects.md => _posts/2017-02-13-singleton-objects.md} (99%)
 rename pl/tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename pl/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (99%)
 rename pl/tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (99%)
 rename pl/tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename pl/tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (99%)
 rename pl/tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (98%)
 rename pt-br/tutorials/tour/{abstract-types.md => _posts/2017-02-13-abstract-types.md} (99%)
 rename pt-br/tutorials/tour/{annotations.md => _posts/2017-02-13-annotations.md} (99%)
 rename pt-br/tutorials/tour/{anonymous-function-syntax.md => _posts/2017-02-13-anonymous-function-syntax.md} (98%)
 rename pt-br/tutorials/tour/{automatic-closures.md => _posts/2017-02-13-automatic-closures.md} (99%)
 rename pt-br/tutorials/tour/{case-classes.md => _posts/2017-02-13-case-classes.md} (99%)
 rename pt-br/tutorials/tour/{classes.md => _posts/2017-02-13-classes.md} (99%)
 rename pt-br/tutorials/tour/{compound-types.md => _posts/2017-02-13-compound-types.md} (99%)
 rename pt-br/tutorials/tour/{currying.md => _posts/2017-02-13-currying.md} (98%)
 rename pt-br/tutorials/tour/{default-parameter-values.md => _posts/2017-02-13-default-parameter-values.md} (99%)
 rename pt-br/tutorials/tour/{explicitly-typed-self-references.md => _posts/2017-02-13-explicitly-typed-self-references.md} (99%)
 rename pt-br/tutorials/tour/{extractor-objects.md => _posts/2017-02-13-extractor-objects.md} (99%)
 rename pt-br/tutorials/tour/{generic-classes.md => _posts/2017-02-13-generic-classes.md} (99%)
 rename pt-br/tutorials/tour/{higher-order-functions.md => _posts/2017-02-13-higher-order-functions.md} (98%)
 rename pt-br/tutorials/tour/{implicit-conversions.md => _posts/2017-02-13-implicit-conversions.md} (99%)
 rename pt-br/tutorials/tour/{implicit-parameters.md => _posts/2017-02-13-implicit-parameters.md} (99%)
 rename pt-br/tutorials/tour/{inner-classes.md => _posts/2017-02-13-inner-classes.md} (99%)
 rename pt-br/tutorials/tour/{local-type-inference.md => _posts/2017-02-13-local-type-inference.md} (99%)
 rename pt-br/tutorials/tour/{lower-type-bounds.md => _posts/2017-02-13-lower-type-bounds.md} (99%)
 rename pt-br/tutorials/tour/{mixin-class-composition.md => _posts/2017-02-13-mixin-class-composition.md} (99%)
 rename pt-br/tutorials/tour/{named-parameters.md => _posts/2017-02-13-named-parameters.md} (98%)
 rename pt-br/tutorials/tour/{nested-functions.md => _posts/2017-02-13-nested-functions.md} (98%)
 rename pt-br/tutorials/tour/{operators.md => _posts/2017-02-13-operators.md} (98%)
 rename pt-br/tutorials/tour/{pattern-matching.md => _posts/2017-02-13-pattern-matching.md} (99%)
 rename pt-br/tutorials/tour/{polymorphic-methods.md => _posts/2017-02-13-polymorphic-methods.md} (98%)
 rename pt-br/tutorials/tour/{regular-expression-patterns.md => _posts/2017-02-13-regular-expression-patterns.md} (99%)
 rename pt-br/tutorials/tour/{sequence-comprehensions.md => _posts/2017-02-13-sequence-comprehensions.md} (99%)
 rename pt-br/tutorials/tour/{singleton-objects.md => _posts/2017-02-13-singleton-objects.md} (99%)
 rename pt-br/tutorials/tour/{tour-of-scala.md => _posts/2017-02-13-tour-of-scala.md} (99%)
 rename pt-br/tutorials/tour/{traits.md => _posts/2017-02-13-traits.md} (99%)
 rename pt-br/tutorials/tour/{unified-types.md => _posts/2017-02-13-unified-types.md} (99%)
 rename pt-br/tutorials/tour/{upper-type-bounds.md => _posts/2017-02-13-upper-type-bounds.md} (98%)
 rename pt-br/tutorials/tour/{variances.md => _posts/2017-02-13-variances.md} (99%)
 rename pt-br/tutorials/tour/{xml-processing.md => _posts/2017-02-13-xml-processing.md} (99%)

diff --git a/ba/tutorials/tour/abstract-types.md b/ba/tutorials/tour/_posts/2017-02-13-abstract-types.md
similarity index 99%
rename from ba/tutorials/tour/abstract-types.md
rename to ba/tutorials/tour/_posts/2017-02-13-abstract-types.md
index b9a2bb5d26..2e02a63ea5 100644
--- a/ba/tutorials/tour/abstract-types.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Apstraktni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/annotations.md b/ba/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from ba/tutorials/tour/annotations.md
rename to ba/tutorials/tour/_posts/2017-02-13-annotations.md
index fa6a36f0f4..ac3ecd2771 100644
--- a/ba/tutorials/tour/annotations.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Anotacije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/anonymous-function-syntax.md b/ba/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from ba/tutorials/tour/anonymous-function-syntax.md
rename to ba/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index acebc70989..be31eb8cd8 100644
--- a/ba/tutorials/tour/anonymous-function-syntax.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Sintaksa anonimnih funkcija
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/automatic-closures.md b/ba/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from ba/tutorials/tour/automatic-closures.md
rename to ba/tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 92276db0cc..a70d8a51b5 100644
--- a/ba/tutorials/tour/automatic-closures.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Automatska konstrukcija tipno zavisnih closura (zatvarajućih funkcija)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/case-classes.md b/ba/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from ba/tutorials/tour/case-classes.md
rename to ba/tutorials/tour/_posts/2017-02-13-case-classes.md
index 790c39a502..69b5acb126 100644
--- a/ba/tutorials/tour/case-classes.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Case klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/classes.md b/ba/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from ba/tutorials/tour/classes.md
rename to ba/tutorials/tour/_posts/2017-02-13-classes.md
index df45eebe4e..4e4e27aa63 100644
--- a/ba/tutorials/tour/classes.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/compound-types.md b/ba/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 98%
rename from ba/tutorials/tour/compound-types.md
rename to ba/tutorials/tour/_posts/2017-02-13-compound-types.md
index 1ce8d8365e..df41b94c04 100644
--- a/ba/tutorials/tour/compound-types.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Složeni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/currying.md b/ba/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from ba/tutorials/tour/currying.md
rename to ba/tutorials/tour/_posts/2017-02-13-currying.md
index afd2c48d08..dbdd529ebc 100644
--- a/ba/tutorials/tour/currying.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Curry-jevanje
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/default-parameter-values.md b/ba/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from ba/tutorials/tour/default-parameter-values.md
rename to ba/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index 13d13ead6e..1ca16bc200 100644
--- a/ba/tutorials/tour/default-parameter-values.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Podrazumijevane vrijednosti parametara
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/explicitly-typed-self-references.md b/ba/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from ba/tutorials/tour/explicitly-typed-self-references.md
rename to ba/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index b99c49d4e7..4917fdb939 100644
--- a/ba/tutorials/tour/explicitly-typed-self-references.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Eksplicitno tipizirane samo-reference
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/extractor-objects.md b/ba/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from ba/tutorials/tour/extractor-objects.md
rename to ba/tutorials/tour/_posts/2017-02-13-extractor-objects.md
index 8652f0185c..a6a5c93ee6 100644
--- a/ba/tutorials/tour/extractor-objects.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Ekstraktor objekti
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/generic-classes.md b/ba/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 98%
rename from ba/tutorials/tour/generic-classes.md
rename to ba/tutorials/tour/_posts/2017-02-13-generic-classes.md
index 72d818706b..2e9beb0fd9 100644
--- a/ba/tutorials/tour/generic-classes.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Generičke klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/higher-order-functions.md b/ba/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from ba/tutorials/tour/higher-order-functions.md
rename to ba/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index 6d08423d9c..0b60f239fe 100644
--- a/ba/tutorials/tour/higher-order-functions.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Funkcije višeg reda
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/implicit-conversions.md b/ba/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
similarity index 99%
rename from ba/tutorials/tour/implicit-conversions.md
rename to ba/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
index 3088f52f63..eacc3b0741 100644
--- a/ba/tutorials/tour/implicit-conversions.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Implicitne konverzije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/implicit-parameters.md b/ba/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from ba/tutorials/tour/implicit-parameters.md
rename to ba/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index e50d99a411..0adadb9b6c 100644
--- a/ba/tutorials/tour/implicit-parameters.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Implicitni parametri
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/inner-classes.md b/ba/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from ba/tutorials/tour/inner-classes.md
rename to ba/tutorials/tour/_posts/2017-02-13-inner-classes.md
index 97ef8d47e1..8685fd3a58 100644
--- a/ba/tutorials/tour/inner-classes.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Unutarnje klase
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/local-type-inference.md b/ba/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from ba/tutorials/tour/local-type-inference.md
rename to ba/tutorials/tour/_posts/2017-02-13-local-type-inference.md
index 95d726835f..6f3c206d91 100644
--- a/ba/tutorials/tour/local-type-inference.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Lokalno zaključivanje tipova (type inference)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/lower-type-bounds.md b/ba/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from ba/tutorials/tour/lower-type-bounds.md
rename to ba/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index e3c3ddf7fe..0675711998 100644
--- a/ba/tutorials/tour/lower-type-bounds.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Donja granica tipa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/mixin-class-composition.md b/ba/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from ba/tutorials/tour/mixin-class-composition.md
rename to ba/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index 3083319d8e..0d4a7fac0c 100644
--- a/ba/tutorials/tour/mixin-class-composition.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Kompozicija mixin klasa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/named-parameters.md b/ba/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from ba/tutorials/tour/named-parameters.md
rename to ba/tutorials/tour/_posts/2017-02-13-named-parameters.md
index 2b0468b213..b2a30c624f 100644
--- a/ba/tutorials/tour/named-parameters.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Imenovani parametri
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/nested-functions.md b/ba/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from ba/tutorials/tour/nested-functions.md
rename to ba/tutorials/tour/_posts/2017-02-13-nested-functions.md
index 63bf82d738..a21952a989 100644
--- a/ba/tutorials/tour/nested-functions.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Ugniježdene funkcije
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/operators.md b/ba/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from ba/tutorials/tour/operators.md
rename to ba/tutorials/tour/_posts/2017-02-13-operators.md
index 9be63a3aec..08337055ed 100644
--- a/ba/tutorials/tour/operators.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operatori
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/pattern-matching.md b/ba/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 98%
rename from ba/tutorials/tour/pattern-matching.md
rename to ba/tutorials/tour/_posts/2017-02-13-pattern-matching.md
index 6d66bce1b4..fd79a01632 100644
--- a/ba/tutorials/tour/pattern-matching.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Podudaranje uzoraka (pattern matching)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 
 outof: 33
diff --git a/ba/tutorials/tour/polymorphic-methods.md b/ba/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from ba/tutorials/tour/polymorphic-methods.md
rename to ba/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index adf4f90b21..b61973d7b7 100644
--- a/ba/tutorials/tour/polymorphic-methods.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Polimorfne metode
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 
 outof: 33
diff --git a/ba/tutorials/tour/regular-expression-patterns.md b/ba/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 99%
rename from ba/tutorials/tour/regular-expression-patterns.md
rename to ba/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index bf6d2f57dd..1e62ad1f39 100644
--- a/ba/tutorials/tour/regular-expression-patterns.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Regularni izrazi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 
 outof: 33
diff --git a/ba/tutorials/tour/sequence-comprehensions.md b/ba/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from ba/tutorials/tour/sequence-comprehensions.md
rename to ba/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index eef20855e3..e0e97cab14 100644
--- a/ba/tutorials/tour/sequence-comprehensions.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Komprehensije sekvenci
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/singleton-objects.md b/ba/tutorials/tour/_posts/2017-02-13-singleton-objects.md
similarity index 99%
rename from ba/tutorials/tour/singleton-objects.md
rename to ba/tutorials/tour/_posts/2017-02-13-singleton-objects.md
index 0fc37ad381..f8d86cdbee 100644
--- a/ba/tutorials/tour/singleton-objects.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Singlton objekti
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 outof: 33
diff --git a/ba/tutorials/tour/tour-of-scala.md b/ba/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from ba/tutorials/tour/tour-of-scala.md
rename to ba/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index 839fccb1bf..87e0d9d37d 100644
--- a/ba/tutorials/tour/tour-of-scala.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Uvod
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/traits.md b/ba/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 98%
rename from ba/tutorials/tour/traits.md
rename to ba/tutorials/tour/_posts/2017-02-13-traits.md
index 36126b3262..040b250b3d 100644
--- a/ba/tutorials/tour/traits.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Trejtovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/unified-types.md b/ba/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 99%
rename from ba/tutorials/tour/unified-types.md
rename to ba/tutorials/tour/_posts/2017-02-13-unified-types.md
index a45b9704fc..2118935e6d 100644
--- a/ba/tutorials/tour/unified-types.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Sjedinjeni tipovi
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/upper-type-bounds.md b/ba/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from ba/tutorials/tour/upper-type-bounds.md
rename to ba/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index c740fb49e7..e95ceaaebd 100644
--- a/ba/tutorials/tour/upper-type-bounds.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Gornja granica tipa
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 19
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/variances.md b/ba/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 99%
rename from ba/tutorials/tour/variances.md
rename to ba/tutorials/tour/_posts/2017-02-13-variances.md
index b94ba0f131..01ff42670e 100644
--- a/ba/tutorials/tour/variances.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-variances.md
@@ -5,6 +5,7 @@ title: Varijanse
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 outof: 33
 language: ba
diff --git a/ba/tutorials/tour/xml-processing.md b/ba/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 99%
rename from ba/tutorials/tour/xml-processing.md
rename to ba/tutorials/tour/_posts/2017-02-13-xml-processing.md
index 1d48c3d863..dde6baddb1 100644
--- a/ba/tutorials/tour/xml-processing.md
+++ b/ba/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: Procesiranje XML-a
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 outof: 33
 language: ba
diff --git a/de/tutorials/tour/polymorphic-methods.md b/de/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from de/tutorials/tour/polymorphic-methods.md
rename to de/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index b9f2c871fe..785c21beed 100644
--- a/de/tutorials/tour/polymorphic-methods.md
+++ b/de/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Polymorphe Methoden
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 language: de
 ---
diff --git a/es/tutorials/tour/abstract-types.md b/es/tutorials/tour/_posts/2017-02-13-abstract-types.md
similarity index 99%
rename from es/tutorials/tour/abstract-types.md
rename to es/tutorials/tour/_posts/2017-02-13-abstract-types.md
index 27d2691075..a43a053457 100644
--- a/es/tutorials/tour/abstract-types.md
+++ b/es/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Tipos Abstractos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 outof: 33
 language: es
diff --git a/es/tutorials/tour/annotations.md b/es/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from es/tutorials/tour/annotations.md
rename to es/tutorials/tour/_posts/2017-02-13-annotations.md
index d664c4fe7e..e03342f2a2 100644
--- a/es/tutorials/tour/annotations.md
+++ b/es/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Anotaciones
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 language: es
 ---
diff --git a/es/tutorials/tour/anonymous-function-syntax.md b/es/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from es/tutorials/tour/anonymous-function-syntax.md
rename to es/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index c5c1740691..629e1a5c43 100644
--- a/es/tutorials/tour/anonymous-function-syntax.md
+++ b/es/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Sintaxis de funciones anónimas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 language: es
 ---
diff --git a/es/tutorials/tour/automatic-closures.md b/es/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from es/tutorials/tour/automatic-closures.md
rename to es/tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 97c54fe8c8..b4ad92bf20 100644
--- a/es/tutorials/tour/automatic-closures.md
+++ b/es/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Construcción de closures automáticas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 language: es
 ---
diff --git a/es/tutorials/tour/case-classes.md b/es/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from es/tutorials/tour/case-classes.md
rename to es/tutorials/tour/_posts/2017-02-13-case-classes.md
index d51061cf6f..e881528ff7 100644
--- a/es/tutorials/tour/case-classes.md
+++ b/es/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Clases Case
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 language: es
 ---
diff --git a/es/tutorials/tour/classes.md b/es/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from es/tutorials/tour/classes.md
rename to es/tutorials/tour/_posts/2017-02-13-classes.md
index 902fc881f5..c1ac9490a3 100644
--- a/es/tutorials/tour/classes.md
+++ b/es/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Clases
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 language: es
 ---
diff --git a/es/tutorials/tour/compound-types.md b/es/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 99%
rename from es/tutorials/tour/compound-types.md
rename to es/tutorials/tour/_posts/2017-02-13-compound-types.md
index 7dc8640201..19321db5e6 100644
--- a/es/tutorials/tour/compound-types.md
+++ b/es/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Tipos Compuestos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 language: es
 ---
diff --git a/es/tutorials/tour/currying.md b/es/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from es/tutorials/tour/currying.md
rename to es/tutorials/tour/_posts/2017-02-13-currying.md
index 4a3f772a54..2e037d39d5 100644
--- a/es/tutorials/tour/currying.md
+++ b/es/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 language: es
 ---
diff --git a/es/tutorials/tour/default-parameter-values.md b/es/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from es/tutorials/tour/default-parameter-values.md
rename to es/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index 96df8a1d5c..779362b6ad 100644
--- a/es/tutorials/tour/default-parameter-values.md
+++ b/es/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Valores de parámetros por defecto
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 34
 language: es
 ---
diff --git a/es/tutorials/tour/explicitly-typed-self-references.md b/es/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from es/tutorials/tour/explicitly-typed-self-references.md
rename to es/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index 0f6d3dc3ea..61d83230d3 100644
--- a/es/tutorials/tour/explicitly-typed-self-references.md
+++ b/es/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Autorefrencias explicitamente tipadas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 language: es
 ---
diff --git a/es/tutorials/tour/extractor-objects.md b/es/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from es/tutorials/tour/extractor-objects.md
rename to es/tutorials/tour/_posts/2017-02-13-extractor-objects.md
index da9a22da2f..4700919da4 100644
--- a/es/tutorials/tour/extractor-objects.md
+++ b/es/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Objetos Extractores
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 language: es
 ---
diff --git a/es/tutorials/tour/generic-classes.md b/es/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 99%
rename from es/tutorials/tour/generic-classes.md
rename to es/tutorials/tour/_posts/2017-02-13-generic-classes.md
index 677fe3ccaa..5174c68727 100644
--- a/es/tutorials/tour/generic-classes.md
+++ b/es/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Clases genéricas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 language: es
 ---
diff --git a/es/tutorials/tour/higher-order-functions.md b/es/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from es/tutorials/tour/higher-order-functions.md
rename to es/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index 7ca4748e31..4b2695b25d 100644
--- a/es/tutorials/tour/higher-order-functions.md
+++ b/es/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Funciones de orden superior
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 language: es
 ---
diff --git a/es/tutorials/tour/implicit-conversions.md b/es/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
similarity index 90%
rename from es/tutorials/tour/implicit-conversions.md
rename to es/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
index 88779374e6..d3e9350881 100644
--- a/es/tutorials/tour/implicit-conversions.md
+++ b/es/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Implicit Conversions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 language: es
 ---
diff --git a/es/tutorials/tour/implicit-parameters.md b/es/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from es/tutorials/tour/implicit-parameters.md
rename to es/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index 8561f5317d..bc609cf03c 100644
--- a/es/tutorials/tour/implicit-parameters.md
+++ b/es/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Parámetros implícitos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 language: es
 ---
diff --git a/es/tutorials/tour/inner-classes.md b/es/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from es/tutorials/tour/inner-classes.md
rename to es/tutorials/tour/_posts/2017-02-13-inner-classes.md
index 8904761986..d4282f64e4 100644
--- a/es/tutorials/tour/inner-classes.md
+++ b/es/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Clases Internas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 language: es
 ---
diff --git a/es/tutorials/tour/local-type-inference.md b/es/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from es/tutorials/tour/local-type-inference.md
rename to es/tutorials/tour/_posts/2017-02-13-local-type-inference.md
index 030086a591..3fa3c0d41b 100644
--- a/es/tutorials/tour/local-type-inference.md
+++ b/es/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Inferencia de tipos Local
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 language: es
 ---
diff --git a/es/tutorials/tour/lower-type-bounds.md b/es/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from es/tutorials/tour/lower-type-bounds.md
rename to es/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index 9b52f215cc..d7d1a0d082 100644
--- a/es/tutorials/tour/lower-type-bounds.md
+++ b/es/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Límite de tipado inferior
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 language: es
 ---
diff --git a/es/tutorials/tour/mixin-class-composition.md b/es/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from es/tutorials/tour/mixin-class-composition.md
rename to es/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index ae82bab04a..68d0212d51 100644
--- a/es/tutorials/tour/mixin-class-composition.md
+++ b/es/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Composición de clases mixin
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 language: es
 ---
diff --git a/es/tutorials/tour/named-parameters.md b/es/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from es/tutorials/tour/named-parameters.md
rename to es/tutorials/tour/_posts/2017-02-13-named-parameters.md
index ad2be98c6a..166c7c049e 100644
--- a/es/tutorials/tour/named-parameters.md
+++ b/es/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Parámetros nombrados
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 35
 language: es
 ---
diff --git a/es/tutorials/tour/nested-functions.md b/es/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from es/tutorials/tour/nested-functions.md
rename to es/tutorials/tour/_posts/2017-02-13-nested-functions.md
index c01517924d..7d17af9114 100644
--- a/es/tutorials/tour/nested-functions.md
+++ b/es/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Funciones Anidadas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 language: es
 ---
diff --git a/es/tutorials/tour/operators.md b/es/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from es/tutorials/tour/operators.md
rename to es/tutorials/tour/_posts/2017-02-13-operators.md
index ebb2d64ec7..627a7e2045 100644
--- a/es/tutorials/tour/operators.md
+++ b/es/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operadores
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 language: es
 ---
diff --git a/es/tutorials/tour/pattern-matching.md b/es/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 99%
rename from es/tutorials/tour/pattern-matching.md
rename to es/tutorials/tour/_posts/2017-02-13-pattern-matching.md
index 6b56386da7..1951c93ae8 100644
--- a/es/tutorials/tour/pattern-matching.md
+++ b/es/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Reconocimiento de patrones
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 language: es
 ---
diff --git a/es/tutorials/tour/polymorphic-methods.md b/es/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from es/tutorials/tour/polymorphic-methods.md
rename to es/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index 91ebae17df..1963b76926 100644
--- a/es/tutorials/tour/polymorphic-methods.md
+++ b/es/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Métodos polimórficos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 language: es
 ---
diff --git a/es/tutorials/tour/regular-expression-patterns.md b/es/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 99%
rename from es/tutorials/tour/regular-expression-patterns.md
rename to es/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index 724254d224..3b1cca249c 100644
--- a/es/tutorials/tour/regular-expression-patterns.md
+++ b/es/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Patrones basados en expresiones regulares
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 language: es
 ---
diff --git a/es/tutorials/tour/sequence-comprehensions.md b/es/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from es/tutorials/tour/sequence-comprehensions.md
rename to es/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index 0400c5424a..8682650f20 100644
--- a/es/tutorials/tour/sequence-comprehensions.md
+++ b/es/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Sequencias por Comprensión
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 language: es
 ---
diff --git a/es/tutorials/tour/singleton-objects.md b/es/tutorials/tour/_posts/2017-02-13-singleton-objects.md
similarity index 99%
rename from es/tutorials/tour/singleton-objects.md
rename to es/tutorials/tour/_posts/2017-02-13-singleton-objects.md
index 34bd46c84b..b185924d29 100644
--- a/es/tutorials/tour/singleton-objects.md
+++ b/es/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Singleton Objects
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 language: es
 next-page: xml-processing
diff --git a/es/tutorials/tour/tour-of-scala.md b/es/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from es/tutorials/tour/tour-of-scala.md
rename to es/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index be726a8799..9c5f6183bd 100644
--- a/es/tutorials/tour/tour-of-scala.md
+++ b/es/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Introduction
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 language: es
 ---
diff --git a/es/tutorials/tour/traits.md b/es/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 99%
rename from es/tutorials/tour/traits.md
rename to es/tutorials/tour/_posts/2017-02-13-traits.md
index 18743b08ed..b06a767fea 100644
--- a/es/tutorials/tour/traits.md
+++ b/es/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Traits
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 language: es
 ---
diff --git a/es/tutorials/tour/unified-types.md b/es/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 99%
rename from es/tutorials/tour/unified-types.md
rename to es/tutorials/tour/_posts/2017-02-13-unified-types.md
index 08573070dc..cc34e91b9f 100644
--- a/es/tutorials/tour/unified-types.md
+++ b/es/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Tipos Unificados
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 language: es
 ---
diff --git a/es/tutorials/tour/upper-type-bounds.md b/es/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from es/tutorials/tour/upper-type-bounds.md
rename to es/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index fb29afc307..5de06ada43 100644
--- a/es/tutorials/tour/upper-type-bounds.md
+++ b/es/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Límite de tipado superior
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 language: es
 ---
diff --git a/es/tutorials/tour/variances.md b/es/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 99%
rename from es/tutorials/tour/variances.md
rename to es/tutorials/tour/_posts/2017-02-13-variances.md
index 255e0f9993..1a42ae88a3 100644
--- a/es/tutorials/tour/variances.md
+++ b/es/tutorials/tour/_posts/2017-02-13-variances.md
@@ -5,6 +5,7 @@ title: Varianzas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 language: es
 ---
diff --git a/es/tutorials/tour/xml-processing.md b/es/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 99%
rename from es/tutorials/tour/xml-processing.md
rename to es/tutorials/tour/_posts/2017-02-13-xml-processing.md
index 7edc6788b4..a067b274a6 100644
--- a/es/tutorials/tour/xml-processing.md
+++ b/es/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: Procesamiento de documentos XML
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 language: es
 ---
diff --git a/ko/tutorials/tour/abstract-types.md b/ko/tutorials/tour/_posts/2017-02-13-abstract-types.md
similarity index 99%
rename from ko/tutorials/tour/abstract-types.md
rename to ko/tutorials/tour/_posts/2017-02-13-abstract-types.md
index 976432d435..fb380f360c 100644
--- a/ko/tutorials/tour/abstract-types.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: 추상 타입
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 outof: 35
 language: ko
diff --git a/ko/tutorials/tour/annotations.md b/ko/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from ko/tutorials/tour/annotations.md
rename to ko/tutorials/tour/_posts/2017-02-13-annotations.md
index a2f848a628..3089749e79 100644
--- a/ko/tutorials/tour/annotations.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: 어노테이션
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 language: ko
 ---
diff --git a/ko/tutorials/tour/anonymous-function-syntax.md b/ko/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from ko/tutorials/tour/anonymous-function-syntax.md
rename to ko/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index 121fc4f83d..e5406dce90 100644
--- a/ko/tutorials/tour/anonymous-function-syntax.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: 익명 함수 구문
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 language: ko
 ---
diff --git a/ko/tutorials/tour/automatic-closures.md b/ko/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from ko/tutorials/tour/automatic-closures.md
rename to ko/tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 7f776e3350..c4dc149ca3 100644
--- a/ko/tutorials/tour/automatic-closures.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: 타입 의존 클로저의 자동 구성
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 language: ko
 ---
diff --git a/ko/tutorials/tour/case-classes.md b/ko/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from ko/tutorials/tour/case-classes.md
rename to ko/tutorials/tour/_posts/2017-02-13-case-classes.md
index c1b5e2d301..1a27ad9fe6 100644
--- a/ko/tutorials/tour/case-classes.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: 케이스 클래스
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 language: ko
 ---
diff --git a/ko/tutorials/tour/classes.md b/ko/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from ko/tutorials/tour/classes.md
rename to ko/tutorials/tour/_posts/2017-02-13-classes.md
index b2e64fed18..32e7e69e67 100644
--- a/ko/tutorials/tour/classes.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: 클래스
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 language: ko
 ---
diff --git a/ko/tutorials/tour/compound-types.md b/ko/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 99%
rename from ko/tutorials/tour/compound-types.md
rename to ko/tutorials/tour/_posts/2017-02-13-compound-types.md
index 50cf7045d0..49745ce7b0 100644
--- a/ko/tutorials/tour/compound-types.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: 합성 타입
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 language: ko
 ---
diff --git a/ko/tutorials/tour/currying.md b/ko/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from ko/tutorials/tour/currying.md
rename to ko/tutorials/tour/_posts/2017-02-13-currying.md
index 61c9bed78a..5b8af1cb41 100644
--- a/ko/tutorials/tour/currying.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: 커링
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 language: ko
 ---
diff --git a/ko/tutorials/tour/default-parameter-values.md b/ko/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from ko/tutorials/tour/default-parameter-values.md
rename to ko/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index 10aa7f0ed4..9966867f85 100644
--- a/ko/tutorials/tour/default-parameter-values.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: 기본 파라미터 값
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 language: ko
 ---
diff --git a/ko/tutorials/tour/explicitly-typed-self-references.md b/ko/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from ko/tutorials/tour/explicitly-typed-self-references.md
rename to ko/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index 09ffa8a6af..a1d209df51 100644
--- a/ko/tutorials/tour/explicitly-typed-self-references.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: 명시적으로 타입이 지정된 자기 참조
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 language: ko
 ---
diff --git a/ko/tutorials/tour/extractor-objects.md b/ko/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from ko/tutorials/tour/extractor-objects.md
rename to ko/tutorials/tour/_posts/2017-02-13-extractor-objects.md
index b3833534b9..1d82e5b4c4 100644
--- a/ko/tutorials/tour/extractor-objects.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: 추출자 오브젝트
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 language: ko
 ---
diff --git a/ko/tutorials/tour/generic-classes.md b/ko/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 99%
rename from ko/tutorials/tour/generic-classes.md
rename to ko/tutorials/tour/_posts/2017-02-13-generic-classes.md
index 948bc1dba5..906b7d1633 100644
--- a/ko/tutorials/tour/generic-classes.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: 제네릭 클래스
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 language: ko
 ---
diff --git a/ko/tutorials/tour/higher-order-functions.md b/ko/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from ko/tutorials/tour/higher-order-functions.md
rename to ko/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index 44a31f71a8..fa046e415a 100644
--- a/ko/tutorials/tour/higher-order-functions.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: 고차 함수
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 language: ko
 ---
diff --git a/ko/tutorials/tour/implicit-parameters.md b/ko/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from ko/tutorials/tour/implicit-parameters.md
rename to ko/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index bc559533ea..c76b61b077 100644
--- a/ko/tutorials/tour/implicit-parameters.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: 암시적 파라미터
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 language: ko
 ---
diff --git a/ko/tutorials/tour/inner-classes.md b/ko/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from ko/tutorials/tour/inner-classes.md
rename to ko/tutorials/tour/_posts/2017-02-13-inner-classes.md
index 8e29242d41..22dc20a256 100644
--- a/ko/tutorials/tour/inner-classes.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: 내부 클래스
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 language: ko
 ---
diff --git a/ko/tutorials/tour/local-type-inference.md b/ko/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from ko/tutorials/tour/local-type-inference.md
rename to ko/tutorials/tour/_posts/2017-02-13-local-type-inference.md
index c046763023..9531aafc23 100644
--- a/ko/tutorials/tour/local-type-inference.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: 로컬 타입 추론
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 language: ko
 ---
diff --git a/ko/tutorials/tour/lower-type-bounds.md b/ko/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from ko/tutorials/tour/lower-type-bounds.md
rename to ko/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index f6c54b195c..6ed51f1d44 100644
--- a/ko/tutorials/tour/lower-type-bounds.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: 하위 타입 경계
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 language: ko
 ---
diff --git a/ko/tutorials/tour/mixin-class-composition.md b/ko/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from ko/tutorials/tour/mixin-class-composition.md
rename to ko/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index aa76dfec36..ca1818828a 100644
--- a/ko/tutorials/tour/mixin-class-composition.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: 믹스인 클래스 컴포지션
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 language: ko
 ---
diff --git a/ko/tutorials/tour/named-parameters.md b/ko/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from ko/tutorials/tour/named-parameters.md
rename to ko/tutorials/tour/_posts/2017-02-13-named-parameters.md
index 90a81d5568..f7bb33fb2d 100644
--- a/ko/tutorials/tour/named-parameters.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: 이름을 지정한 파라미터
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 language: ko
 ---
diff --git a/ko/tutorials/tour/nested-functions.md b/ko/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from ko/tutorials/tour/nested-functions.md
rename to ko/tutorials/tour/_posts/2017-02-13-nested-functions.md
index b9279e4473..3c7a320cd2 100644
--- a/ko/tutorials/tour/nested-functions.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: 중첩 함수
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 language: ko
 ---
diff --git a/ko/tutorials/tour/operators.md b/ko/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from ko/tutorials/tour/operators.md
rename to ko/tutorials/tour/_posts/2017-02-13-operators.md
index c51ef0d163..ed5411b9bd 100644
--- a/ko/tutorials/tour/operators.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: 연산자
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 language: ko
 ---
diff --git a/ko/tutorials/tour/pattern-matching.md b/ko/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 99%
rename from ko/tutorials/tour/pattern-matching.md
rename to ko/tutorials/tour/_posts/2017-02-13-pattern-matching.md
index 452bfe463a..efaf696170 100644
--- a/ko/tutorials/tour/pattern-matching.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: 패턴 매칭
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 language: ko
 ---
diff --git a/ko/tutorials/tour/polymorphic-methods.md b/ko/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from ko/tutorials/tour/polymorphic-methods.md
rename to ko/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index 85fb61a4b3..41e1f1c121 100644
--- a/ko/tutorials/tour/polymorphic-methods.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: 다형성 메소드
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 language: ko
 ---
diff --git a/ko/tutorials/tour/regular-expression-patterns.md b/ko/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 99%
rename from ko/tutorials/tour/regular-expression-patterns.md
rename to ko/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index e403a7429c..6676b61cf5 100644
--- a/ko/tutorials/tour/regular-expression-patterns.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: 정규 표현식 패턴
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 language: ko
 ---
diff --git a/ko/tutorials/tour/sequence-comprehensions.md b/ko/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from ko/tutorials/tour/sequence-comprehensions.md
rename to ko/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index 49e03a5b4a..191279a53d 100644
--- a/ko/tutorials/tour/sequence-comprehensions.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: 시퀀스 컴프리헨션
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 language: ko
 ---
diff --git a/ko/tutorials/tour/tour-of-scala.md b/ko/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from ko/tutorials/tour/tour-of-scala.md
rename to ko/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index 7d9d86a9d6..989a4b81e2 100644
--- a/ko/tutorials/tour/tour-of-scala.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: 들어가며
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 language: ko
 ---
diff --git a/ko/tutorials/tour/traits.md b/ko/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 99%
rename from ko/tutorials/tour/traits.md
rename to ko/tutorials/tour/_posts/2017-02-13-traits.md
index 2544dda528..ede7e02106 100644
--- a/ko/tutorials/tour/traits.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: 트레잇
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 language: ko
 ---
diff --git a/ko/tutorials/tour/unified-types.md b/ko/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 99%
rename from ko/tutorials/tour/unified-types.md
rename to ko/tutorials/tour/_posts/2017-02-13-unified-types.md
index 314da4c360..15eb22b81c 100644
--- a/ko/tutorials/tour/unified-types.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: 통합 타입
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 language: ko
 ---
diff --git a/ko/tutorials/tour/upper-type-bounds.md b/ko/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from ko/tutorials/tour/upper-type-bounds.md
rename to ko/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index bacf2cf39b..5ada9ebcb2 100644
--- a/ko/tutorials/tour/upper-type-bounds.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: 상위 타입 경계
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 19
 language: ko
 ---
diff --git a/ko/tutorials/tour/variances.md b/ko/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 99%
rename from ko/tutorials/tour/variances.md
rename to ko/tutorials/tour/_posts/2017-02-13-variances.md
index e68455cb70..1ae881662f 100644
--- a/ko/tutorials/tour/variances.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-variances.md
@@ -5,6 +5,7 @@ title: 가변성
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 language: ko
 ---
diff --git a/ko/tutorials/tour/views.md b/ko/tutorials/tour/_posts/2017-02-13-views.md
similarity index 99%
rename from ko/tutorials/tour/views.md
rename to ko/tutorials/tour/_posts/2017-02-13-views.md
index 1f163baf45..83dcc22257 100644
--- a/ko/tutorials/tour/views.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-views.md
@@ -5,6 +5,7 @@ title: 뷰
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 language: ko
 ---
diff --git a/ko/tutorials/tour/xml-processing.md b/ko/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 99%
rename from ko/tutorials/tour/xml-processing.md
rename to ko/tutorials/tour/_posts/2017-02-13-xml-processing.md
index 82240db357..b57f3ecd78 100644
--- a/ko/tutorials/tour/xml-processing.md
+++ b/ko/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: XML 처리
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 language: ko
 ---
diff --git a/pl/tutorials/tour/abstract-types.md b/pl/tutorials/tour/_posts/2017-02-13-abstract-types.md
similarity index 99%
rename from pl/tutorials/tour/abstract-types.md
rename to pl/tutorials/tour/_posts/2017-02-13-abstract-types.md
index 4d58abd20c..2e8ed1059c 100644
--- a/pl/tutorials/tour/abstract-types.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Typy abstrakcyjne
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 languages: [ba, es, ko, pl]
 language: pl
diff --git a/pl/tutorials/tour/annotations.md b/pl/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from pl/tutorials/tour/annotations.md
rename to pl/tutorials/tour/_posts/2017-02-13-annotations.md
index 230241cd71..d0c1972ac1 100644
--- a/pl/tutorials/tour/annotations.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Adnotacje
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 tutorial-next: default-parameter-values
 tutorial-previous: automatic-closures
diff --git a/pl/tutorials/tour/anonymous-function-syntax.md b/pl/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from pl/tutorials/tour/anonymous-function-syntax.md
rename to pl/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index e292844f1b..2e70294e54 100644
--- a/pl/tutorials/tour/anonymous-function-syntax.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Funkcje anonimowe
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 language: pl
 tutorial-next: higher-order-functions
diff --git a/pl/tutorials/tour/automatic-closures.md b/pl/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from pl/tutorials/tour/automatic-closures.md
rename to pl/tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 38c7358d96..c42a8a1f29 100644
--- a/pl/tutorials/tour/automatic-closures.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Automatyczna konstrukcja domknięć
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 language: pl
 tutorial-next: annotations
diff --git a/pl/tutorials/tour/case-classes.md b/pl/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from pl/tutorials/tour/case-classes.md
rename to pl/tutorials/tour/_posts/2017-02-13-case-classes.md
index 998fa6022d..e5fb094c1c 100644
--- a/pl/tutorials/tour/case-classes.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Klasy przypadków
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 language: pl
 tutorial-next: pattern-matching
diff --git a/pl/tutorials/tour/classes.md b/pl/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from pl/tutorials/tour/classes.md
rename to pl/tutorials/tour/_posts/2017-02-13-classes.md
index dee935059d..e8137017e4 100644
--- a/pl/tutorials/tour/classes.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Klasy
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 language: pl
 tutorial-next: traits
diff --git a/pl/tutorials/tour/compound-types.md b/pl/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 99%
rename from pl/tutorials/tour/compound-types.md
rename to pl/tutorials/tour/_posts/2017-02-13-compound-types.md
index c3d90b8484..dbf4fec01d 100644
--- a/pl/tutorials/tour/compound-types.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Typy złożone
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 language: pl
 tutorial-next: explicitly-typed-self-references
diff --git a/pl/tutorials/tour/currying.md b/pl/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from pl/tutorials/tour/currying.md
rename to pl/tutorials/tour/_posts/2017-02-13-currying.md
index 60fc81961d..91d8b9848c 100644
--- a/pl/tutorials/tour/currying.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Rozwijanie funkcji (Currying)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 language: pl
 tutorial-next: case-classes
diff --git a/pl/tutorials/tour/default-parameter-values.md b/pl/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from pl/tutorials/tour/default-parameter-values.md
rename to pl/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index 23ed9c0d2f..3e55846c68 100644
--- a/pl/tutorials/tour/default-parameter-values.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Domyślne wartości parametrów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 language: pl
 tutorial-next: named-parameters
diff --git a/pl/tutorials/tour/explicitly-typed-self-references.md b/pl/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from pl/tutorials/tour/explicitly-typed-self-references.md
rename to pl/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index c7ca092432..e9e9347d05 100644
--- a/pl/tutorials/tour/explicitly-typed-self-references.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Jawnie typowane samoreferencje
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 language: pl
 tutorial-next: implicit-parameters
diff --git a/pl/tutorials/tour/extractor-objects.md b/pl/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from pl/tutorials/tour/extractor-objects.md
rename to pl/tutorials/tour/_posts/2017-02-13-extractor-objects.md
index 3f100ca99d..de03c13668 100644
--- a/pl/tutorials/tour/extractor-objects.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Obiekty ekstraktorów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 language: pl
 tutorial-next: sequence-comprehensions
diff --git a/pl/tutorials/tour/generic-classes.md b/pl/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 98%
rename from pl/tutorials/tour/generic-classes.md
rename to pl/tutorials/tour/_posts/2017-02-13-generic-classes.md
index e17a1374ac..e7a6270dca 100644
--- a/pl/tutorials/tour/generic-classes.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Klasy generyczne
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 language: pl
 tutorial-next: variances
diff --git a/pl/tutorials/tour/higher-order-functions.md b/pl/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from pl/tutorials/tour/higher-order-functions.md
rename to pl/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index 10afa7ec53..b6a1d396cd 100644
--- a/pl/tutorials/tour/higher-order-functions.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Funkcje wyższego rzędu
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 language: pl
 tutorial-next: nested-functions
diff --git a/pl/tutorials/tour/implicit-conversions.md b/pl/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
similarity index 99%
rename from pl/tutorials/tour/implicit-conversions.md
rename to pl/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
index bf37ba5805..752a909026 100644
--- a/pl/tutorials/tour/implicit-conversions.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Konwersje niejawne
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 language: pl
 tutorial-next: polymorphic-methods
diff --git a/pl/tutorials/tour/implicit-parameters.md b/pl/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from pl/tutorials/tour/implicit-parameters.md
rename to pl/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index e64d460041..4b28a4922d 100644
--- a/pl/tutorials/tour/implicit-parameters.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Parametry domniemane
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 language: pl
 tutorial-next: implicit-conversions
diff --git a/pl/tutorials/tour/inner-classes.md b/pl/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from pl/tutorials/tour/inner-classes.md
rename to pl/tutorials/tour/_posts/2017-02-13-inner-classes.md
index 034191715c..4deb3d0497 100644
--- a/pl/tutorials/tour/inner-classes.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Klasy wewnętrzne
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 language: pl
 tutorial-next: abstract-types
diff --git a/pl/tutorials/tour/local-type-inference.md b/pl/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from pl/tutorials/tour/local-type-inference.md
rename to pl/tutorials/tour/_posts/2017-02-13-local-type-inference.md
index 6cb61a7914..8370cfe2d1 100644
--- a/pl/tutorials/tour/local-type-inference.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Lokalna inferencja typów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 language: pl
 tutorial-next: operators
diff --git a/pl/tutorials/tour/lower-type-bounds.md b/pl/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from pl/tutorials/tour/lower-type-bounds.md
rename to pl/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index dc8985226c..d6e6b8933f 100644
--- a/pl/tutorials/tour/lower-type-bounds.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Dolne ograniczenia typów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 language: pl
 tutorial-next: inner-classes
diff --git a/pl/tutorials/tour/mixin-class-composition.md b/pl/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from pl/tutorials/tour/mixin-class-composition.md
rename to pl/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index cfe673f398..3ac60d4807 100644
--- a/pl/tutorials/tour/mixin-class-composition.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Kompozycja domieszek
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 language: pl
 tutorial-next: anonymous-function-syntax
diff --git a/pl/tutorials/tour/named-parameters.md b/pl/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from pl/tutorials/tour/named-parameters.md
rename to pl/tutorials/tour/_posts/2017-02-13-named-parameters.md
index 31ed29217f..ee0cc2c338 100644
--- a/pl/tutorials/tour/named-parameters.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Parametry nazwane
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 language: pl
 tutorial-previous: default-parameter-values
diff --git a/pl/tutorials/tour/nested-functions.md b/pl/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from pl/tutorials/tour/nested-functions.md
rename to pl/tutorials/tour/_posts/2017-02-13-nested-functions.md
index 40d349c004..a787503593 100644
--- a/pl/tutorials/tour/nested-functions.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Funkcje zagnieżdżone
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 language: pl
 tutorial-next: currying
diff --git a/pl/tutorials/tour/operators.md b/pl/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from pl/tutorials/tour/operators.md
rename to pl/tutorials/tour/_posts/2017-02-13-operators.md
index e999f27a3b..4818b24bce 100644
--- a/pl/tutorials/tour/operators.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operatory
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 language: pl
 tutorial-next: automatic-closures
diff --git a/pl/tutorials/tour/pattern-matching.md b/pl/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 99%
rename from pl/tutorials/tour/pattern-matching.md
rename to pl/tutorials/tour/_posts/2017-02-13-pattern-matching.md
index 886d11362c..4c3d0e9096 100644
--- a/pl/tutorials/tour/pattern-matching.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Dopasowanie wzorców (Pattern matching)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 language: pl
 tutorial-next: singleton-objects
diff --git a/pl/tutorials/tour/polymorphic-methods.md b/pl/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from pl/tutorials/tour/polymorphic-methods.md
rename to pl/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index ba662f8b4b..551ed4c74f 100644
--- a/pl/tutorials/tour/polymorphic-methods.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Metody polimorficzne
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 language: pl
 tutorial-next: local-type-inference
diff --git a/pl/tutorials/tour/regular-expression-patterns.md b/pl/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 98%
rename from pl/tutorials/tour/regular-expression-patterns.md
rename to pl/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index c3caf9a43c..dbd0c2c9a2 100644
--- a/pl/tutorials/tour/regular-expression-patterns.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Wzorce wyrażeń regularnych
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 language: pl
 
diff --git a/pl/tutorials/tour/sequence-comprehensions.md b/pl/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from pl/tutorials/tour/sequence-comprehensions.md
rename to pl/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index 32b9d900a7..ec69b2a95c 100644
--- a/pl/tutorials/tour/sequence-comprehensions.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Instrukcje for (For comprehension)
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 language: pl
 tutorial-next: generic-classes
diff --git a/pl/tutorials/tour/singleton-objects.md b/pl/tutorials/tour/_posts/2017-02-13-singleton-objects.md
similarity index 99%
rename from pl/tutorials/tour/singleton-objects.md
rename to pl/tutorials/tour/_posts/2017-02-13-singleton-objects.md
index 4f97924d7e..e080f59095 100644
--- a/pl/tutorials/tour/singleton-objects.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Obiekty singleton
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 language: pl
 
diff --git a/pl/tutorials/tour/tour-of-scala.md b/pl/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from pl/tutorials/tour/tour-of-scala.md
rename to pl/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index 7026b44557..14fd5e2fbe 100644
--- a/pl/tutorials/tour/tour-of-scala.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Wprowadzenie
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 outof: 33
 language: pl
diff --git a/pl/tutorials/tour/traits.md b/pl/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 99%
rename from pl/tutorials/tour/traits.md
rename to pl/tutorials/tour/_posts/2017-02-13-traits.md
index 21d528df7b..72ce32b6ed 100644
--- a/pl/tutorials/tour/traits.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Cechy
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 language: pl
 tutorial-next: mixin-class-composition
diff --git a/pl/tutorials/tour/unified-types.md b/pl/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 99%
rename from pl/tutorials/tour/unified-types.md
rename to pl/tutorials/tour/_posts/2017-02-13-unified-types.md
index 7b385047ab..185255ee41 100644
--- a/pl/tutorials/tour/unified-types.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Hierarchia typów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 language: pl
 tutorial-next: classes
diff --git a/pl/tutorials/tour/upper-type-bounds.md b/pl/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from pl/tutorials/tour/upper-type-bounds.md
rename to pl/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index 8053bcde2a..6259124550 100644
--- a/pl/tutorials/tour/upper-type-bounds.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Górne ograniczenia typów
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 19
 language: pl
 tutorial-next: lower-type-bounds
diff --git a/pl/tutorials/tour/variances.md b/pl/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 99%
rename from pl/tutorials/tour/variances.md
rename to pl/tutorials/tour/_posts/2017-02-13-variances.md
index a8148c4bc2..cb58f0a995 100644
--- a/pl/tutorials/tour/variances.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-variances.md
@@ -5,6 +5,7 @@ title: Wariancje
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 language: pl
 tutorial-next: upper-type-bounds
diff --git a/pl/tutorials/tour/xml-processing.md b/pl/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 98%
rename from pl/tutorials/tour/xml-processing.md
rename to pl/tutorials/tour/_posts/2017-02-13-xml-processing.md
index a817494214..482ff416ca 100644
--- a/pl/tutorials/tour/xml-processing.md
+++ b/pl/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: Przetwarzanie XML
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 language: pl
 tutorial-next: regular-expression-patterns
diff --git a/pt-br/tutorials/tour/abstract-types.md b/pt-br/tutorials/tour/_posts/2017-02-13-abstract-types.md
similarity index 99%
rename from pt-br/tutorials/tour/abstract-types.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-abstract-types.md
index e6fafa5909..221cde47d5 100644
--- a/pt-br/tutorials/tour/abstract-types.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-abstract-types.md
@@ -5,6 +5,7 @@ title: Tipos Abstratos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 22
 tutorial-next: compound-types
 tutorial-previous: inner-classes
diff --git a/pt-br/tutorials/tour/annotations.md b/pt-br/tutorials/tour/_posts/2017-02-13-annotations.md
similarity index 99%
rename from pt-br/tutorials/tour/annotations.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-annotations.md
index 03171b267d..00e504de88 100644
--- a/pt-br/tutorials/tour/annotations.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-annotations.md
@@ -5,6 +5,7 @@ title: Anotações
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 31
 tutorial-next: default-parameter-values
 tutorial-previous: automatic-closures
diff --git a/pt-br/tutorials/tour/anonymous-function-syntax.md b/pt-br/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
similarity index 98%
rename from pt-br/tutorials/tour/anonymous-function-syntax.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
index c1778f6bf5..312a363619 100644
--- a/pt-br/tutorials/tour/anonymous-function-syntax.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md
@@ -5,6 +5,7 @@ title: Sintaxe de Função Anônima
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 6
 tutorial-next: higher-order-functions
 tutorial-previous: mixin-class-composition
diff --git a/pt-br/tutorials/tour/automatic-closures.md b/pt-br/tutorials/tour/_posts/2017-02-13-automatic-closures.md
similarity index 99%
rename from pt-br/tutorials/tour/automatic-closures.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-automatic-closures.md
index 9d0d118651..55084f17ff 100644
--- a/pt-br/tutorials/tour/automatic-closures.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-automatic-closures.md
@@ -5,6 +5,7 @@ title: Construção Automática de Closures de Tipo-Dependente
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 30
 tutorial-next: annotations
 tutorial-previous: operators
diff --git a/pt-br/tutorials/tour/case-classes.md b/pt-br/tutorials/tour/_posts/2017-02-13-case-classes.md
similarity index 99%
rename from pt-br/tutorials/tour/case-classes.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-case-classes.md
index c71161872a..a8b6b454d0 100644
--- a/pt-br/tutorials/tour/case-classes.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-case-classes.md
@@ -5,6 +5,7 @@ title: Classes Case
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 10
 tutorial-next: pattern-matching
 tutorial-previous: currying
diff --git a/pt-br/tutorials/tour/classes.md b/pt-br/tutorials/tour/_posts/2017-02-13-classes.md
similarity index 99%
rename from pt-br/tutorials/tour/classes.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-classes.md
index ae56fd3f57..2309232109 100644
--- a/pt-br/tutorials/tour/classes.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-classes.md
@@ -5,6 +5,7 @@ title: Classes
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 3
 tutorial-next: traits
 tutorial-previous: unified-types
diff --git a/pt-br/tutorials/tour/compound-types.md b/pt-br/tutorials/tour/_posts/2017-02-13-compound-types.md
similarity index 99%
rename from pt-br/tutorials/tour/compound-types.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-compound-types.md
index 0b7cbd0466..a091c2e51a 100644
--- a/pt-br/tutorials/tour/compound-types.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-compound-types.md
@@ -5,6 +5,7 @@ title: Tipos Compostos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 23
 tutorial-next: explicitly-typed-self-references
 tutorial-previous: abstract-types
diff --git a/pt-br/tutorials/tour/currying.md b/pt-br/tutorials/tour/_posts/2017-02-13-currying.md
similarity index 98%
rename from pt-br/tutorials/tour/currying.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-currying.md
index d079153331..20052d9e43 100644
--- a/pt-br/tutorials/tour/currying.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-currying.md
@@ -5,6 +5,7 @@ title: Currying
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 9
 tutorial-next: case-classes
 tutorial-previous: nested-functions
diff --git a/pt-br/tutorials/tour/default-parameter-values.md b/pt-br/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
similarity index 99%
rename from pt-br/tutorials/tour/default-parameter-values.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
index a794885b79..f03db2ad8e 100644
--- a/pt-br/tutorials/tour/default-parameter-values.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-default-parameter-values.md
@@ -5,6 +5,7 @@ title: Parâmetro com Valor Padrão
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 32
 tutorial-next: named-parameters
 tutorial-previous: annotations
diff --git a/pt-br/tutorials/tour/explicitly-typed-self-references.md b/pt-br/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
similarity index 99%
rename from pt-br/tutorials/tour/explicitly-typed-self-references.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
index b37d18c189..6513f3a0dd 100644
--- a/pt-br/tutorials/tour/explicitly-typed-self-references.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md
@@ -5,6 +5,7 @@ title: Auto Referências Explicitamente Tipadas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 24
 tutorial-next: implicit-parameters
 tutorial-previous: compound-types
diff --git a/pt-br/tutorials/tour/extractor-objects.md b/pt-br/tutorials/tour/_posts/2017-02-13-extractor-objects.md
similarity index 99%
rename from pt-br/tutorials/tour/extractor-objects.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-extractor-objects.md
index a8afb6522c..9a77faa015 100644
--- a/pt-br/tutorials/tour/extractor-objects.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-extractor-objects.md
@@ -5,6 +5,7 @@ title: Objetos Extratores
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 15
 tutorial-next: sequence-comprehensions
 tutorial-previous: regular-expression-patterns
diff --git a/pt-br/tutorials/tour/generic-classes.md b/pt-br/tutorials/tour/_posts/2017-02-13-generic-classes.md
similarity index 99%
rename from pt-br/tutorials/tour/generic-classes.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-generic-classes.md
index a134f109e4..73882df3c7 100644
--- a/pt-br/tutorials/tour/generic-classes.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-generic-classes.md
@@ -5,6 +5,7 @@ title: Classes Genéricas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 17
 tutorial-next: variances
 tutorial-previous: sequence-comprehensions
diff --git a/pt-br/tutorials/tour/higher-order-functions.md b/pt-br/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
similarity index 98%
rename from pt-br/tutorials/tour/higher-order-functions.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
index 2466257a99..e9a62cd9af 100644
--- a/pt-br/tutorials/tour/higher-order-functions.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-higher-order-functions.md
@@ -5,6 +5,7 @@ title: Funções de ordem superior
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 7
 tutorial-next: nested-functions
 tutorial-previous: anonymous-function-syntax
diff --git a/pt-br/tutorials/tour/implicit-conversions.md b/pt-br/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
similarity index 99%
rename from pt-br/tutorials/tour/implicit-conversions.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
index 22f6a97d4b..073d8b8e74 100644
--- a/pt-br/tutorials/tour/implicit-conversions.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-implicit-conversions.md
@@ -5,6 +5,7 @@ title: Conversões Implícitas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 26
 tutorial-next: polymorphic-methods
 tutorial-previous: implicit-parameters
diff --git a/pt-br/tutorials/tour/implicit-parameters.md b/pt-br/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
similarity index 99%
rename from pt-br/tutorials/tour/implicit-parameters.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
index 9a668ca233..ec36b3e346 100644
--- a/pt-br/tutorials/tour/implicit-parameters.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-implicit-parameters.md
@@ -5,6 +5,7 @@ title: Parâmetros Implícitos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 25
 tutorial-next: implicit-conversions
 tutorial-previous: explicitly-typed-self-references
diff --git a/pt-br/tutorials/tour/inner-classes.md b/pt-br/tutorials/tour/_posts/2017-02-13-inner-classes.md
similarity index 99%
rename from pt-br/tutorials/tour/inner-classes.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-inner-classes.md
index aab5e5edfc..ede5cb397b 100644
--- a/pt-br/tutorials/tour/inner-classes.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-inner-classes.md
@@ -5,6 +5,7 @@ title: Classes Internas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 21
 tutorial-next: abstract-types
 tutorial-previous: lower-type-bounds
diff --git a/pt-br/tutorials/tour/local-type-inference.md b/pt-br/tutorials/tour/_posts/2017-02-13-local-type-inference.md
similarity index 99%
rename from pt-br/tutorials/tour/local-type-inference.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-local-type-inference.md
index b84b767930..c745c32f74 100644
--- a/pt-br/tutorials/tour/local-type-inference.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-local-type-inference.md
@@ -5,6 +5,7 @@ title: Inferência de Tipo Local
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 28
 tutorial-next: operators
 tutorial-previous: polymorphic-methods
diff --git a/pt-br/tutorials/tour/lower-type-bounds.md b/pt-br/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
similarity index 99%
rename from pt-br/tutorials/tour/lower-type-bounds.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
index e1e65d45dd..fa5eee55c8 100644
--- a/pt-br/tutorials/tour/lower-type-bounds.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md
@@ -5,6 +5,7 @@ title: Limitante Inferior de Tipos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 20
 tutorial-next: inner-classes
 tutorial-previous: upper-type-bounds
diff --git a/pt-br/tutorials/tour/mixin-class-composition.md b/pt-br/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
similarity index 99%
rename from pt-br/tutorials/tour/mixin-class-composition.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
index 68265da40f..c7a2ce765f 100644
--- a/pt-br/tutorials/tour/mixin-class-composition.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-mixin-class-composition.md
@@ -5,6 +5,7 @@ title: Composição de Classes Mixin
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 5
 tutorial-next: anonymous-function-syntax
 tutorial-previous: traits
diff --git a/pt-br/tutorials/tour/named-parameters.md b/pt-br/tutorials/tour/_posts/2017-02-13-named-parameters.md
similarity index 98%
rename from pt-br/tutorials/tour/named-parameters.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-named-parameters.md
index 057c5ae25a..8570d3e9fa 100644
--- a/pt-br/tutorials/tour/named-parameters.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-named-parameters.md
@@ -5,6 +5,7 @@ title: Parâmetros Nomeados
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 33
 tutorial-previous: default-parameter-values
 language: pt-br
diff --git a/pt-br/tutorials/tour/nested-functions.md b/pt-br/tutorials/tour/_posts/2017-02-13-nested-functions.md
similarity index 98%
rename from pt-br/tutorials/tour/nested-functions.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-nested-functions.md
index 23545e2f4b..605b08438f 100644
--- a/pt-br/tutorials/tour/nested-functions.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-nested-functions.md
@@ -5,6 +5,7 @@ title: Funções Aninhadas
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 8
 tutorial-next: currying
 tutorial-previous: higher-order-functions
diff --git a/pt-br/tutorials/tour/operators.md b/pt-br/tutorials/tour/_posts/2017-02-13-operators.md
similarity index 98%
rename from pt-br/tutorials/tour/operators.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-operators.md
index 5b097cdb12..65dc65c5e7 100644
--- a/pt-br/tutorials/tour/operators.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-operators.md
@@ -5,6 +5,7 @@ title: Operadores
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 29
 tutorial-next: automatic-closures
 tutorial-previous: local-type-inference
diff --git a/pt-br/tutorials/tour/pattern-matching.md b/pt-br/tutorials/tour/_posts/2017-02-13-pattern-matching.md
similarity index 99%
rename from pt-br/tutorials/tour/pattern-matching.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-pattern-matching.md
index 3216b04b51..16fe2eb069 100644
--- a/pt-br/tutorials/tour/pattern-matching.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-pattern-matching.md
@@ -5,6 +5,7 @@ title: Correspondência de Padrões
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 11
 
 tutorial-next: singleton-objects
diff --git a/pt-br/tutorials/tour/polymorphic-methods.md b/pt-br/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
similarity index 98%
rename from pt-br/tutorials/tour/polymorphic-methods.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
index 2b48dc8dfc..12c5fb844a 100644
--- a/pt-br/tutorials/tour/polymorphic-methods.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-polymorphic-methods.md
@@ -5,6 +5,7 @@ title: Métodos Polimórficos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 27
 
 tutorial-next: local-type-inference
diff --git a/pt-br/tutorials/tour/regular-expression-patterns.md b/pt-br/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
similarity index 99%
rename from pt-br/tutorials/tour/regular-expression-patterns.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
index 6ad9e02700..f977d446a1 100644
--- a/pt-br/tutorials/tour/regular-expression-patterns.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-regular-expression-patterns.md
@@ -5,6 +5,7 @@ title: Padrões de Expressões Regulares
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 14
 
 tutorial-next: extractor-objects
diff --git a/pt-br/tutorials/tour/sequence-comprehensions.md b/pt-br/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
similarity index 99%
rename from pt-br/tutorials/tour/sequence-comprehensions.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
index 026298ca08..b9ba1ded6d 100644
--- a/pt-br/tutorials/tour/sequence-comprehensions.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-sequence-comprehensions.md
@@ -5,6 +5,7 @@ title: Sequence Comprehensions
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 16
 tutorial-next: generic-classes
 tutorial-previous: extractor-objects
diff --git a/pt-br/tutorials/tour/singleton-objects.md b/pt-br/tutorials/tour/_posts/2017-02-13-singleton-objects.md
similarity index 99%
rename from pt-br/tutorials/tour/singleton-objects.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-singleton-objects.md
index a615727d74..f502a14a89 100644
--- a/pt-br/tutorials/tour/singleton-objects.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-singleton-objects.md
@@ -5,6 +5,7 @@ title: Objetos Singleton
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 12
 
 tutorial-next: xml-processing
diff --git a/pt-br/tutorials/tour/tour-of-scala.md b/pt-br/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
similarity index 99%
rename from pt-br/tutorials/tour/tour-of-scala.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
index f736957a0c..4e0aa9c352 100644
--- a/pt-br/tutorials/tour/tour-of-scala.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-tour-of-scala.md
@@ -5,6 +5,7 @@ title: Introdução
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 1
 outof: 33
 tutorial-next: unified-types
diff --git a/pt-br/tutorials/tour/traits.md b/pt-br/tutorials/tour/_posts/2017-02-13-traits.md
similarity index 99%
rename from pt-br/tutorials/tour/traits.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-traits.md
index 7a017284ce..042627c5f3 100644
--- a/pt-br/tutorials/tour/traits.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-traits.md
@@ -5,6 +5,7 @@ title: Traits
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 4
 tutorial-next: mixin-class-composition
 tutorial-previous: classes
diff --git a/pt-br/tutorials/tour/unified-types.md b/pt-br/tutorials/tour/_posts/2017-02-13-unified-types.md
similarity index 99%
rename from pt-br/tutorials/tour/unified-types.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-unified-types.md
index 29dfa88ba9..d10c427e2b 100644
--- a/pt-br/tutorials/tour/unified-types.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-unified-types.md
@@ -5,6 +5,7 @@ title: Tipos Unificados
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 2
 tutorial-next: classes
 tutorial-previous: tour-of-scala
diff --git a/pt-br/tutorials/tour/upper-type-bounds.md b/pt-br/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
similarity index 98%
rename from pt-br/tutorials/tour/upper-type-bounds.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
index ed8926d388..878f6ed2c3 100644
--- a/pt-br/tutorials/tour/upper-type-bounds.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-upper-type-bounds.md
@@ -5,6 +5,7 @@ title: Limitante Superior de Tipos
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 19
 tutorial-next: lower-type-bounds
 tutorial-previous: variances
diff --git a/pt-br/tutorials/tour/variances.md b/pt-br/tutorials/tour/_posts/2017-02-13-variances.md
similarity index 99%
rename from pt-br/tutorials/tour/variances.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-variances.md
index d311ddb3f5..27e09ebce6 100644
--- a/pt-br/tutorials/tour/variances.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-variances.md
@@ -5,6 +5,7 @@ title: Variâncias
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 18
 tutorial-next: upper-type-bounds
 tutorial-previous: generic-classes
diff --git a/pt-br/tutorials/tour/xml-processing.md b/pt-br/tutorials/tour/_posts/2017-02-13-xml-processing.md
similarity index 99%
rename from pt-br/tutorials/tour/xml-processing.md
rename to pt-br/tutorials/tour/_posts/2017-02-13-xml-processing.md
index 1a88553bcb..a829e094b1 100644
--- a/pt-br/tutorials/tour/xml-processing.md
+++ b/pt-br/tutorials/tour/_posts/2017-02-13-xml-processing.md
@@ -5,6 +5,7 @@ title: Processando arquivos XML
 disqus: true
 
 tutorial: scala-tour
+categories: tour
 num: 13
 tutorial-next: regular-expression-patterns
 tutorial-previous: singleton-objects

From 8c933e9ce36f8193553d966d5f9c5d8a0356b453 Mon Sep 17 00:00:00 2001
From: jvican <jorgevc@fastmail.es>
Date: Mon, 13 Feb 2017 12:35:47 +0100
Subject: [PATCH 3/3] Remove `travis_wait` since it's not necessary

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 10ec26b656..a25fba9574 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,4 +16,4 @@ before_script: chmod +x coursier
 script:
 - ./scripts/run-tut.sh
 - rm -r tut-tmp
-- travis_wait 30 bundle exec jekyll build
+- bundle exec jekyll build