diff --git a/Accumulate/AccumulateExample.elm b/exercises/accumulate/Accumulate.example
similarity index 100%
rename from Accumulate/AccumulateExample.elm
rename to exercises/accumulate/Accumulate.example
diff --git a/Accumulate/AccumulateTest.elm b/exercises/accumulate/AccumulateTests.elm
similarity index 100%
rename from Accumulate/AccumulateTest.elm
rename to exercises/accumulate/AccumulateTests.elm
diff --git a/GradeSchool/GradeSchoolExample.elm b/exercises/grade-school/GradeSchool.example
similarity index 100%
rename from GradeSchool/GradeSchoolExample.elm
rename to exercises/grade-school/GradeSchool.example
diff --git a/GradeSchool/GradeSchoolTest.elm b/exercises/grade-school/GradeSchoolTests.elm
similarity index 100%
rename from GradeSchool/GradeSchoolTest.elm
rename to exercises/grade-school/GradeSchoolTests.elm
diff --git a/NucleotideCount/NucleotideCountExample.elm b/exercises/nucleotide-count/NucleotideCount.example
similarity index 100%
rename from NucleotideCount/NucleotideCountExample.elm
rename to exercises/nucleotide-count/NucleotideCount.example
diff --git a/NucleotideCount/NucleotideCountTest.elm b/exercises/nucleotide-count/NucleotideCountTests.elm
similarity index 100%
rename from NucleotideCount/NucleotideCountTest.elm
rename to exercises/nucleotide-count/NucleotideCountTests.elm
diff --git a/PhoneNumber/PhoneNumberExample.elm b/exercises/phone-number/PhoneNumber.examples
similarity index 100%
rename from PhoneNumber/PhoneNumberExample.elm
rename to exercises/phone-number/PhoneNumber.examples
diff --git a/PhoneNumber/PhoneNumberTest.elm b/exercises/phone-number/PhoneNumberTests.elm
similarity index 100%
rename from PhoneNumber/PhoneNumberTest.elm
rename to exercises/phone-number/PhoneNumberTests.elm
diff --git a/SpaceAge/SpaceAgeExample.elm b/exercises/space-age/SpaceAge.example
similarity index 100%
rename from SpaceAge/SpaceAgeExample.elm
rename to exercises/space-age/SpaceAge.example
diff --git a/SpaceAge/SpaceAgeTest.elm b/exercises/space-age/SpaceAgeTests.elm
similarity index 100%
rename from SpaceAge/SpaceAgeTest.elm
rename to exercises/space-age/SpaceAgeTests.elm
diff --git a/Strain/StrainExample.elm b/exercises/strain/Strain.example
similarity index 100%
rename from Strain/StrainExample.elm
rename to exercises/strain/Strain.example
diff --git a/Strain/StrainTest.elm b/exercises/strain/StrainTests.elm
similarity index 100%
rename from Strain/StrainTest.elm
rename to exercises/strain/StrainTests.elm
diff --git a/Sublist/SublistExample.elm b/exercises/sublist/Sublist.example
similarity index 100%
rename from Sublist/SublistExample.elm
rename to exercises/sublist/Sublist.example
diff --git a/Sublist/SublistTest.elm b/exercises/sublist/SublistTests.elm
similarity index 100%
rename from Sublist/SublistTest.elm
rename to exercises/sublist/SublistTests.elm
diff --git a/SumOfMultiples/SumOfMultiplesExample.elm b/exercises/sum-of-multiples/SumOfMultiples.example
similarity index 100%
rename from SumOfMultiples/SumOfMultiplesExample.elm
rename to exercises/sum-of-multiples/SumOfMultiples.example
diff --git a/SumOfMultiples/SumOfMultiplesTest.elm b/exercises/sum-of-multiples/SumOfMultiplesTests.elm
similarity index 100%
rename from SumOfMultiples/SumOfMultiplesTest.elm
rename to exercises/sum-of-multiples/SumOfMultiplesTests.elm