diff --git a/doc/tutorial/basics/intro/10_json.txt b/doc/tutorial/basics/0_intro/10_json.txt
similarity index 100%
rename from doc/tutorial/basics/intro/10_json.txt
rename to doc/tutorial/basics/0_intro/10_json.txt
diff --git a/doc/tutorial/basics/intro/20_cue.txt b/doc/tutorial/basics/0_intro/20_cue.txt
similarity index 100%
rename from doc/tutorial/basics/intro/20_cue.txt
rename to doc/tutorial/basics/0_intro/20_cue.txt
diff --git a/doc/tutorial/basics/intro/30_order.txt b/doc/tutorial/basics/0_intro/30_order.txt
similarity index 100%
rename from doc/tutorial/basics/intro/30_order.txt
rename to doc/tutorial/basics/0_intro/30_order.txt
diff --git a/doc/tutorial/basics/intro/32_validation.txt b/doc/tutorial/basics/0_intro/32_validation.txt
similarity index 100%
rename from doc/tutorial/basics/intro/32_validation.txt
rename to doc/tutorial/basics/0_intro/32_validation.txt
diff --git a/doc/tutorial/basics/intro/35_duplicates.txt b/doc/tutorial/basics/0_intro/35_duplicates.txt
similarity index 100%
rename from doc/tutorial/basics/intro/35_duplicates.txt
rename to doc/tutorial/basics/0_intro/35_duplicates.txt
diff --git a/doc/tutorial/basics/intro/40_fold.txt b/doc/tutorial/basics/0_intro/40_fold.txt
similarity index 100%
rename from doc/tutorial/basics/intro/40_fold.txt
rename to doc/tutorial/basics/0_intro/40_fold.txt
diff --git a/doc/tutorial/basics/intro/50_boilerplate.txt b/doc/tutorial/basics/0_intro/50_boilerplate.txt
similarity index 100%
rename from doc/tutorial/basics/intro/50_boilerplate.txt
rename to doc/tutorial/basics/0_intro/50_boilerplate.txt
diff --git a/doc/tutorial/basics/types/05_types.txt b/doc/tutorial/basics/2_types/05_types.txt
similarity index 100%
rename from doc/tutorial/basics/types/05_types.txt
rename to doc/tutorial/basics/2_types/05_types.txt
diff --git a/doc/tutorial/basics/types/20_bottom.txt b/doc/tutorial/basics/2_types/20_bottom.txt
similarity index 100%
rename from doc/tutorial/basics/types/20_bottom.txt
rename to doc/tutorial/basics/2_types/20_bottom.txt
diff --git a/doc/tutorial/basics/types/20_duplicates.txt b/doc/tutorial/basics/2_types/20_duplicates.txt
similarity index 100%
rename from doc/tutorial/basics/types/20_duplicates.txt
rename to doc/tutorial/basics/2_types/20_duplicates.txt
diff --git a/doc/tutorial/basics/types/20_selectors.txt b/doc/tutorial/basics/2_types/20_selectors.txt
similarity index 100%
rename from doc/tutorial/basics/types/20_selectors.txt
rename to doc/tutorial/basics/2_types/20_selectors.txt
diff --git a/doc/tutorial/basics/types/30_types.txt b/doc/tutorial/basics/2_types/30_types.txt
similarity index 100%
rename from doc/tutorial/basics/types/30_types.txt
rename to doc/tutorial/basics/2_types/30_types.txt
diff --git a/doc/tutorial/basics/types/40_numbers.txt b/doc/tutorial/basics/2_types/40_numbers.txt
similarity index 100%
rename from doc/tutorial/basics/types/40_numbers.txt
rename to doc/tutorial/basics/2_types/40_numbers.txt
diff --git a/doc/tutorial/basics/types/45_numberlit.txt b/doc/tutorial/basics/2_types/45_numberlit.txt
similarity index 100%
rename from doc/tutorial/basics/types/45_numberlit.txt
rename to doc/tutorial/basics/2_types/45_numberlit.txt
diff --git a/doc/tutorial/basics/types/50_disjunctions.txt b/doc/tutorial/basics/2_types/50_disjunctions.txt
similarity index 100%
rename from doc/tutorial/basics/types/50_disjunctions.txt
rename to doc/tutorial/basics/2_types/50_disjunctions.txt
diff --git a/doc/tutorial/basics/types/55_defaults.txt b/doc/tutorial/basics/2_types/55_defaults.txt
similarity index 100%
rename from doc/tutorial/basics/types/55_defaults.txt
rename to doc/tutorial/basics/2_types/55_defaults.txt
diff --git a/doc/tutorial/basics/types/55_sumstruct.txt b/doc/tutorial/basics/2_types/55_sumstruct.txt
similarity index 100%
rename from doc/tutorial/basics/types/55_sumstruct.txt
rename to doc/tutorial/basics/2_types/55_sumstruct.txt
diff --git a/doc/tutorial/basics/types/60_stringlit.txt b/doc/tutorial/basics/2_types/60_stringlit.txt
similarity index 100%
rename from doc/tutorial/basics/types/60_stringlit.txt
rename to doc/tutorial/basics/2_types/60_stringlit.txt
diff --git a/doc/tutorial/basics/types/65_stringraw.txt b/doc/tutorial/basics/2_types/65_stringraw.txt
similarity index 100%
rename from doc/tutorial/basics/types/65_stringraw.txt
rename to doc/tutorial/basics/2_types/65_stringraw.txt
diff --git a/doc/tutorial/basics/types/68_bytes.txt b/doc/tutorial/basics/2_types/68_bytes.txt
similarity index 100%
rename from doc/tutorial/basics/types/68_bytes.txt
rename to doc/tutorial/basics/2_types/68_bytes.txt
diff --git a/doc/tutorial/basics/types/70_bounds.txt b/doc/tutorial/basics/2_types/70_bounds.txt
similarity index 100%
rename from doc/tutorial/basics/types/70_bounds.txt
rename to doc/tutorial/basics/2_types/70_bounds.txt
diff --git a/doc/tutorial/basics/types/75_rangedef.txt b/doc/tutorial/basics/2_types/75_rangedef.txt
similarity index 100%
rename from doc/tutorial/basics/types/75_rangedef.txt
rename to doc/tutorial/basics/2_types/75_rangedef.txt
diff --git a/doc/tutorial/basics/types/80_lists.txt b/doc/tutorial/basics/2_types/80_lists.txt
similarity index 100%
rename from doc/tutorial/basics/types/80_lists.txt
rename to doc/tutorial/basics/2_types/80_lists.txt
diff --git a/doc/tutorial/basics/types/90_templates.txt b/doc/tutorial/basics/2_types/90_templates.txt
similarity index 100%
rename from doc/tutorial/basics/types/90_templates.txt
rename to doc/tutorial/basics/2_types/90_templates.txt
diff --git a/doc/tutorial/basics/references/10_scopes.txt b/doc/tutorial/basics/4_references/10_scopes.txt
similarity index 100%
rename from doc/tutorial/basics/references/10_scopes.txt
rename to doc/tutorial/basics/4_references/10_scopes.txt
diff --git a/doc/tutorial/basics/references/30_aliases.txt b/doc/tutorial/basics/4_references/30_aliases.txt
similarity index 100%
rename from doc/tutorial/basics/references/30_aliases.txt
rename to doc/tutorial/basics/4_references/30_aliases.txt
diff --git a/doc/tutorial/basics/references/50_emit.txt b/doc/tutorial/basics/4_references/50_emit.txt
similarity index 100%
rename from doc/tutorial/basics/references/50_emit.txt
rename to doc/tutorial/basics/4_references/50_emit.txt
diff --git a/doc/tutorial/basics/references/80_cycle.txt b/doc/tutorial/basics/4_references/80_cycle.txt
similarity index 100%
rename from doc/tutorial/basics/references/80_cycle.txt
rename to doc/tutorial/basics/4_references/80_cycle.txt
diff --git a/doc/tutorial/basics/references/85_cycleref.txt b/doc/tutorial/basics/4_references/85_cycleref.txt
similarity index 100%
rename from doc/tutorial/basics/references/85_cycleref.txt
rename to doc/tutorial/basics/4_references/85_cycleref.txt
diff --git a/doc/tutorial/basics/references/99_hidden.txt b/doc/tutorial/basics/4_references/99_hidden.txt
similarity index 100%
rename from doc/tutorial/basics/references/99_hidden.txt
rename to doc/tutorial/basics/4_references/99_hidden.txt
diff --git a/doc/tutorial/basics/expressions/10_operators.txt b/doc/tutorial/basics/6_references/10_operators.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/10_operators.txt
rename to doc/tutorial/basics/6_references/10_operators.txt
diff --git a/doc/tutorial/basics/expressions/20_interpolation.txt b/doc/tutorial/basics/6_references/20_interpolation.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/20_interpolation.txt
rename to doc/tutorial/basics/6_references/20_interpolation.txt
diff --git a/doc/tutorial/basics/expressions/25_interpolfield.txt b/doc/tutorial/basics/6_references/25_interpolfield.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/25_interpolfield.txt
rename to doc/tutorial/basics/6_references/25_interpolfield.txt
diff --git a/doc/tutorial/basics/expressions/40_listcomp.txt b/doc/tutorial/basics/6_references/40_listcomp.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/40_listcomp.txt
rename to doc/tutorial/basics/6_references/40_listcomp.txt
diff --git a/doc/tutorial/basics/expressions/50_fieldcomp.txt b/doc/tutorial/basics/6_references/50_fieldcomp.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/50_fieldcomp.txt
rename to doc/tutorial/basics/6_references/50_fieldcomp.txt
diff --git a/doc/tutorial/basics/expressions/55_conditional.txt b/doc/tutorial/basics/6_references/55_conditional.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/55_conditional.txt
rename to doc/tutorial/basics/6_references/55_conditional.txt
diff --git a/doc/tutorial/basics/expressions/70_regexp.txt b/doc/tutorial/basics/6_references/70_regexp.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/70_regexp.txt
rename to doc/tutorial/basics/6_references/70_regexp.txt
diff --git a/doc/tutorial/basics/expressions/80_coalesce.txt b/doc/tutorial/basics/6_references/80_coalesce.txt
similarity index 100%
rename from doc/tutorial/basics/expressions/80_coalesce.txt
rename to doc/tutorial/basics/6_references/80_coalesce.txt
diff --git a/doc/tutorial/basics/packages/10_packages.txt b/doc/tutorial/basics/8_packages/10_packages.txt
similarity index 100%
rename from doc/tutorial/basics/packages/10_packages.txt
rename to doc/tutorial/basics/8_packages/10_packages.txt
diff --git a/doc/tutorial/basics/packages/30_imports.txt b/doc/tutorial/basics/8_packages/30_imports.txt
similarity index 100%
rename from doc/tutorial/basics/packages/30_imports.txt
rename to doc/tutorial/basics/8_packages/30_imports.txt
diff --git a/doc/tutorial/basics/expressions/_index.md b/doc/tutorial/basics/expressions/_index.md
deleted file mode 100644
index 11e3143..0000000
--- a/doc/tutorial/basics/expressions/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Expressions"
-weight = 2600
-description = ""
-+++
\ No newline at end of file
diff --git a/doc/tutorial/basics/intro/_index.md b/doc/tutorial/basics/intro/_index.md
deleted file mode 100644
index 3edfac3..0000000
--- a/doc/tutorial/basics/intro/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Introduction"
-weight = 2000
-description = ""
-+++
\ No newline at end of file
diff --git a/doc/tutorial/basics/packages/_index.md b/doc/tutorial/basics/packages/_index.md
deleted file mode 100644
index 879be44..0000000
--- a/doc/tutorial/basics/packages/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Modules, Packages, and Instances"
-weight = 2800
-description = ""
-+++
\ No newline at end of file
diff --git a/doc/tutorial/basics/references/_index.md b/doc/tutorial/basics/references/_index.md
deleted file mode 100644
index 7a3bdd6..0000000
--- a/doc/tutorial/basics/references/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "References and Visibility"
-weight = 2400
-description = ""
-+++
\ No newline at end of file
diff --git a/doc/tutorial/basics/types/_index.md b/doc/tutorial/basics/types/_index.md
deleted file mode 100644
index 7e813fc..0000000
--- a/doc/tutorial/basics/types/_index.md
+++ /dev/null
@@ -1,5 +0,0 @@
-+++
-title = "Types ~~and~~ are Values"
-weight = 2200
-description = ""
-+++
\ No newline at end of file