diff --git a/unit-testing/katas-tdd/calculator/README.md b/challenges/unit-testing/katas-tdd/calculator/README.md
similarity index 100%
rename from unit-testing/katas-tdd/calculator/README.md
rename to challenges/unit-testing/katas-tdd/calculator/README.md
diff --git a/unit-testing/katas-tdd/password-verifier/README.md b/challenges/unit-testing/katas-tdd/password-verifier/README.md
similarity index 100%
rename from unit-testing/katas-tdd/password-verifier/README.md
rename to challenges/unit-testing/katas-tdd/password-verifier/README.md
diff --git a/unit-testing/katas-tdd/roman-numerals/README.md b/challenges/unit-testing/katas-tdd/roman-numerals/README.md
similarity index 100%
rename from unit-testing/katas-tdd/roman-numerals/README.md
rename to challenges/unit-testing/katas-tdd/roman-numerals/README.md
diff --git a/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.js b/challenges/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.js
similarity index 100%
rename from unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.js
rename to challenges/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.js
diff --git a/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.test.js b/challenges/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.test.js
similarity index 100%
rename from unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.test.js
rename to challenges/unit-testing/katas-tdd/roman-numerals/convert-to-new-roman.test.js
diff --git a/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.js b/challenges/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.js
similarity index 100%
rename from unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.js
rename to challenges/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.js
diff --git a/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.test.js b/challenges/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.test.js
similarity index 100%
rename from unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.test.js
rename to challenges/unit-testing/katas-tdd/roman-numerals/convert-to-old-roman.test.js
diff --git a/unit-testing/passing-tests/car-sales/car-sales.js b/challenges/unit-testing/passing-tests/car-sales/car-sales.js
similarity index 100%
rename from unit-testing/passing-tests/car-sales/car-sales.js
rename to challenges/unit-testing/passing-tests/car-sales/car-sales.js
diff --git a/unit-testing/passing-tests/car-sales/car-sales.test.js b/challenges/unit-testing/passing-tests/car-sales/car-sales.test.js
similarity index 100%
rename from unit-testing/passing-tests/car-sales/car-sales.test.js
rename to challenges/unit-testing/passing-tests/car-sales/car-sales.test.js
diff --git a/unit-testing/passing-tests/factorial/factorial.js b/challenges/unit-testing/passing-tests/factorial/factorial.js
similarity index 100%
rename from unit-testing/passing-tests/factorial/factorial.js
rename to challenges/unit-testing/passing-tests/factorial/factorial.js
diff --git a/unit-testing/passing-tests/factorial/factorial.test.js b/challenges/unit-testing/passing-tests/factorial/factorial.test.js
similarity index 100%
rename from unit-testing/passing-tests/factorial/factorial.test.js
rename to challenges/unit-testing/passing-tests/factorial/factorial.test.js
diff --git a/unit-testing/passing-tests/get-average/get-average.js b/challenges/unit-testing/passing-tests/get-average/get-average.js
similarity index 100%
rename from unit-testing/passing-tests/get-average/get-average.js
rename to challenges/unit-testing/passing-tests/get-average/get-average.js
diff --git a/unit-testing/passing-tests/get-average/get-average.test.js b/challenges/unit-testing/passing-tests/get-average/get-average.test.js
similarity index 100%
rename from unit-testing/passing-tests/get-average/get-average.test.js
rename to challenges/unit-testing/passing-tests/get-average/get-average.test.js
diff --git a/unit-testing/writing-tests/largest-number/largest-number.js b/challenges/unit-testing/writing-tests/largest-number/largest-number.js
similarity index 100%
rename from unit-testing/writing-tests/largest-number/largest-number.js
rename to challenges/unit-testing/writing-tests/largest-number/largest-number.js
diff --git a/unit-testing/writing-tests/largest-number/largest-number.test.js b/challenges/unit-testing/writing-tests/largest-number/largest-number.test.js
similarity index 100%
rename from unit-testing/writing-tests/largest-number/largest-number.test.js
rename to challenges/unit-testing/writing-tests/largest-number/largest-number.test.js
diff --git a/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.js b/challenges/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.js
similarity index 100%
rename from unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.js
rename to challenges/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.js
diff --git a/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.test.js b/challenges/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.test.js
similarity index 100%
rename from unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.test.js
rename to challenges/unit-testing/writing-tests/remove-vowels/remove-vowels-in-array.test.js
diff --git a/unit-testing/writing-tests/remove-vowels/remove-vowels.js b/challenges/unit-testing/writing-tests/remove-vowels/remove-vowels.js
similarity index 100%
rename from unit-testing/writing-tests/remove-vowels/remove-vowels.js
rename to challenges/unit-testing/writing-tests/remove-vowels/remove-vowels.js
diff --git a/debugging/using-the-debugger/readme.md b/debugging/using-the-debugger/readme.md
deleted file mode 100644
index 2efe57a..0000000
--- a/debugging/using-the-debugger/readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Using the Debugger
-
-The Chrome Debugger is a key tool you can use to find bugs in your code.
-
-You should complete this online tutorial to get some experience using it.
-
-https://developers.google.com/web/tools/chrome-devtools/javascript
diff --git a/fetch/using-fetch/exercise.js b/fetch/using-fetch/exercise.js
deleted file mode 100644
index 34be09e..0000000
--- a/fetch/using-fetch/exercise.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Use fetch to load a greeting from the API and display it 
-in the HTML element with the id "greeting-text".
-
-API: https://codeyourfuture.herokuapp.com/api/greetings
-Response: A greeting in a random language
-
-To learn more about fetch, refer to the doc:
-https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch
-
-
-================
-Expected result
-================
-
-Open index.html in your browser. Every time you refresh the page,
-a different greeting should be displayed in the box.
-*/
-
-fetch("*** Write the API address here ***")
-  .then(function (response) {
-    return response.text();
-  })
-  .then(function (greeting) {
-    // Write the code to display the greeting text here
-  });
diff --git a/fetch/using-fetch/index.html b/fetch/using-fetch/index.html
deleted file mode 100644
index b05b454..0000000
--- a/fetch/using-fetch/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <title>CodeYourFuture - Fetch</title>
-    <meta name="description" content="Introduction to Fetch" />
-    <meta name="author" content="CodeYourFuture" />
-    <style>
-      #greeting-text {
-        font-size: 20px;
-        border: 1px solid #ccc;
-        background-color: #ddd;
-        width: 20%;
-        text-align: center;
-        margin: 0 50px;
-        padding: 30px;
-      }
-    </style>
-  </head>
-
-  <body>
-    <h1>A greeting in a random language...</h1>
-    <p id="greeting-text"></p>
-
-    <script src="exercise.js"></script>
-  </body>
-</html>