diff --git a/exercises/intro/README.md b/exercises/00_intro/README.md
similarity index 100%
rename from exercises/intro/README.md
rename to exercises/00_intro/README.md
diff --git a/exercises/intro/intro1.rs b/exercises/00_intro/intro1.rs
similarity index 100%
rename from exercises/intro/intro1.rs
rename to exercises/00_intro/intro1.rs
diff --git a/exercises/intro/intro2.rs b/exercises/00_intro/intro2.rs
similarity index 100%
rename from exercises/intro/intro2.rs
rename to exercises/00_intro/intro2.rs
diff --git a/exercises/variables/README.md b/exercises/01_variables/README.md
similarity index 100%
rename from exercises/variables/README.md
rename to exercises/01_variables/README.md
diff --git a/exercises/variables/variables1.rs b/exercises/01_variables/variables1.rs
similarity index 100%
rename from exercises/variables/variables1.rs
rename to exercises/01_variables/variables1.rs
diff --git a/exercises/variables/variables2.rs b/exercises/01_variables/variables2.rs
similarity index 100%
rename from exercises/variables/variables2.rs
rename to exercises/01_variables/variables2.rs
diff --git a/exercises/variables/variables3.rs b/exercises/01_variables/variables3.rs
similarity index 100%
rename from exercises/variables/variables3.rs
rename to exercises/01_variables/variables3.rs
diff --git a/exercises/variables/variables4.rs b/exercises/01_variables/variables4.rs
similarity index 100%
rename from exercises/variables/variables4.rs
rename to exercises/01_variables/variables4.rs
diff --git a/exercises/variables/variables5.rs b/exercises/01_variables/variables5.rs
similarity index 100%
rename from exercises/variables/variables5.rs
rename to exercises/01_variables/variables5.rs
diff --git a/exercises/variables/variables6.rs b/exercises/01_variables/variables6.rs
similarity index 100%
rename from exercises/variables/variables6.rs
rename to exercises/01_variables/variables6.rs
diff --git a/exercises/functions/README.md b/exercises/02_functions/README.md
similarity index 100%
rename from exercises/functions/README.md
rename to exercises/02_functions/README.md
diff --git a/exercises/functions/functions1.rs b/exercises/02_functions/functions1.rs
similarity index 100%
rename from exercises/functions/functions1.rs
rename to exercises/02_functions/functions1.rs
diff --git a/exercises/functions/functions2.rs b/exercises/02_functions/functions2.rs
similarity index 100%
rename from exercises/functions/functions2.rs
rename to exercises/02_functions/functions2.rs
diff --git a/exercises/functions/functions3.rs b/exercises/02_functions/functions3.rs
similarity index 100%
rename from exercises/functions/functions3.rs
rename to exercises/02_functions/functions3.rs
diff --git a/exercises/functions/functions4.rs b/exercises/02_functions/functions4.rs
similarity index 100%
rename from exercises/functions/functions4.rs
rename to exercises/02_functions/functions4.rs
diff --git a/exercises/functions/functions5.rs b/exercises/02_functions/functions5.rs
similarity index 100%
rename from exercises/functions/functions5.rs
rename to exercises/02_functions/functions5.rs
diff --git a/exercises/if/README.md b/exercises/03_if/README.md
similarity index 100%
rename from exercises/if/README.md
rename to exercises/03_if/README.md
diff --git a/exercises/if/if1.rs b/exercises/03_if/if1.rs
similarity index 100%
rename from exercises/if/if1.rs
rename to exercises/03_if/if1.rs
diff --git a/exercises/if/if2.rs b/exercises/03_if/if2.rs
similarity index 100%
rename from exercises/if/if2.rs
rename to exercises/03_if/if2.rs
diff --git a/exercises/primitive_types/README.md b/exercises/04_primitive_types/README.md
similarity index 100%
rename from exercises/primitive_types/README.md
rename to exercises/04_primitive_types/README.md
diff --git a/exercises/primitive_types/primitive_types1.rs b/exercises/04_primitive_types/primitive_types1.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types1.rs
rename to exercises/04_primitive_types/primitive_types1.rs
diff --git a/exercises/primitive_types/primitive_types2.rs b/exercises/04_primitive_types/primitive_types2.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types2.rs
rename to exercises/04_primitive_types/primitive_types2.rs
diff --git a/exercises/primitive_types/primitive_types3.rs b/exercises/04_primitive_types/primitive_types3.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types3.rs
rename to exercises/04_primitive_types/primitive_types3.rs
diff --git a/exercises/primitive_types/primitive_types4.rs b/exercises/04_primitive_types/primitive_types4.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types4.rs
rename to exercises/04_primitive_types/primitive_types4.rs
diff --git a/exercises/primitive_types/primitive_types5.rs b/exercises/04_primitive_types/primitive_types5.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types5.rs
rename to exercises/04_primitive_types/primitive_types5.rs
diff --git a/exercises/primitive_types/primitive_types6.rs b/exercises/04_primitive_types/primitive_types6.rs
similarity index 100%
rename from exercises/primitive_types/primitive_types6.rs
rename to exercises/04_primitive_types/primitive_types6.rs
diff --git a/exercises/vecs/README.md b/exercises/05_vecs/README.md
similarity index 100%
rename from exercises/vecs/README.md
rename to exercises/05_vecs/README.md
diff --git a/exercises/vecs/vecs1.rs b/exercises/05_vecs/vecs1.rs
similarity index 100%
rename from exercises/vecs/vecs1.rs
rename to exercises/05_vecs/vecs1.rs
diff --git a/exercises/vecs/vecs2.rs b/exercises/05_vecs/vecs2.rs
similarity index 100%
rename from exercises/vecs/vecs2.rs
rename to exercises/05_vecs/vecs2.rs
diff --git a/exercises/move_semantics/README.md b/exercises/06_move_semantics/README.md
similarity index 100%
rename from exercises/move_semantics/README.md
rename to exercises/06_move_semantics/README.md
diff --git a/exercises/move_semantics/move_semantics1.rs b/exercises/06_move_semantics/move_semantics1.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics1.rs
rename to exercises/06_move_semantics/move_semantics1.rs
diff --git a/exercises/move_semantics/move_semantics2.rs b/exercises/06_move_semantics/move_semantics2.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics2.rs
rename to exercises/06_move_semantics/move_semantics2.rs
diff --git a/exercises/move_semantics/move_semantics3.rs b/exercises/06_move_semantics/move_semantics3.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics3.rs
rename to exercises/06_move_semantics/move_semantics3.rs
diff --git a/exercises/move_semantics/move_semantics4.rs b/exercises/06_move_semantics/move_semantics4.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics4.rs
rename to exercises/06_move_semantics/move_semantics4.rs
diff --git a/exercises/move_semantics/move_semantics5.rs b/exercises/06_move_semantics/move_semantics5.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics5.rs
rename to exercises/06_move_semantics/move_semantics5.rs
diff --git a/exercises/move_semantics/move_semantics6.rs b/exercises/06_move_semantics/move_semantics6.rs
similarity index 100%
rename from exercises/move_semantics/move_semantics6.rs
rename to exercises/06_move_semantics/move_semantics6.rs
diff --git a/exercises/structs/README.md b/exercises/07_structs/README.md
similarity index 100%
rename from exercises/structs/README.md
rename to exercises/07_structs/README.md
diff --git a/exercises/structs/structs1.rs b/exercises/07_structs/structs1.rs
similarity index 100%
rename from exercises/structs/structs1.rs
rename to exercises/07_structs/structs1.rs
diff --git a/exercises/structs/structs2.rs b/exercises/07_structs/structs2.rs
similarity index 100%
rename from exercises/structs/structs2.rs
rename to exercises/07_structs/structs2.rs
diff --git a/exercises/structs/structs3.rs b/exercises/07_structs/structs3.rs
similarity index 100%
rename from exercises/structs/structs3.rs
rename to exercises/07_structs/structs3.rs
diff --git a/exercises/enums/README.md b/exercises/08_enums/README.md
similarity index 100%
rename from exercises/enums/README.md
rename to exercises/08_enums/README.md
diff --git a/exercises/enums/enums1.rs b/exercises/08_enums/enums1.rs
similarity index 100%
rename from exercises/enums/enums1.rs
rename to exercises/08_enums/enums1.rs
diff --git a/exercises/enums/enums2.rs b/exercises/08_enums/enums2.rs
similarity index 100%
rename from exercises/enums/enums2.rs
rename to exercises/08_enums/enums2.rs
diff --git a/exercises/enums/enums3.rs b/exercises/08_enums/enums3.rs
similarity index 100%
rename from exercises/enums/enums3.rs
rename to exercises/08_enums/enums3.rs
diff --git a/exercises/strings/README.md b/exercises/09_strings/README.md
similarity index 100%
rename from exercises/strings/README.md
rename to exercises/09_strings/README.md
diff --git a/exercises/strings/strings1.rs b/exercises/09_strings/strings1.rs
similarity index 100%
rename from exercises/strings/strings1.rs
rename to exercises/09_strings/strings1.rs
diff --git a/exercises/strings/strings2.rs b/exercises/09_strings/strings2.rs
similarity index 100%
rename from exercises/strings/strings2.rs
rename to exercises/09_strings/strings2.rs
diff --git a/exercises/strings/strings3.rs b/exercises/09_strings/strings3.rs
similarity index 100%
rename from exercises/strings/strings3.rs
rename to exercises/09_strings/strings3.rs
diff --git a/exercises/strings/strings4.rs b/exercises/09_strings/strings4.rs
similarity index 100%
rename from exercises/strings/strings4.rs
rename to exercises/09_strings/strings4.rs
diff --git a/exercises/modules/README.md b/exercises/10_modules/README.md
similarity index 100%
rename from exercises/modules/README.md
rename to exercises/10_modules/README.md
diff --git a/exercises/modules/modules1.rs b/exercises/10_modules/modules1.rs
similarity index 100%
rename from exercises/modules/modules1.rs
rename to exercises/10_modules/modules1.rs
diff --git a/exercises/modules/modules2.rs b/exercises/10_modules/modules2.rs
similarity index 100%
rename from exercises/modules/modules2.rs
rename to exercises/10_modules/modules2.rs
diff --git a/exercises/modules/modules3.rs b/exercises/10_modules/modules3.rs
similarity index 100%
rename from exercises/modules/modules3.rs
rename to exercises/10_modules/modules3.rs
diff --git a/exercises/hashmaps/README.md b/exercises/11_hashmaps/README.md
similarity index 100%
rename from exercises/hashmaps/README.md
rename to exercises/11_hashmaps/README.md
diff --git a/exercises/hashmaps/hashmaps1.rs b/exercises/11_hashmaps/hashmaps1.rs
similarity index 100%
rename from exercises/hashmaps/hashmaps1.rs
rename to exercises/11_hashmaps/hashmaps1.rs
diff --git a/exercises/hashmaps/hashmaps2.rs b/exercises/11_hashmaps/hashmaps2.rs
similarity index 100%
rename from exercises/hashmaps/hashmaps2.rs
rename to exercises/11_hashmaps/hashmaps2.rs
diff --git a/exercises/hashmaps/hashmaps3.rs b/exercises/11_hashmaps/hashmaps3.rs
similarity index 100%
rename from exercises/hashmaps/hashmaps3.rs
rename to exercises/11_hashmaps/hashmaps3.rs
diff --git a/exercises/options/README.md b/exercises/12_options/README.md
similarity index 100%
rename from exercises/options/README.md
rename to exercises/12_options/README.md
diff --git a/exercises/options/options1.rs b/exercises/12_options/options1.rs
similarity index 100%
rename from exercises/options/options1.rs
rename to exercises/12_options/options1.rs
diff --git a/exercises/options/options2.rs b/exercises/12_options/options2.rs
similarity index 100%
rename from exercises/options/options2.rs
rename to exercises/12_options/options2.rs
diff --git a/exercises/options/options3.rs b/exercises/12_options/options3.rs
similarity index 100%
rename from exercises/options/options3.rs
rename to exercises/12_options/options3.rs
diff --git a/exercises/error_handling/README.md b/exercises/13_error_handling/README.md
similarity index 100%
rename from exercises/error_handling/README.md
rename to exercises/13_error_handling/README.md
diff --git a/exercises/error_handling/errors1.rs b/exercises/13_error_handling/errors1.rs
similarity index 100%
rename from exercises/error_handling/errors1.rs
rename to exercises/13_error_handling/errors1.rs
diff --git a/exercises/error_handling/errors2.rs b/exercises/13_error_handling/errors2.rs
similarity index 100%
rename from exercises/error_handling/errors2.rs
rename to exercises/13_error_handling/errors2.rs
diff --git a/exercises/error_handling/errors3.rs b/exercises/13_error_handling/errors3.rs
similarity index 100%
rename from exercises/error_handling/errors3.rs
rename to exercises/13_error_handling/errors3.rs
diff --git a/exercises/error_handling/errors4.rs b/exercises/13_error_handling/errors4.rs
similarity index 100%
rename from exercises/error_handling/errors4.rs
rename to exercises/13_error_handling/errors4.rs
diff --git a/exercises/error_handling/errors5.rs b/exercises/13_error_handling/errors5.rs
similarity index 100%
rename from exercises/error_handling/errors5.rs
rename to exercises/13_error_handling/errors5.rs
diff --git a/exercises/error_handling/errors6.rs b/exercises/13_error_handling/errors6.rs
similarity index 100%
rename from exercises/error_handling/errors6.rs
rename to exercises/13_error_handling/errors6.rs
diff --git a/exercises/generics/README.md b/exercises/14_generics/README.md
similarity index 100%
rename from exercises/generics/README.md
rename to exercises/14_generics/README.md
diff --git a/exercises/generics/generics1.rs b/exercises/14_generics/generics1.rs
similarity index 100%
rename from exercises/generics/generics1.rs
rename to exercises/14_generics/generics1.rs
diff --git a/exercises/generics/generics2.rs b/exercises/14_generics/generics2.rs
similarity index 100%
rename from exercises/generics/generics2.rs
rename to exercises/14_generics/generics2.rs
diff --git a/exercises/traits/README.md b/exercises/15_traits/README.md
similarity index 100%
rename from exercises/traits/README.md
rename to exercises/15_traits/README.md
diff --git a/exercises/traits/traits1.rs b/exercises/15_traits/traits1.rs
similarity index 100%
rename from exercises/traits/traits1.rs
rename to exercises/15_traits/traits1.rs
diff --git a/exercises/traits/traits2.rs b/exercises/15_traits/traits2.rs
similarity index 100%
rename from exercises/traits/traits2.rs
rename to exercises/15_traits/traits2.rs
diff --git a/exercises/traits/traits3.rs b/exercises/15_traits/traits3.rs
similarity index 100%
rename from exercises/traits/traits3.rs
rename to exercises/15_traits/traits3.rs
diff --git a/exercises/traits/traits4.rs b/exercises/15_traits/traits4.rs
similarity index 100%
rename from exercises/traits/traits4.rs
rename to exercises/15_traits/traits4.rs
diff --git a/exercises/traits/traits5.rs b/exercises/15_traits/traits5.rs
similarity index 100%
rename from exercises/traits/traits5.rs
rename to exercises/15_traits/traits5.rs
diff --git a/exercises/lifetimes/README.md b/exercises/16_lifetimes/README.md
similarity index 100%
rename from exercises/lifetimes/README.md
rename to exercises/16_lifetimes/README.md
diff --git a/exercises/lifetimes/lifetimes1.rs b/exercises/16_lifetimes/lifetimes1.rs
similarity index 100%
rename from exercises/lifetimes/lifetimes1.rs
rename to exercises/16_lifetimes/lifetimes1.rs
diff --git a/exercises/lifetimes/lifetimes2.rs b/exercises/16_lifetimes/lifetimes2.rs
similarity index 100%
rename from exercises/lifetimes/lifetimes2.rs
rename to exercises/16_lifetimes/lifetimes2.rs
diff --git a/exercises/lifetimes/lifetimes3.rs b/exercises/16_lifetimes/lifetimes3.rs
similarity index 100%
rename from exercises/lifetimes/lifetimes3.rs
rename to exercises/16_lifetimes/lifetimes3.rs
diff --git a/exercises/tests/README.md b/exercises/17_tests/README.md
similarity index 100%
rename from exercises/tests/README.md
rename to exercises/17_tests/README.md
diff --git a/exercises/tests/tests1.rs b/exercises/17_tests/tests1.rs
similarity index 100%
rename from exercises/tests/tests1.rs
rename to exercises/17_tests/tests1.rs
diff --git a/exercises/tests/tests2.rs b/exercises/17_tests/tests2.rs
similarity index 100%
rename from exercises/tests/tests2.rs
rename to exercises/17_tests/tests2.rs
diff --git a/exercises/tests/tests3.rs b/exercises/17_tests/tests3.rs
similarity index 100%
rename from exercises/tests/tests3.rs
rename to exercises/17_tests/tests3.rs