diff --git a/future-jquery-ajax-json.json b/challenges/future-jquery-ajax-json.json
similarity index 87%
rename from future-jquery-ajax-json.json
rename to challenges/future-jquery-ajax-json.json
index 2a3a5d9cd7..b50add03fb 100644
--- a/future-jquery-ajax-json.json
+++ b/challenges/future-jquery-ajax-json.json
@@ -1,9 +1,11 @@
 {
-  "name": "jQuery, Ajax and JSON",
+  "name":  "jQuery, Ajax and JSON",
+      "dashedName":  "jQuery, Ajax and JSON",
   "order": 0.004,
   "challenges": [{
       "id": "bad87fee1348bd9acdd08826",
-      "name": "Waypoint: Learn how Script Tags and Document Ready Work",
+      "name":  "Waypoint: Learn how Script Tags and Document Ready Work",
+      "dashedName":  "Waypoint: Learn how Script Tags and Document Ready Work",
       "difficulty": 0.072,
       "description": [
         "We've simplified our Cat Photo App and removed our <code>style</code> element. Add a <code>script</code> element to your page and create a <code>$(document).ready</code> function within it.",
@@ -47,7 +49,8 @@
 
     {
       "id": "bad87fee1348bd9bedc08826",
-      "name": "Waypoint: Target Elements by Selectors Using jQuery",
+      "name":  "Waypoint: Target Elements by Selectors Using jQuery",
+      "dashedName":  "waypoint-target-elements-by-selectors-using-jquery",
       "difficulty": 0.073,
       "description": [
         "Make all <code>img</code> elements bounce $('img').addClass('animated bounce')"
@@ -93,7 +96,8 @@
 
     {
       "id": "bad87fee1348bd9aedc08826",
-      "name": "Waypoint: Target Elements by Class Using jQuery",
+      "name":  "Waypoint: Target Elements by Class Using jQuery",
+      "dashedName":  "waypoint-target-elements-by-class-using-jquery",
       "difficulty": 0.074,
       "description": [
 
@@ -139,7 +143,8 @@
 
     {
       "id": "bad87fee1348bd9aedb08826",
-      "name": "Waypoint: Add an ID to an Element",
+      "name":  "Waypoint: Add an ID to an Element",
+      "dashedName":  "waypoint-add-an-id-to-an-element",
       "difficulty": 0.075,
       "description": [
 
@@ -185,7 +190,8 @@
 
     {
       "id": "bad87fee1348bd9aeda08826",
-      "name": "Waypoint: Target Elements by ID Using jQuery",
+      "name":  "Waypoint: Target Elements by ID Using jQuery",
+      "dashedName":  "waypoint-target-elements-by-id-using-jquery",
       "difficulty": 0.075,
       "description": [
 
@@ -232,7 +238,8 @@
 
     {
       "id": "bad87fee1348bd9aed908826",
-      "name": "Waypoint: Change the CSS of an Element Using jQuery",
+      "name":  "Waypoint: Change the CSS of an Element Using jQuery",
+      "dashedName":  "waypoint-change-the-css-of-an-element-using-jquery",
       "difficulty": 0.076,
       "description": [
 
@@ -280,7 +287,8 @@
 
     {
       "id": "bad87fee1348bd9aed808826",
-      "name": "Waypoint: Disable an Element Using jQuery",
+      "name":  "Waypoint: Disable an Element Using jQuery",
+      "dashedName":  "waypoint-disable-an-element-using-jquery",
       "difficulty": 0.077,
       "description": [
 
@@ -326,7 +334,8 @@
 
     {
       "id": "bad87fee1348bd9aed708826",
-      "name": "Waypoint: Remove an Element Using jQuery",
+      "name":  "Waypoint: Remove an Element Using jQuery",
+      "dashedName":  "waypoint-remove-an-element-using-jquery",
       "difficulty": 0.078,
       "description": [
 
@@ -373,9 +382,16 @@
 
     {
       "id": "bad87fee1348bd9aed608826",
-      "name": "Waypoint: Move an Element Using jQuery",
+      "name":  "Waypoint: Move an Element Using jQuery",
+      "dashedName":  "waypoint-move-an-element-using-jquery",
       "difficulty": 0.079,
       "description": [
+
+      ],
+      "tests": [
+
+      ],
+      "challengeSeed": [
         "fccss",
         "  $(document).ready(function() {",
         "    $('#cat-photo-form').css('background-color', 'gray');",
@@ -408,19 +424,14 @@
         "    </div>",
         "  </div>",
         "</form>"
-      ],
-      "tests": [
-
-      ],
-      "challengeSeed": [
-
       ],
       "challengeType": 0
     },
 
     {
       "id": "bad87fee1348bd9aed508826",
-      "name": "Waypoint: Clone an Element Using jQuery",
+      "name":  "Waypoint: Clone an Element Using jQuery",
+      "dashedName":  "waypoint-clone-an-element-using-jquery",
       "difficulty": 0.080,
       "description": [
 
@@ -436,7 +447,8 @@
 
     {
       "id": "bad87fee1348bd9aed308826",
-      "name": "Waypoint: Target the Parent of an Element Using jQuery",
+      "name":  "Waypoint: Target the Parent of an Element Using jQuery",
+      "dashedName":  "waypoint-target-the-parent-of-an-element-using-jquery",
       "difficulty": 0.082,
       "description": [
 
@@ -452,7 +464,8 @@
 
     {
       "id": "bad87fee1348bd9aed208826",
-      "name": "Waypoint: Target the Children of an Element Using jQuery",
+      "name":  "Waypoint: Target the Children of an Element Using jQuery",
+      "dashedName":  "waypoint-target-the-children-of-an-element-using-jquery",
       "difficulty": 0.083,
       "description": [
 
@@ -469,7 +482,8 @@
 
     {
       "id": "bad87fee1348bd9aed108826",
-      "name": "Waypoint: Target a Specific Child of an Element Using jQuery",
+      "name":  "Waypoint: Target a Specific Child of an Element Using jQuery",
+      "dashedName":  "waypoint-target-a-specific-child-of-an-element-using-jquery",
       "difficulty": 0.084,
       "description": [
 
@@ -485,7 +499,8 @@
 
     {
       "id": "bad87fee1348bd9aed008826",
-      "name": "Waypoint: Target Even Numbered Elements Using jQuery",
+      "name":  "Waypoint: Target Even Numbered Elements Using jQuery",
+      "dashedName":  "waypoint-target-even-numbered-elements-using-jquery",
       "difficulty": 0.085,
       "description": [
 
@@ -501,7 +516,8 @@
 
     {
       "id": "bad87fee1348bd9aecc08826",
-      "name": "Waypoint: Read Data from an Element Using jQuery",
+      "name":  "Waypoint: Read Data from an Element Using jQuery",
+      "dashedName":  "Waypoint-read-data-from-an-element-using-jquery",
       "difficulty": 0.086,
       "description": [
 
@@ -517,7 +533,8 @@
 
     {
       "id": "bad87fee1348bd9aebc08826",
-      "name": "Waypoint: Get Data from an URL Using jQuery",
+      "name":  "Waypoint: Get Data from an URL Using jQuery",
+      "dashedName":  "waypoint-get-data-from-a-url-using-jquery",
       "difficulty": 0.087,
       "description": [
 
@@ -533,7 +550,8 @@
 
     {
       "id": "bad87fee1348bd9ae9c08826",
-      "name": "Waypoint: Loop through JSON Data Using jQuery",
+      "name":  "Waypoint: Loop through JSON Data Using jQuery",
+      "dashedName":  "waypoint-loop-through-json-data-using-jquery",
       "difficulty": 0.089,
       "description": [
 
@@ -549,7 +567,8 @@
 
     {
       "id": "bad87fee1348bd9ae8c08826",
-      "name": "Waypoint: Setup Click Events Using jQuery",
+      "name":  "Waypoint: Setup Click Events Using jQuery",
+      "dashedName":  "waypoint-setup-click-events-using-jquery",
       "difficulty": 0.089,
       "description": [
 
@@ -563,7 +582,8 @@
       "challengeType": 0
     }, {
       "id": "bad87fee1348bd9aede08826",
-      "name": "Waypoint: Use Hex Codes for Precise Colors",
+      "name":  "Waypoint: Use Hex Codes for Precise Colors",
+      "dashedName":  "waypoint-use-hex-codes-for-precise-colors",
       "difficulty": 0.071,
       "description": [
 
@@ -577,7 +597,8 @@
       "challengeType": 0
     }, {
       "id": "bad87fee1348bd9aedd08826",
-      "name": "Waypoint: Use Shortened Hex Codes for Colors",
+      "name":  "Waypoint: Use Shortened Hex Codes for Colors",
+      "dashedName":  "waypoint-use-shortened-hex-codes-for-colors",
       "difficulty": 0.071,
       "description": [