diff --git a/challenges/00-getting-started/gear-up-for-success.json b/challenges/00-getting-started/getting-started.json
similarity index 85%
rename from challenges/00-getting-started/gear-up-for-success.json
rename to challenges/00-getting-started/getting-started.json
index aa8483c84e4..35b20fdabed 100644
--- a/challenges/00-getting-started/gear-up-for-success.json
+++ b/challenges/00-getting-started/getting-started.json
@@ -1,5 +1,5 @@
 {
-  "name": "Gear up for Success",
+  "name": "Getting Started",
   "order": 1,
   "time": "15m",
   "challenges": [
@@ -326,72 +326,6 @@
       ],
       "namePt": "",
       "descriptionPt": []
-    },
-        {
-      "id": "570add8ccb82ac38a17513c3",
-      "title": "Join our LinkedIn Alumni Network",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/vJyiXzU.gif",
-          "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
-          "LinkedIn recognizes Free Code Camp as a university. You can gain access to our large alumni network by adding Free Code Camp to your LinkedIn profile's education section. <br>Set your graduation date as next year. <br>For \"Degree\", type \"Full Stack Web Development Certification\". <br>For \"Field of study\", type \"Computer Software Engineering\". <br>Then click \"Save Changes\".",
-          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "Únete a nuestra red de alumnos en LinkedIn",
-      "descriptionEs": [
-        [
-          "http://i.imgur.com/vJyiXzU.gif",
-          "Un gif mostrando como puedes pulsar el enlace que está más adelante y llenar todos los campos necesarios para agregar los estudios de Free Code Camp a tu perfil de LinkedIn",
-          "LinkedIn reconoce a Free Code Camp como una universidad. Puedes obtener acceso a nuestra larga red de alumnos agregando Free Code Camp a la sección de educación de tu LinkedIn. <br>Define tu fecha de graduación para el siguiente año. <br> En el campo \"Grado\", escribe \"Certificación de Desarrollo Web Full Stack\". <br> En \"Campo de estudio\", escribe \"Ingeniería de Software\". <br>Después pulsa \"Guardar Cambios\".",
-          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
-        ]
-      ],
-      "namePt": "",
-      "descriptionPt": []
-    },
-    {
-      "id": "560add8ccb81ac38a17513c4",
-      "title": "Commit to a Goal and a Nonprofit",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/Og1ifsn.gif",
-          "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
-          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. <br>This will give you external motivation in your quest to learn to code, as well as an opportunity to help nonprofits right away. <br>Choose your goal, then choose a monthly donation. When you click \"commit\", the nonprofit's donation page will open in a new tab. <br>This is completely optional, and you can change your commitment or stop it at any time.",
-          "/commit"
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "Comprométete con una meta y con una organización sin fines de lucro",
-      "descriptionEs": [
-        [
-          "http://i.imgur.com/Og1ifsn.gif",
-          "Un gif mostrando como te puedes comprometer con una meta para tus estudios de Free Code Camp y prometer una donación mensual a una organización sin fines de lucro para darte motivación externa de alcanzar esa meta.",
-          "Puedes poner una meta y prometer donar mensualmente a una organización sin fines de lucro hasta que alcances tu meta. <br>Esto te dará motivación externa en tu aventura de aprender a programar, así como una oportunidad para ayudar inmediatamente a organizaciones sin fines de lucro. <br>Elige tu meta, después elige tu donativo mensual. Cuando pulses en \"comprometerse\", la página de donación de la organización sin fines de lucro se abrirá en una nueva pestaña. <br>Esto es completamente opcional, y puedes cambiar tu compromiso o detenerlo en cualquier momento.",
-          "/comprometerse"
-        ]
-      ],
-      "namePt": "",
-      "descriptionPt": []
     },
     {
       "id": "560add8ccb82ac38a17513c4",
diff --git a/challenges/01-front-end-development-certification/gear-up-for-success.json b/challenges/01-front-end-development-certification/gear-up-for-success.json
new file mode 100644
index 00000000000..c39f10fda2f
--- /dev/null
+++ b/challenges/01-front-end-development-certification/gear-up-for-success.json
@@ -0,0 +1,139 @@
+{
+  "name": "Gear up for Success",
+  "order": 4,
+  "time": "20m",
+  "challenges": [
+    {
+      "id": "560add65cb82ac38a17513c2",
+      "title": "Browse Camper News",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/YNwsMXM.gif",
+          "A gif showing how you can access our Camper News page and click the \"upvote\" button to upvote a story.",
+          "Click the \"News\" button in your upper right hand corner. <br>You can browse links on Camper News and upvote the ones that you enjoy.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "Navega por las Noticias Campistas",
+      "descriptionEs": [
+        [
+          "http://i.imgur.com/YNwsMXM.gif",
+          "Un gif mostrando como acceder a nuestra página de Noticias Campistas y pulsar el botón \"voto a favor\" para votar por una historia.",
+          "Pulsa el botón de \"Noticias\" en tu esquina superior derecha. <br>Puedes navegar mediante los enlaces en Noticias Campistas y votar por aquellas que disfrutes.",
+          ""
+        ]
+      ],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "560add65cb82ac38a17513c1",
+      "title": "Reference our Wiki",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/4GO4zcI.gif",
+          "A gif showing how you can click the \"Wiki\" button in your upper-right corner to access the wiki.",
+          "Click the \"Wiki\" button in your upper right hand corner. <br>Our community has contributed lots of useful information to this searchable wiki.",
+          ""
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "Referencía nuestra Wiki",
+      "descriptionEs": [
+        [
+          "http://i.imgur.com/4GO4zcI.gif",
+          "Un gif mostrando como puedes pulsar el botón de \"Wiki\" en tu esquina superior derecha para acceder a la wiki.",
+          "Pulsa el botón de \"Wiki\" en tu esquina superior derecha. <br>Nuestra comunidad ha contribuido información bastante útil en esta wiki.",
+          ""
+        ]
+      ],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "570add8ccb82ac38a17513c3",
+      "title": "Join our LinkedIn Alumni Network",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/vJyiXzU.gif",
+          "A gif showing how you can click the link below and fill in the necessary fields to add your Free Code Camp studies to your LinkedIn profile.",
+          "LinkedIn recognizes Free Code Camp as a university. You can gain access to our large alumni network by adding Free Code Camp to your LinkedIn profile's education section. <br>Set your graduation date as next year. <br>For \"Degree\", type \"Full Stack Web Development Certification\". <br>For \"Field of study\", type \"Computer Software Engineering\". <br>Then click \"Save Changes\".",
+          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "Únete a nuestra red de alumnos en LinkedIn",
+      "descriptionEs": [
+        [
+          "http://i.imgur.com/vJyiXzU.gif",
+          "Un gif mostrando como puedes pulsar el enlace que está más adelante y llenar todos los campos necesarios para agregar los estudios de Free Code Camp a tu perfil de LinkedIn",
+          "LinkedIn reconoce a Free Code Camp como una universidad. Puedes obtener acceso a nuestra larga red de alumnos agregando Free Code Camp a la sección de educación de tu LinkedIn. <br>Define tu fecha de graduación para el siguiente año. <br> En el campo \"Grado\", escribe \"Certificación de Desarrollo Web Full Stack\". <br> En \"Campo de estudio\", escribe \"Ingeniería de Software\". <br>Después pulsa \"Guardar Cambios\".",
+          "https://www.linkedin.com/profile/edit-education?school=Free+Code+Camp"
+        ]
+      ],
+      "namePt": "",
+      "descriptionPt": []
+    },
+    {
+      "id": "560add8ccb81ac38a17513c4",
+      "title": "Commit to a Goal and a Nonprofit",
+      "challengeSeed": [],
+      "description": [
+        [
+          "http://i.imgur.com/Og1ifsn.gif",
+          "A gif showing how you can commit to a goal for your Free Code Camp studies and pledge a monthly donation to a nonprofit to give you external motivation to reach that goal.",
+          "You can set a goal and pledge to donate to a nonprofit each month until you achieve that goal. <br>This will give you external motivation in your quest to learn to code, as well as an opportunity to help nonprofits right away. <br>Choose your goal, then choose a monthly donation. When you click \"commit\", the nonprofit's donation page will open in a new tab. <br>This is completely optional, and you can change your commitment or stop it at any time.",
+          "/commit"
+        ]
+      ],
+      "type": "Waypoint",
+      "challengeType": 7,
+      "tests": [],
+      "nameCn": "",
+      "descriptionCn": [],
+      "nameFr": "",
+      "descriptionFr": [],
+      "nameRu": "",
+      "descriptionRu": [],
+      "nameEs": "Comprométete con una meta y con una organización sin fines de lucro",
+      "descriptionEs": [
+        [
+          "http://i.imgur.com/Og1ifsn.gif",
+          "Un gif mostrando como te puedes comprometer con una meta para tus estudios de Free Code Camp y prometer una donación mensual a una organización sin fines de lucro para darte motivación externa de alcanzar esa meta.",
+          "Puedes poner una meta y prometer donar mensualmente a una organización sin fines de lucro hasta que alcances tu meta. <br>Esto te dará motivación externa en tu aventura de aprender a programar, así como una oportunidad para ayudar inmediatamente a organizaciones sin fines de lucro. <br>Elige tu meta, después elige tu donativo mensual. Cuando pulses en \"comprometerse\", la página de donación de la organización sin fines de lucro se abrirá en una nueva pestaña. <br>Esto es completamente opcional, y puedes cambiar tu compromiso o detenerlo en cualquier momento.",
+          "/comprometerse"
+        ]
+      ],
+      "namePt": "",
+      "descriptionPt": []
+    }
+  ]
+}
diff --git a/challenges/03-back-end-development-certification/api-projects.json b/challenges/03-back-end-development-certification/api-projects.json
index b16e806f46a..a0c65d87671 100644
--- a/challenges/03-back-end-development-certification/api-projects.json
+++ b/challenges/03-back-end-development-certification/api-projects.json
@@ -4,195 +4,6 @@
   "isComingSoon": true,
   "time": "100h",
   "challenges": [
-    {
-      "id": "bd7158d8c443edefaeb5bcef",
-      "title": "Get Set for Basejumps",
-      "challengeSeed": [],
-      "description": [
-        [
-          "http://i.imgur.com/4IZjWZ3.gif",
-          "A gif showing how to create a c9.io account.",
-          "We recommend building our full stack Basejump challenges on c9.io, a powerful browser-based development environment. This save you hours of time that you would spend configuring your local computer to run Node.js and MongoDB - time you could instead spend coding. <br>Create a c9.io account by clicking the GitHub symbol in the upper right hand corner of the c9.io page. Click the big plus symbol to create a new workspace. Enter your email address when prompted.",
-          "http://c9.io"
-        ],
-        [
-          "http://i.imgur.com/F7i5Hhi.gif",
-          "A gif showing how to fill out the new workspace form",
-          "Instead of starting from scratch, we recommend using Clementine.js, a full stack JavaScript \"boilerplate\" that already has some basic code written for you. Clementine.js has a detailed tutorial you can go through to build it yourself, but for now let's just clone its code. On c9.io, give your workspace a name, then leave \"Template\" as custom and create your workspace from this GitHub url: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/42m1vyr.gif",
-          "A gif showing you how to show hidden files.",
-          "Click the gear in the upper right corner of c9.io's file structure. Select \"show hidden files\".",
-          ""
-        ],
-        [
-          "http://i.imgur.com/qrE8xaK.gif",
-          "A gif showing you how to create a new file.",
-          "Right click and create a new file called <code>.env</code>.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/jkQX9SQ.gif",
-          "A gif showing you how to prep your environmental variables in your .env file.",
-          "Open your .env file and paste this into it, then save it: <br><code>GITHUB_KEY=<br>GITHUB_SECRET=<br>MONGO_URI=mongodb://localhost:27017/clementinejs<br>PORT=8080<br>APP_URL=http://localhost:8080/</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/f3DE7zB.gif",
-          "A gif showing you how to open c9.io's preview window.",
-          "Open up your application in a preview tab by clicking window > share > application > open.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/Ip0qUdQ.gif",
-          "A gif showing you how to create a GitHub app using c9.io's preview URL.",
-          "Create a GitHub app for authentication and choose an \"Application name\". For the homepage URL, paste the URL from your preview tab. You'll also paste the URL from your preview tab into \"Authorization callback URL\", then add to it: <code>auth/github/callback</code>",
-          "https://github.com/settings/applications/new"
-        ],
-        [
-          "http://i.imgur.com/qCUVRFb.gif",
-          "A gif showing you how to transfer GitHub's key and secret over to your .env file, as well as your c9.io URL.",
-          "GitHub will create an app and present you with a Client ID and a Client Secret. Set your .env file's GITHUB_KEY equal to the Client ID, and set your .env file's GITHUB_SECRET equal to the Client Secret. Copy the URL from the your preview tab and paste it into your .env file as your APP_URL.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/2a20Vah.gif",
-          "A gif showing you how to start mongoDB in c9.io's terminal.",
-          "In your terminal, start MongoDB by entering <code>mongod --smallfiles</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/dC55pWk.gif",
-          "A gif showing you how to open a new tab in c9.io's terminal.",
-          "Open a new terminal tab with the + button above your terminal, then run <code>npm install</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/54OC2Ro.gif",
-          "A gif showing you how to navigate to your preview tab and sign in to your new Clementine.js app.",
-          "Run <code>node server.js</code> to start the server. Refresh your preview tab. You should see the Clementine.js logo. Click \"sign in\" and accept GitHub's prompt to authorize the application.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/2IJfyvN.gif",
-          "A gif showing you how to click the button to trigger an AJAX action with Clementine.js and how to look at your user profile from the GitHub authentication data.",
-          "Click the \"click me\" button and you'll see that it increments the number clicks. Click the profile button and you'll see that it has your GitHub information.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/bjO5pnq.gif",
-          "A gif showing you how to create a new GitHub repository and push your code up to it.",
-          "Create a new GitHub repository. Then copy its .git URL. <br>Return to c9.io's terminal and set your GitHub remote URL: <code>git remote set-url origin</code> followed by the URL you copied from GitHub. <br>Run <code>git push origin master</code>. <br>Now tab back to GitHub and refresh, and you'll see that your code is now on GitHub.",
-          "https://github.com/new"
-        ],
-        [
-          "http://i.imgur.com/Qn0K65B.gif",
-          "A gif showing you how to add add-ons to Heroku.",
-          "We will soon add instructions for getting Clementine running on Heroku. For now, develop your Basejumps right on c9.io.",
-          ""
-        ]
-      ],
-      "type": "Waypoint",
-      "challengeType": 7,
-      "tests": [],
-      "nameCn": "",
-      "descriptionCn": [],
-      "nameFr": "",
-      "descriptionFr": [],
-      "nameRu": "",
-      "descriptionRu": [],
-      "nameEs": "Prepárate para los Basejumps",
-      "descriptionEs": [
-        [
-          "http://i.imgur.com/4IZjWZ3.gif",
-          "Una imagen gif que te muestra cómo crear una cuenta en c9.io.",
-          "Te recomendamos resolver nuestros desafíos de pila completa (full stack) en c9.io, un poderoso ambiente de desarrollo basado en tu navegador. Esto te ahorrará muchas horas que utilizarías configurando tu computadora para correr Node.js y MongoDB - tiempo que podrías utilizar escribiendo código. <br>Crea una cuenta en c9.io pulsando el símbolo de GitHub en la esquina superior derecha de la página de c9.io. Pulsa el botón con el símbolo de suma para crear una área de trabajo nueva. Introduce tu dirección de correo electrónico cuando se te solicite.",
-          "http://c9.io"
-        ],
-        [
-          "http://i.imgur.com/F7i5Hhi.gif",
-          "Una imagen gif que te muestra cómo llenar el formulario para crear un área de trabajo nueva",
-          "En vez de iniciar desde cero, recomendamos utilizar Clementine.js, un modelo (<em>bolierplate</em>) de JavaScript pila completa (full stack) que viene con código básico ya escrito para ti. Clementine.js tiene un tutorial detallado que puedes seguir para construirlo por ti mismo, pero por ahora simplemente vamos a clonarlo. En c9.io, dale un nombre a tu área de trabajo, luego deja \"Plantilla\" (\"Template\") como personalizado y crea tu espacio de trabajo usando el siguiente url de Github: <code>https://github.com/johnstonbl01/clementinejs-fcc.git</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/42m1vyr.gif",
-          "Una imagen gif que te muestra cómo mostrar los archivos ocultos.",
-          "Pulsa el engrane en la esquina superior derecha del árbol de archivos de c9.io. Selecciona \"show hidden files\".",
-          ""
-        ],
-        [
-          "http://i.imgur.com/qrE8xaK.gif",
-          "Una imagen gif que te muestra cómo crear un archivo nuevo.",
-          "Haciendo clic derecho, crea un nuevo archivo llamado <code>.env</code>.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/jkQX9SQ.gif",
-          "Una imagen gif que te muestra cómo preparar tus variables de ambiente en tu archivo .env.",
-          "Abre tu archivo .env pega el siguiente código, y luego guárdalo: <br><code>GITHUB_KEY=<br>GITHUB_SECRET=<br>MONGO_URI=mongodb://localhost:27017/clementinejs<br>PORT=8080<br>APP_URL=http://localhost:8080/</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/f3DE7zB.gif",
-          "Una imagen gif que te muestra cómo abir la vista previa de la ventana de c9.io.",
-          "Abre tu aplicación en una pestaña de vista previa pulsando window > share > application > open.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/Ip0qUdQ.gif",
-          "Una imagen gif que te muestra cómo crear una aplicación de GitHub usando la URL de vista previa de c9.io.",
-          "Crea una aplicación de GitHub para autenticación y elige un \"Nombre de aplicación\". Para la URL de inicio (homepage), pega la URL de tu pestaña de vista previa. También debes pegar la URL de tu pestaña de vista previa en <code>Authorization callback URL</code>, agrégale: <code>auth/github/callback</code>",
-          "https://github.com/settings/applications/new"
-        ],
-        [
-          "http://i.imgur.com/qCUVRFb.gif",
-          "Una imagen gif que te muestra cómo transferir tu llave (key) y tu código secreto (secret) de GitHub a tu archivo .env, así como tu URL de c9.io.",
-          "GitHub creará una aplicación y te entregará un ID de cliente (Client ID) y un Código secreto de cliente (Client Secret). Haz que el GITHUB_KEY en tu archivo .env sea igual al ID de cliente, y haz que tu GITHUB_SECRET en el archivo .env sea igual al Código secreto de cliente. Copia la URL de tu pestaña de vista previa y pégala en tu archivo .env como tu APP_URL.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/2a20Vah.gif",
-          "Una imagen gif que te muestra cómo iniciar mongoDB en la terminal de c9.io.",
-          "En tu terminal, inicia MongoDB con el siguiente comando: <code>mongod --smallfiles</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/dC55pWk.gif",
-          "Una imagen gif que te muestra cómo abrir una nueva pestaña en la terminal de c9.io.",
-          "Abre una nueva pestaña de terminal pulsando el botón de + sobre tu terminal, luego ejecuta <code>npm install</code>",
-          ""
-        ],
-        [
-          "http://i.imgur.com/54OC2Ro.gif",
-          "Una imagen gif que te muestra cómo navegar a tu pestaña de vista previa e ingresar a tu nueva aplicación Clementine.js.",
-          "Ejecuta <code>node server.js</code> para iniciar el servidor. Actualiza tu pestaña de vista previa. Deberías poder ver el logo de Clementine.js. Pulsa \"sign in\"  y acepta la solicitud de GitHub para autorizar la aplicación.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/2IJfyvN.gif",
-          "Una imagen gif que te muestra cómo pulsar un botón para desencadenar una acción AJAX con Clementine.js y cómo ver tu perfil de usuario en los datos de autenticación provistos por GitHub.",
-          "Pulsa el botón que dice \"click me\" y verás que se incrementa el número de clics. Pulsa el botón de perfil (profile) y verás la información de tu perfil de GitHub.",
-          ""
-        ],
-        [
-          "http://i.imgur.com/bjO5pnq.gif",
-          "Una imagen gif que te muestra cómo crear un nuevo repositorio de GitHub GitHub y empujar allí tu código.",
-          "Crea un nuevo repositorio en GitHub. Luego copia su ULR .git. <br>Regresa a tu terminal de c9.io y establece tu URL remota de GitHub: <code>git remote set-url origin</code> seguido de la URL que copiaste de GitHub. <br>Ejecuta <code>git push origin master</code>. <br>Ahora ve de regreso a la página de GitHub y actualízala. Verás que tu código ahora está ahora en GitHub.",
-          "https://github.com/new"
-        ],
-        [
-          "http://i.imgur.com/Qn0K65B.gif",
-          "Una imagen gif que te muestra cómo agregar complementos a Heroku.",
-          "Pronto agregaremos instrucciones para hacer que Clementine corra en Heroku. Por ahora, desarrolla tus Basejumps en c9.io.",
-          ""
-        ]
-        ],
-      "namePt": "",
-      "descriptionPt": []
-    },
     {
       "id": "bd7158d8c443edefaeb5bdef",
       "title": "API Project 1",
diff --git a/challenges/03-back-end-development-certification/backend-heavy-web-apps.json b/challenges/03-back-end-development-certification/dynamic-web-applications.json
similarity index 99%
rename from challenges/03-back-end-development-certification/backend-heavy-web-apps.json
rename to challenges/03-back-end-development-certification/dynamic-web-applications.json
index 4161759887f..78bafc08f8e 100644
--- a/challenges/03-back-end-development-certification/backend-heavy-web-apps.json
+++ b/challenges/03-back-end-development-certification/dynamic-web-applications.json
@@ -1,6 +1,6 @@
 {
-  "name": "Full Stack JavaScript Projects",
-  "order": 20,
+  "name": "Dynamic Web Applications",
+  "order": 21,
   "time": "200h",
   "challenges": [
     {
diff --git a/challenges/full-stack-development-certification/full-stack-development-certificate.json b/challenges/04-full-stack-development-certification/full-stack-development-certificate.json
similarity index 99%
rename from challenges/full-stack-development-certification/full-stack-development-certificate.json
rename to challenges/04-full-stack-development-certification/full-stack-development-certificate.json
index cd8bf305917..99a3d524da3 100644
--- a/challenges/full-stack-development-certification/full-stack-development-certificate.json
+++ b/challenges/04-full-stack-development-certification/full-stack-development-certificate.json
@@ -1,6 +1,7 @@
 {
   "name": "Claim Your Full Stack Development Certificate",
   "order": 5,
+  "isComingSoon": true,  
   "time": "5m",
   "challenges": [
     {
diff --git a/challenges/full-stack-development-certification/greenfield-nonprofit-project-1.json b/challenges/04-full-stack-development-certification/greenfield-nonprofit-project-1.json
similarity index 99%
rename from challenges/full-stack-development-certification/greenfield-nonprofit-project-1.json
rename to challenges/04-full-stack-development-certification/greenfield-nonprofit-project-1.json
index c4490a19456..5550db99788 100644
--- a/challenges/full-stack-development-certification/greenfield-nonprofit-project-1.json
+++ b/challenges/04-full-stack-development-certification/greenfield-nonprofit-project-1.json
@@ -1,7 +1,8 @@
 {
   "name": "Greenfield Nonprofit Project 1",
   "order": 1,
-  "time": "5m",
+  "isComingSoon": true,  
+  "time": "200h",
   "challenges": [
     {
       "id": "561add10cc82ac38a17513be",
diff --git a/challenges/full-stack-development-certification/greenfield-nonprofit-project-2.json b/challenges/04-full-stack-development-certification/greenfield-nonprofit-project-2.json
similarity index 99%
rename from challenges/full-stack-development-certification/greenfield-nonprofit-project-2.json
rename to challenges/04-full-stack-development-certification/greenfield-nonprofit-project-2.json
index 3440b1b948d..45d49f53fa3 100644
--- a/challenges/full-stack-development-certification/greenfield-nonprofit-project-2.json
+++ b/challenges/04-full-stack-development-certification/greenfield-nonprofit-project-2.json
@@ -1,7 +1,8 @@
 {
   "name": "Greenfield Nonprofit Project 2",
   "order": 2,
-  "time": "5m",
+  "isComingSoon": true,  
+  "time": "200h",
   "challenges": [
     {
       "id": "561add10cc82ad38a17513be",
diff --git a/challenges/full-stack-development-certification/legacy-nonprofit-project-1.json b/challenges/04-full-stack-development-certification/legacy-nonprofit-project-1.json
similarity index 99%
rename from challenges/full-stack-development-certification/legacy-nonprofit-project-1.json
rename to challenges/04-full-stack-development-certification/legacy-nonprofit-project-1.json
index a58a42714ed..db91ccff8d7 100644
--- a/challenges/full-stack-development-certification/legacy-nonprofit-project-1.json
+++ b/challenges/04-full-stack-development-certification/legacy-nonprofit-project-1.json
@@ -1,7 +1,8 @@
 {
   "name": "Legacy Nonprofit Project 1",
   "order": 3,
-  "time": "5m",
+  "isComingSoon": true,  
+  "time": "200h",
   "challenges": [
     {
       "id": "561add10cd82ad38a17513b3",
diff --git a/challenges/full-stack-development-certification/legacy-nonprofit-project-2.json b/challenges/04-full-stack-development-certification/legacy-nonprofit-project-2.json
similarity index 99%
rename from challenges/full-stack-development-certification/legacy-nonprofit-project-2.json
rename to challenges/04-full-stack-development-certification/legacy-nonprofit-project-2.json
index 76e7f411292..ba82696a496 100644
--- a/challenges/full-stack-development-certification/legacy-nonprofit-project-2.json
+++ b/challenges/04-full-stack-development-certification/legacy-nonprofit-project-2.json
@@ -1,7 +1,8 @@
 {
   "name": "Legacy Nonprofit Project 2",
   "order": 4,
-  "time": "5m",
+  "isComingSoon": true,  
+  "time": "200h",
   "challenges": [
     {
       "id": "561add10cd82ad38a17513be",
diff --git a/challenges/interview-preparation/critical-thinking-interview-prep.json b/challenges/05-interview-preparation/critical-thinking-interview-prep.json
similarity index 99%
rename from challenges/interview-preparation/critical-thinking-interview-prep.json
rename to challenges/05-interview-preparation/critical-thinking-interview-prep.json
index 5471d405239..ab4f1ef497a 100644
--- a/challenges/interview-preparation/critical-thinking-interview-prep.json
+++ b/challenges/05-interview-preparation/critical-thinking-interview-prep.json
@@ -1,7 +1,8 @@
 {
   "name": "Critical Thinking Interview Prep",
-  "order": 1,
-  "time": "5m",
+  "order": 2,
+  "time": "35h",
+  "isComingSoon": true,
   "challenges": [
     {
       "id": "561add10cd82ad31a17513be",
diff --git a/challenges/interview-preparation/mock-interview-1.json b/challenges/05-interview-preparation/mock-interview-1.json
similarity index 99%
rename from challenges/interview-preparation/mock-interview-1.json
rename to challenges/05-interview-preparation/mock-interview-1.json
index 3adac3668a1..5e5cfd488c1 100644
--- a/challenges/interview-preparation/mock-interview-1.json
+++ b/challenges/05-interview-preparation/mock-interview-1.json
@@ -1,7 +1,8 @@
 {
   "name": "Mock Interview 1",
-  "order": 1,
-  "time": "5m",
+  "order": 3,
+  "isComingSoon": true,
+  "time": "2h",
   "challenges": [
     {
       "id": "561add10cd82ad37a17513b4",
diff --git a/challenges/interview-preparation/mock-interview-2.json b/challenges/05-interview-preparation/mock-interview-2.json
similarity index 99%
rename from challenges/interview-preparation/mock-interview-2.json
rename to challenges/05-interview-preparation/mock-interview-2.json
index 13b48d48dbc..f2d75f1117e 100644
--- a/challenges/interview-preparation/mock-interview-2.json
+++ b/challenges/05-interview-preparation/mock-interview-2.json
@@ -1,7 +1,8 @@
 {
   "name": "Mock Interview 2",
-  "order": 1,
-  "time": "5m",
+  "order": 4,
+  "isComingSoon": true,
+  "time": "2h",
   "challenges": [
     {
       "id": "561add10cd82ad37a17513b3",
diff --git a/challenges/interview-preparation/mock-interview-3.json b/challenges/05-interview-preparation/mock-interview-3.json
similarity index 99%
rename from challenges/interview-preparation/mock-interview-3.json
rename to challenges/05-interview-preparation/mock-interview-3.json
index 0c2a7fc32e3..af03540183c 100644
--- a/challenges/interview-preparation/mock-interview-3.json
+++ b/challenges/05-interview-preparation/mock-interview-3.json
@@ -1,7 +1,8 @@
 {
   "name": "Mock Interview 3",
-  "order": 1,
-  "time": "5m",
+  "order": 5,
+  "isComingSoon": true,  
+  "time": "2h",
   "challenges": [
     {
       "id": "561add10cd82ad37a17523b3",
diff --git a/challenges/interview-preparation/whiteboard-coding-interview-prep.json b/challenges/05-interview-preparation/whiteboard-coding-interview-prep.json
similarity index 99%
rename from challenges/interview-preparation/whiteboard-coding-interview-prep.json
rename to challenges/05-interview-preparation/whiteboard-coding-interview-prep.json
index b984b31e27e..09675eef144 100644
--- a/challenges/interview-preparation/whiteboard-coding-interview-prep.json
+++ b/challenges/05-interview-preparation/whiteboard-coding-interview-prep.json
@@ -1,7 +1,8 @@
 {
   "name": "Whiteboard Coding Interview Prep",
   "order": 1,
-  "time": "5m",
+  "isComingSoon": true,
+  "time": "35h",
   "challenges": [
     {
       "id": "561add10cd82ad37a17513be",