diff --git a/foundations/01_helloWorld/README.md b/foundations/data_types_and_conditionals/01_helloWorld/README.md similarity index 100% rename from foundations/01_helloWorld/README.md rename to foundations/data_types_and_conditionals/01_helloWorld/README.md diff --git a/foundations/01_helloWorld/helloWorld.js b/foundations/data_types_and_conditionals/01_helloWorld/helloWorld.js similarity index 100% rename from foundations/01_helloWorld/helloWorld.js rename to foundations/data_types_and_conditionals/01_helloWorld/helloWorld.js diff --git a/foundations/01_helloWorld/helloWorld.spec.js b/foundations/data_types_and_conditionals/01_helloWorld/helloWorld.spec.js similarity index 100% rename from foundations/01_helloWorld/helloWorld.spec.js rename to foundations/data_types_and_conditionals/01_helloWorld/helloWorld.spec.js diff --git a/foundations/01_helloWorld/solution/helloWorld-solution.js b/foundations/data_types_and_conditionals/01_helloWorld/solution/helloWorld-solution.js similarity index 100% rename from foundations/01_helloWorld/solution/helloWorld-solution.js rename to foundations/data_types_and_conditionals/01_helloWorld/solution/helloWorld-solution.js diff --git a/foundations/01_helloWorld/solution/helloWorld-solution.spec.js b/foundations/data_types_and_conditionals/01_helloWorld/solution/helloWorld-solution.spec.js similarity index 100% rename from foundations/01_helloWorld/solution/helloWorld-solution.spec.js rename to foundations/data_types_and_conditionals/01_helloWorld/solution/helloWorld-solution.spec.js diff --git a/foundations/02_addNumbers/README.md b/foundations/data_types_and_conditionals/02_addNumbers/README.md similarity index 100% rename from foundations/02_addNumbers/README.md rename to foundations/data_types_and_conditionals/02_addNumbers/README.md diff --git a/foundations/02_addNumbers/addNumbers.js b/foundations/data_types_and_conditionals/02_addNumbers/addNumbers.js similarity index 100% rename from foundations/02_addNumbers/addNumbers.js rename to foundations/data_types_and_conditionals/02_addNumbers/addNumbers.js diff --git a/foundations/02_addNumbers/addNumbers.spec.js b/foundations/data_types_and_conditionals/02_addNumbers/addNumbers.spec.js similarity index 100% rename from foundations/02_addNumbers/addNumbers.spec.js rename to foundations/data_types_and_conditionals/02_addNumbers/addNumbers.spec.js diff --git a/foundations/02_addNumbers/solution/addNumbers-solution.js b/foundations/data_types_and_conditionals/02_addNumbers/solution/addNumbers-solution.js similarity index 100% rename from foundations/02_addNumbers/solution/addNumbers-solution.js rename to foundations/data_types_and_conditionals/02_addNumbers/solution/addNumbers-solution.js diff --git a/foundations/02_addNumbers/solution/addNumbers-solution.spec.js b/foundations/data_types_and_conditionals/02_addNumbers/solution/addNumbers-solution.spec.js similarity index 100% rename from foundations/02_addNumbers/solution/addNumbers-solution.spec.js rename to foundations/data_types_and_conditionals/02_addNumbers/solution/addNumbers-solution.spec.js diff --git a/foundations/03_numberChecker/README.md b/foundations/data_types_and_conditionals/03_numberChecker/README.md similarity index 100% rename from foundations/03_numberChecker/README.md rename to foundations/data_types_and_conditionals/03_numberChecker/README.md diff --git a/foundations/03_numberChecker/numberChecker.js b/foundations/data_types_and_conditionals/03_numberChecker/numberChecker.js similarity index 100% rename from foundations/03_numberChecker/numberChecker.js rename to foundations/data_types_and_conditionals/03_numberChecker/numberChecker.js diff --git a/foundations/03_numberChecker/numberChecker.spec.js b/foundations/data_types_and_conditionals/03_numberChecker/numberChecker.spec.js similarity index 100% rename from foundations/03_numberChecker/numberChecker.spec.js rename to foundations/data_types_and_conditionals/03_numberChecker/numberChecker.spec.js diff --git a/foundations/03_numberChecker/solution/numberChecker-solution.js b/foundations/data_types_and_conditionals/03_numberChecker/solution/numberChecker-solution.js similarity index 100% rename from foundations/03_numberChecker/solution/numberChecker-solution.js rename to foundations/data_types_and_conditionals/03_numberChecker/solution/numberChecker-solution.js diff --git a/foundations/03_numberChecker/solution/numberChecker-solution.spec.js b/foundations/data_types_and_conditionals/03_numberChecker/solution/numberChecker-solution.spec.js similarity index 100% rename from foundations/03_numberChecker/solution/numberChecker-solution.spec.js rename to foundations/data_types_and_conditionals/03_numberChecker/solution/numberChecker-solution.spec.js diff --git a/foundations/04_mathEquations/README.md b/foundations/data_types_and_conditionals/04_mathEquations/README.md similarity index 100% rename from foundations/04_mathEquations/README.md rename to foundations/data_types_and_conditionals/04_mathEquations/README.md diff --git a/foundations/04_mathEquations/mathEquations.js b/foundations/data_types_and_conditionals/04_mathEquations/mathEquations.js similarity index 100% rename from foundations/04_mathEquations/mathEquations.js rename to foundations/data_types_and_conditionals/04_mathEquations/mathEquations.js diff --git a/foundations/04_mathEquations/mathEquations.spec.js b/foundations/data_types_and_conditionals/04_mathEquations/mathEquations.spec.js similarity index 100% rename from foundations/04_mathEquations/mathEquations.spec.js rename to foundations/data_types_and_conditionals/04_mathEquations/mathEquations.spec.js diff --git a/foundations/04_mathEquations/solution/mathEquations-solution.js b/foundations/data_types_and_conditionals/04_mathEquations/solution/mathEquations-solution.js similarity index 100% rename from foundations/04_mathEquations/solution/mathEquations-solution.js rename to foundations/data_types_and_conditionals/04_mathEquations/solution/mathEquations-solution.js diff --git a/foundations/04_mathEquations/solution/mathEquations-solution.spec.js b/foundations/data_types_and_conditionals/04_mathEquations/solution/mathEquations-solution.spec.js similarity index 100% rename from foundations/04_mathEquations/solution/mathEquations-solution.spec.js rename to foundations/data_types_and_conditionals/04_mathEquations/solution/mathEquations-solution.spec.js diff --git a/foundations/05_joinStrings/README.md b/foundations/data_types_and_conditionals/05_joinStrings/README.md similarity index 100% rename from foundations/05_joinStrings/README.md rename to foundations/data_types_and_conditionals/05_joinStrings/README.md diff --git a/foundations/05_joinStrings/joinStrings-example.js b/foundations/data_types_and_conditionals/05_joinStrings/joinStrings-example.js similarity index 100% rename from foundations/05_joinStrings/joinStrings-example.js rename to foundations/data_types_and_conditionals/05_joinStrings/joinStrings-example.js diff --git a/foundations/05_joinStrings/joinStrings-example.spec.js b/foundations/data_types_and_conditionals/05_joinStrings/joinStrings-example.spec.js similarity index 100% rename from foundations/05_joinStrings/joinStrings-example.spec.js rename to foundations/data_types_and_conditionals/05_joinStrings/joinStrings-example.spec.js diff --git a/foundations/05_joinStrings/joinStrings.js b/foundations/data_types_and_conditionals/05_joinStrings/joinStrings.js similarity index 100% rename from foundations/05_joinStrings/joinStrings.js rename to foundations/data_types_and_conditionals/05_joinStrings/joinStrings.js diff --git a/foundations/05_joinStrings/joinStrings.spec.js b/foundations/data_types_and_conditionals/05_joinStrings/joinStrings.spec.js similarity index 100% rename from foundations/05_joinStrings/joinStrings.spec.js rename to foundations/data_types_and_conditionals/05_joinStrings/joinStrings.spec.js diff --git a/foundations/05_joinStrings/solution/joinStrings-solution.js b/foundations/data_types_and_conditionals/05_joinStrings/solution/joinStrings-solution.js similarity index 100% rename from foundations/05_joinStrings/solution/joinStrings-solution.js rename to foundations/data_types_and_conditionals/05_joinStrings/solution/joinStrings-solution.js diff --git a/foundations/05_joinStrings/solution/joinStrings-solution.spec.js b/foundations/data_types_and_conditionals/05_joinStrings/solution/joinStrings-solution.spec.js similarity index 100% rename from foundations/05_joinStrings/solution/joinStrings-solution.spec.js rename to foundations/data_types_and_conditionals/05_joinStrings/solution/joinStrings-solution.spec.js diff --git a/foundations/06_repeatString/README.md b/foundations/loops_and_arrays/01_repeatString/README.md similarity index 100% rename from foundations/06_repeatString/README.md rename to foundations/loops_and_arrays/01_repeatString/README.md diff --git a/foundations/06_repeatString/repeatString.js b/foundations/loops_and_arrays/01_repeatString/repeatString.js similarity index 100% rename from foundations/06_repeatString/repeatString.js rename to foundations/loops_and_arrays/01_repeatString/repeatString.js diff --git a/foundations/06_repeatString/repeatString.spec.js b/foundations/loops_and_arrays/01_repeatString/repeatString.spec.js similarity index 100% rename from foundations/06_repeatString/repeatString.spec.js rename to foundations/loops_and_arrays/01_repeatString/repeatString.spec.js diff --git a/foundations/06_repeatString/solution/repeatString-solution.js b/foundations/loops_and_arrays/01_repeatString/solution/repeatString-solution.js similarity index 100% rename from foundations/06_repeatString/solution/repeatString-solution.js rename to foundations/loops_and_arrays/01_repeatString/solution/repeatString-solution.js diff --git a/foundations/06_repeatString/solution/repeatString-solution.spec.js b/foundations/loops_and_arrays/01_repeatString/solution/repeatString-solution.spec.js similarity index 100% rename from foundations/06_repeatString/solution/repeatString-solution.spec.js rename to foundations/loops_and_arrays/01_repeatString/solution/repeatString-solution.spec.js diff --git a/foundations/07_reverseString/README.md b/foundations/loops_and_arrays/02_reverseString/README.md similarity index 100% rename from foundations/07_reverseString/README.md rename to foundations/loops_and_arrays/02_reverseString/README.md diff --git a/foundations/07_reverseString/reverseString.js b/foundations/loops_and_arrays/02_reverseString/reverseString.js similarity index 100% rename from foundations/07_reverseString/reverseString.js rename to foundations/loops_and_arrays/02_reverseString/reverseString.js diff --git a/foundations/07_reverseString/reverseString.spec.js b/foundations/loops_and_arrays/02_reverseString/reverseString.spec.js similarity index 100% rename from foundations/07_reverseString/reverseString.spec.js rename to foundations/loops_and_arrays/02_reverseString/reverseString.spec.js diff --git a/foundations/07_reverseString/solution/reverseString-solution.js b/foundations/loops_and_arrays/02_reverseString/solution/reverseString-solution.js similarity index 100% rename from foundations/07_reverseString/solution/reverseString-solution.js rename to foundations/loops_and_arrays/02_reverseString/solution/reverseString-solution.js diff --git a/foundations/07_reverseString/solution/reverseString-solution.spec.js b/foundations/loops_and_arrays/02_reverseString/solution/reverseString-solution.spec.js similarity index 100% rename from foundations/07_reverseString/solution/reverseString-solution.spec.js rename to foundations/loops_and_arrays/02_reverseString/solution/reverseString-solution.spec.js diff --git a/foundations/08_removeFromArray/README.md b/foundations/loops_and_arrays/03_removeFromArray/README.md similarity index 100% rename from foundations/08_removeFromArray/README.md rename to foundations/loops_and_arrays/03_removeFromArray/README.md diff --git a/foundations/08_removeFromArray/removeFromArray.js b/foundations/loops_and_arrays/03_removeFromArray/removeFromArray.js similarity index 100% rename from foundations/08_removeFromArray/removeFromArray.js rename to foundations/loops_and_arrays/03_removeFromArray/removeFromArray.js diff --git a/foundations/08_removeFromArray/removeFromArray.spec.js b/foundations/loops_and_arrays/03_removeFromArray/removeFromArray.spec.js similarity index 100% rename from foundations/08_removeFromArray/removeFromArray.spec.js rename to foundations/loops_and_arrays/03_removeFromArray/removeFromArray.spec.js diff --git a/foundations/08_removeFromArray/solution/removeFromArray-solution.js b/foundations/loops_and_arrays/03_removeFromArray/solution/removeFromArray-solution.js similarity index 100% rename from foundations/08_removeFromArray/solution/removeFromArray-solution.js rename to foundations/loops_and_arrays/03_removeFromArray/solution/removeFromArray-solution.js diff --git a/foundations/08_removeFromArray/solution/removeFromArray-solution.spec.js b/foundations/loops_and_arrays/03_removeFromArray/solution/removeFromArray-solution.spec.js similarity index 100% rename from foundations/08_removeFromArray/solution/removeFromArray-solution.spec.js rename to foundations/loops_and_arrays/03_removeFromArray/solution/removeFromArray-solution.spec.js diff --git a/foundations/09_sumAll/README.md b/foundations/loops_and_arrays/04_sumAll/README.md similarity index 100% rename from foundations/09_sumAll/README.md rename to foundations/loops_and_arrays/04_sumAll/README.md diff --git a/foundations/09_sumAll/solution/sumAll-solution.js b/foundations/loops_and_arrays/04_sumAll/solution/sumAll-solution.js similarity index 100% rename from foundations/09_sumAll/solution/sumAll-solution.js rename to foundations/loops_and_arrays/04_sumAll/solution/sumAll-solution.js diff --git a/foundations/09_sumAll/solution/sumAll-solution.spec.js b/foundations/loops_and_arrays/04_sumAll/solution/sumAll-solution.spec.js similarity index 100% rename from foundations/09_sumAll/solution/sumAll-solution.spec.js rename to foundations/loops_and_arrays/04_sumAll/solution/sumAll-solution.spec.js diff --git a/foundations/09_sumAll/sumAll.js b/foundations/loops_and_arrays/04_sumAll/sumAll.js similarity index 100% rename from foundations/09_sumAll/sumAll.js rename to foundations/loops_and_arrays/04_sumAll/sumAll.js diff --git a/foundations/09_sumAll/sumAll.spec.js b/foundations/loops_and_arrays/04_sumAll/sumAll.spec.js similarity index 100% rename from foundations/09_sumAll/sumAll.spec.js rename to foundations/loops_and_arrays/04_sumAll/sumAll.spec.js diff --git a/foundations/10_leapYears/README.md b/foundations/loops_and_arrays/05_leapYears/README.md similarity index 100% rename from foundations/10_leapYears/README.md rename to foundations/loops_and_arrays/05_leapYears/README.md diff --git a/foundations/10_leapYears/leapYears.js b/foundations/loops_and_arrays/05_leapYears/leapYears.js similarity index 100% rename from foundations/10_leapYears/leapYears.js rename to foundations/loops_and_arrays/05_leapYears/leapYears.js diff --git a/foundations/10_leapYears/leapYears.spec.js b/foundations/loops_and_arrays/05_leapYears/leapYears.spec.js similarity index 100% rename from foundations/10_leapYears/leapYears.spec.js rename to foundations/loops_and_arrays/05_leapYears/leapYears.spec.js diff --git a/foundations/10_leapYears/solution/leapYears-solution.js b/foundations/loops_and_arrays/05_leapYears/solution/leapYears-solution.js similarity index 100% rename from foundations/10_leapYears/solution/leapYears-solution.js rename to foundations/loops_and_arrays/05_leapYears/solution/leapYears-solution.js diff --git a/foundations/10_leapYears/solution/leapYears-solution.spec.js b/foundations/loops_and_arrays/05_leapYears/solution/leapYears-solution.spec.js similarity index 100% rename from foundations/10_leapYears/solution/leapYears-solution.spec.js rename to foundations/loops_and_arrays/05_leapYears/solution/leapYears-solution.spec.js diff --git a/foundations/11_tempConversion/README.md b/foundations/loops_and_arrays/06_tempConversion/README.md similarity index 100% rename from foundations/11_tempConversion/README.md rename to foundations/loops_and_arrays/06_tempConversion/README.md diff --git a/foundations/11_tempConversion/solution/tempConversion-solution.js b/foundations/loops_and_arrays/06_tempConversion/solution/tempConversion-solution.js similarity index 100% rename from foundations/11_tempConversion/solution/tempConversion-solution.js rename to foundations/loops_and_arrays/06_tempConversion/solution/tempConversion-solution.js diff --git a/foundations/11_tempConversion/solution/tempConversion-solution.spec.js b/foundations/loops_and_arrays/06_tempConversion/solution/tempConversion-solution.spec.js similarity index 100% rename from foundations/11_tempConversion/solution/tempConversion-solution.spec.js rename to foundations/loops_and_arrays/06_tempConversion/solution/tempConversion-solution.spec.js diff --git a/foundations/11_tempConversion/tempConversion.js b/foundations/loops_and_arrays/06_tempConversion/tempConversion.js similarity index 100% rename from foundations/11_tempConversion/tempConversion.js rename to foundations/loops_and_arrays/06_tempConversion/tempConversion.js diff --git a/foundations/11_tempConversion/tempConversion.spec.js b/foundations/loops_and_arrays/06_tempConversion/tempConversion.spec.js similarity index 100% rename from foundations/11_tempConversion/tempConversion.spec.js rename to foundations/loops_and_arrays/06_tempConversion/tempConversion.spec.js diff --git a/foundations/12_calculator/README.md b/foundations/object_basics/01_calculator/README.md similarity index 100% rename from foundations/12_calculator/README.md rename to foundations/object_basics/01_calculator/README.md diff --git a/foundations/12_calculator/calculator.js b/foundations/object_basics/01_calculator/calculator.js similarity index 100% rename from foundations/12_calculator/calculator.js rename to foundations/object_basics/01_calculator/calculator.js diff --git a/foundations/12_calculator/calculator.spec.js b/foundations/object_basics/01_calculator/calculator.spec.js similarity index 100% rename from foundations/12_calculator/calculator.spec.js rename to foundations/object_basics/01_calculator/calculator.spec.js diff --git a/foundations/12_calculator/solution/calculator-solution.js b/foundations/object_basics/01_calculator/solution/calculator-solution.js similarity index 100% rename from foundations/12_calculator/solution/calculator-solution.js rename to foundations/object_basics/01_calculator/solution/calculator-solution.js diff --git a/foundations/12_calculator/solution/calculator-solution.spec.js b/foundations/object_basics/01_calculator/solution/calculator-solution.spec.js similarity index 100% rename from foundations/12_calculator/solution/calculator-solution.spec.js rename to foundations/object_basics/01_calculator/solution/calculator-solution.spec.js diff --git a/foundations/13_palindromes/README.md b/foundations/object_basics/02_palindromes/README.md similarity index 100% rename from foundations/13_palindromes/README.md rename to foundations/object_basics/02_palindromes/README.md diff --git a/foundations/13_palindromes/palindromes.js b/foundations/object_basics/02_palindromes/palindromes.js similarity index 100% rename from foundations/13_palindromes/palindromes.js rename to foundations/object_basics/02_palindromes/palindromes.js diff --git a/foundations/13_palindromes/palindromes.spec.js b/foundations/object_basics/02_palindromes/palindromes.spec.js similarity index 100% rename from foundations/13_palindromes/palindromes.spec.js rename to foundations/object_basics/02_palindromes/palindromes.spec.js diff --git a/foundations/13_palindromes/solution/palindromes-solution.js b/foundations/object_basics/02_palindromes/solution/palindromes-solution.js similarity index 100% rename from foundations/13_palindromes/solution/palindromes-solution.js rename to foundations/object_basics/02_palindromes/solution/palindromes-solution.js diff --git a/foundations/13_palindromes/solution/palindromes-solution.spec.js b/foundations/object_basics/02_palindromes/solution/palindromes-solution.spec.js similarity index 100% rename from foundations/13_palindromes/solution/palindromes-solution.spec.js rename to foundations/object_basics/02_palindromes/solution/palindromes-solution.spec.js diff --git a/foundations/14_fibonacci/README.md b/foundations/object_basics/03_fibonacci/README.md similarity index 100% rename from foundations/14_fibonacci/README.md rename to foundations/object_basics/03_fibonacci/README.md diff --git a/foundations/14_fibonacci/fibonacci.js b/foundations/object_basics/03_fibonacci/fibonacci.js similarity index 100% rename from foundations/14_fibonacci/fibonacci.js rename to foundations/object_basics/03_fibonacci/fibonacci.js diff --git a/foundations/14_fibonacci/fibonacci.spec.js b/foundations/object_basics/03_fibonacci/fibonacci.spec.js similarity index 100% rename from foundations/14_fibonacci/fibonacci.spec.js rename to foundations/object_basics/03_fibonacci/fibonacci.spec.js diff --git a/foundations/14_fibonacci/solution/fibonacci-solution.js b/foundations/object_basics/03_fibonacci/solution/fibonacci-solution.js similarity index 100% rename from foundations/14_fibonacci/solution/fibonacci-solution.js rename to foundations/object_basics/03_fibonacci/solution/fibonacci-solution.js diff --git a/foundations/14_fibonacci/solution/fibonacci-solution.spec.js b/foundations/object_basics/03_fibonacci/solution/fibonacci-solution.spec.js similarity index 100% rename from foundations/14_fibonacci/solution/fibonacci-solution.spec.js rename to foundations/object_basics/03_fibonacci/solution/fibonacci-solution.spec.js diff --git a/foundations/15_getTheTitles/README.md b/foundations/object_basics/04_getTheTitles/README.md similarity index 100% rename from foundations/15_getTheTitles/README.md rename to foundations/object_basics/04_getTheTitles/README.md diff --git a/foundations/15_getTheTitles/getTheTitles.js b/foundations/object_basics/04_getTheTitles/getTheTitles.js similarity index 100% rename from foundations/15_getTheTitles/getTheTitles.js rename to foundations/object_basics/04_getTheTitles/getTheTitles.js diff --git a/foundations/15_getTheTitles/getTheTitles.spec.js b/foundations/object_basics/04_getTheTitles/getTheTitles.spec.js similarity index 100% rename from foundations/15_getTheTitles/getTheTitles.spec.js rename to foundations/object_basics/04_getTheTitles/getTheTitles.spec.js diff --git a/foundations/15_getTheTitles/solution/getTheTitles-solution.js b/foundations/object_basics/04_getTheTitles/solution/getTheTitles-solution.js similarity index 100% rename from foundations/15_getTheTitles/solution/getTheTitles-solution.js rename to foundations/object_basics/04_getTheTitles/solution/getTheTitles-solution.js diff --git a/foundations/15_getTheTitles/solution/getTheTitles-solution.spec.js b/foundations/object_basics/04_getTheTitles/solution/getTheTitles-solution.spec.js similarity index 100% rename from foundations/15_getTheTitles/solution/getTheTitles-solution.spec.js rename to foundations/object_basics/04_getTheTitles/solution/getTheTitles-solution.spec.js diff --git a/foundations/16_findTheOldest/README.md b/foundations/object_basics/05_findTheOldest/README.md similarity index 100% rename from foundations/16_findTheOldest/README.md rename to foundations/object_basics/05_findTheOldest/README.md diff --git a/foundations/16_findTheOldest/findTheOldest.js b/foundations/object_basics/05_findTheOldest/findTheOldest.js similarity index 100% rename from foundations/16_findTheOldest/findTheOldest.js rename to foundations/object_basics/05_findTheOldest/findTheOldest.js diff --git a/foundations/16_findTheOldest/findTheOldest.spec.js b/foundations/object_basics/05_findTheOldest/findTheOldest.spec.js similarity index 100% rename from foundations/16_findTheOldest/findTheOldest.spec.js rename to foundations/object_basics/05_findTheOldest/findTheOldest.spec.js diff --git a/foundations/16_findTheOldest/solution/findTheOldest-solution.js b/foundations/object_basics/05_findTheOldest/solution/findTheOldest-solution.js similarity index 100% rename from foundations/16_findTheOldest/solution/findTheOldest-solution.js rename to foundations/object_basics/05_findTheOldest/solution/findTheOldest-solution.js diff --git a/foundations/16_findTheOldest/solution/findTheOldest-solution.spec.js b/foundations/object_basics/05_findTheOldest/solution/findTheOldest-solution.spec.js similarity index 100% rename from foundations/16_findTheOldest/solution/findTheOldest-solution.spec.js rename to foundations/object_basics/05_findTheOldest/solution/findTheOldest-solution.spec.js