diff --git a/commotionwireless.net/_includes/help_cck_networking_menu.html b/commotionwireless.net/_includes/help_cck_networking_menu.html
index ef05e8ec..7f4f0b75 100644
--- a/commotionwireless.net/_includes/help_cck_networking_menu.html
+++ b/commotionwireless.net/_includes/help_cck_networking_menu.html
@@ -2,4 +2,5 @@
   <li {% if page.url contains '/docs/cck/networking/intro-to-mesh' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/networking/intro-to-mesh">Introduction to Mesh</a></li>
   <li {% if page.url contains '/docs/cck/networking/learn-networking-basics' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/networking/learn-networking-basics">Learn Networking Basics</a></li>
   <li {% if page.url contains '/docs/cck/networking/learn-wireless-basics' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/networking/learn-wireless-basics">Learn Wireless Basics</a></li>
+  <li {% if page.url contains '/docs/cck/networking/wireless-challenges' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/networking/wireless-challenges">Wireless Challenges</a></li>
 </ul>
diff --git a/commotionwireless.net/_includes/help_cck_planning_menu.html b/commotionwireless.net/_includes/help_cck_planning_menu.html
index 4b6e508b..95e266e6 100644
--- a/commotionwireless.net/_includes/help_cck_planning_menu.html
+++ b/commotionwireless.net/_includes/help_cck_planning_menu.html
@@ -1,6 +1,5 @@
 <ul class="submenu">
   <li {% if page.url contains '/docs/cck/planning/design-your-network-every-network-tells-story' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/planning/design-your-network-every-network-tells-story">Design Your Network</a></li>
-  <li {% if page.url contains '/docs/cck/planning/wireless-challenges' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/planning/wireless-challenges">Wireless Challenges</a></li>
   <li {% if page.url contains '/docs/cck/planning/survey-your-neighbors' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/planning/survey-your-neighbors">Survey Your Neighbors</a></li>
   <li {% if page.url contains '/docs/cck/planning/get-word-out-flyer-design' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/planning/get-word-out-flyer-design">Get the Word Out: Flyer Design</a></li>
   <li {% if page.url contains '/docs/cck/planning/identify-neighborhood-skills' %} class="active" {% endif %}><a href="{% if page.lang != 'en' %}/{{ page.lang }}{% endif %}/docs/cck/planning/identify-neighborhood-skills">Identify Neighborhood Skills</a></li>
diff --git a/commotionwireless.net/docs/cck/index.md b/commotionwireless.net/docs/cck/index.md
index 4fe570f2..e6a6df7c 100644
--- a/commotionwireless.net/docs/cck/index.md
+++ b/commotionwireless.net/docs/cck/index.md
@@ -25,7 +25,6 @@ lang: en
 
 <ul>
 	<li><a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Every Network Tells a Story</a>: A game that helps communities think through network planning and the&nbsp;social networks upon which community wireless relies.</li>
-	<li><a href="/docs/cck/planning/wireless-challenges">Design your Network: Wireless Challenges</a>: A simple guide to wireless challenges to help improve network planning&nbsp;and troubleshooting.</li>
 	<li><a href="/docs/cck/planning/survey-your-neighbors">Survey your Neighbors</a>: Description of how to design a survey for your community, conduct it, analyze the results, and follow-up with the community.</li>
 	<li><a href="/docs/cck/planning/get-word-out-flyer-design">Get the Word Out: Flyer Design</a>: Step-by-step suggestions for making a flyer for your wireless project, including examples.</li>
 	<li><a href="/docs/cck/planning/identify-neighborhood-skills">Identify Neighborhood Skills</a>: Activities to help identify important organizing, tech, and handy-person&nbsp;skills for your wireless project.</li>
@@ -58,6 +57,7 @@ lang: en
 	<li><a href="/docs/cck/networking/intro-to-mesh">Introduction to Mesh</a>: An introduction to mesh and network properties.</li>
 	<li><a href="/docs/cck/networking/learn-networking-basics">Learn Networking Basics</a>: An introductory guide to networking.</li>
 	<li><a href="/docs/cck/networking/learn-wireless-basics">Learn Wireless Basics</a>: An introduction to how wireless technology works.</li>
+	<li><a href="/docs/cck/networking/wireless-challenges">Design your Network: Wireless Challenges</a>: A simple guide to wireless challenges to help improve network planning&nbsp;and troubleshooting.</li>
 </ul>
 
 <p>&nbsp;</p>
diff --git a/commotionwireless.net/docs/cck/planning/wireless-challenges/index.md b/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
similarity index 84%
rename from commotionwireless.net/docs/cck/planning/wireless-challenges/index.md
rename to commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
index 2e4171c7..12da4b07 100644
--- a/commotionwireless.net/docs/cck/planning/wireless-challenges/index.md
+++ b/commotionwireless.net/docs/cck/networking/wireless-challenges/index.md
@@ -2,8 +2,8 @@
 layout: cck
 title: Design Your Network - Wireless Challenges
 site_section: help
-sub_section: [cck,cck-planning]
-pdf: cck/planning/CCK-Wireless_Challenges.pdf
+sub_section: [cck,cck-networking]
+pdf: cck/networking/CCK-Wireless_Challenges.pdf
 pdf-all: true
 categories: 
 created: 2013-11-04
@@ -25,11 +25,11 @@ lang: en
 
 <section id="materials-and-supplies-needed">
 <h3>MATERIALS + SUPPLIES NEEDED</h3>
-<p><a href="/files/cck/planning/2.1-CCK-Planning-Wireless_Challenges_Presentation.pdf">Wireless Challenges Presentation</a> - Either printed as a handout, or introduction to a group activity.<br />
-<a href="/files/cck/planning/2.1-CCK-Planning-Wireless_Challenges_Presentation.pdf"><img alt="" class="media-image" height="392" src="/files/styles/large/public/CCK_Wireless_Challenges_presentation_download.png" width="510" /></a></p>
+<p><a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf">Wireless Challenges Presentation</a> - Either printed as a handout, or introduction to a group activity.<br />
+<a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf"><img height="392" src="/files/styles/large/public/CCK_Wireless_Challenges_presentation_download.png" width="510" /></a></p>
 
-<p><a href="/files/cck/planning/2.2-CCK-Planning-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problem and Solution flashcards</a> - printed out on 8½ by 11” paper.<br />
-<a href="/files/cck/planning/2.2-CCK-Planning-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf"><img alt="" class="media-image" height="328" src="/files/styles/large/public/CCK_Wireless_Challenges_flashcard_download.png" width="480" /></a></p>
+<p><a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problem and Solution flashcards</a> - printed out on 8½ by 11” paper.<br />
+<a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf"><img height="328" src="/files/styles/large/public/CCK_Wireless_Challenges_flashcard_download.png" width="480" /></a></p>
 
 <p>(Optional) Router graphics from the <a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Every Network Tells a Story</a> packet.</p>
 
@@ -51,7 +51,7 @@ lang: en
 <p><strong>2. As printouts that you or others can work through as a group.</strong> In this format, you should print out multiple copies of just the problems (or set aside the solutions for later). Hand out the stack of problem flashcards, and work through each one in a group, in small groups or pairs, or as individuals. Then come back together and compare solutions with each other, and with the example solutions provided.</p>
 </div>
 
-<p>If you are working through the wireless challenges as a group, you can use the <a href="/files/cck/planning/2.1-CCK-Planning-Wireless_Challenges_Presentation.pdf">presentation</a> to introduce the concept, and go through the rules that are also presented below.</p>
+<p>If you are working through the wireless challenges as a group, you can use the <a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf">presentation</a> to introduce the concept, and go through the rules that are also presented below.</p>
 </section>
 
 <section id="what-are-the-wireless-challenges">
@@ -81,7 +81,7 @@ lang: en
 <section id="going-through-the-wireless-challenges">
 <h2>Going through the Wireless Challenges</h2>
 
-<p>The Wireless Challenge Problem and Solution sets can be studied at your own pace, if you are going through them on your own. Download the PDF of <a href="/files/cck/planning/2.2-CCK-Planning-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problems and Solutions</a>, then go through each scenario one by one. Draw the solution to the problem presented in each case, and then compare your solution to the examples on the pages following. No cheating!</p>
+<p>The Wireless Challenge Problem and Solution sets can be studied at your own pace, if you are going through them on your own. Download the PDF of <a href="/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf">Problems and Solutions</a>, then go through each scenario one by one. Draw the solution to the problem presented in each case, and then compare your solution to the examples on the pages following. No cheating!</p>
 
 <p>If you are working as a group, we suggest this activity:</p>
 
diff --git a/commotionwireless.net/docs/cck/planning/design-your-network-every-network-tells-story/index.md b/commotionwireless.net/docs/cck/planning/design-your-network-every-network-tells-story/index.md
index 678e5fa5..0909c04b 100644
--- a/commotionwireless.net/docs/cck/planning/design-your-network-every-network-tells-story/index.md
+++ b/commotionwireless.net/docs/cck/planning/design-your-network-every-network-tells-story/index.md
@@ -243,7 +243,7 @@ lang: en
 
 <p>Use the <a href="/docs/cck/planning/design-your-network-construction-elements">Design your Network: Construction Elements</a> module to make your background picture for this game (optional)</p>
 
-<p>Next, try the module: <a href="/docs/cck/planning/design-your-network-every-network-tells-story">Design your Network: Wireless Challenges</a></p>
+<p>Next, try the module: <a href="/docs/cck/networking/wireless-challenges">Design your Network: Wireless Challenges</a></p>
 
 <p>Alternatively, get ready to talk to your neighbors about your proposed network by making a flyer (<a href="/docs/cck/planning/get-word-out-flyer-design">Get the Word Out: Flyer Design</a>) or conducting a survey to see who's willing to contribute (<a href="/docs/cck/planning/survey-your-neighbors">Survey Your Neighbors</a>)</p>
 </section>
diff --git a/commotionwireless.net/docs/cck/planning/inventory-the-neighborhood/index.md b/commotionwireless.net/docs/cck/planning/inventory-the-neighborhood/index.md
index 73a0dae0..e6cd51bd 100644
--- a/commotionwireless.net/docs/cck/planning/inventory-the-neighborhood/index.md
+++ b/commotionwireless.net/docs/cck/planning/inventory-the-neighborhood/index.md
@@ -24,7 +24,7 @@ lang: en
 
 <p>Creating an inventory of your entire neighborhood takes time. You may start your inventory with a few potential sites or a small area in your neighborhood. You can repeat these steps as you continue to grow and plan the network.</p>
 
-<p>You may want to do the <strong><a href="/docs/cck/planning/design-your-network-every-network-tells-story">Every Network Tells a Story</a></strong> and <a href="/docs/cck/planning/wireless-challenges">Wireless Challenges</a> activities before you inventory areas of your neighborhood.</p>
+<p>You may want to do the <strong><a href="/docs/cck/planning/design-your-network-every-network-tells-story">Every Network Tells a Story</a></strong> and <a href="/docs/cck/networking/wireless-challenges">Wireless Challenges</a> activities before you inventory areas of your neighborhood.</p>
 
 <p><strong>Time required: 2 to 3 hours, depending on the size of the area you want to inventory.</strong></p>
 </section>
diff --git a/commotionwireless.net/files/cck/planning/2.1-CCK-Planning-Wireless_Challenges_Presentation.pdf b/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/2.1-CCK-Planning-Wireless_Challenges_Presentation.pdf
rename to commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Presentation.pdf
diff --git a/commotionwireless.net/files/cck/planning/2.2-CCK-Planning-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf b/commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/2.2-CCK-Planning-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf
rename to commotionwireless.net/files/cck/networking/3-CCK-Networking-Wireless_Challenges_Scenarios_Problems_and_Solutions.pdf
diff --git a/commotionwireless.net/files/cck/planning/CCK-Defis_sans_fil.pdf b/commotionwireless.net/files/cck/networking/CCK-Defis_sans_fil.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/CCK-Defis_sans_fil.pdf
rename to commotionwireless.net/files/cck/networking/CCK-Defis_sans_fil.pdf
diff --git a/commotionwireless.net/files/cck/planning/CCK-Wireless_Challenges.pdf b/commotionwireless.net/files/cck/networking/CCK-Wireless_Challenges.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/CCK-Wireless_Challenges.pdf
rename to commotionwireless.net/files/cck/networking/CCK-Wireless_Challenges.pdf
diff --git a/commotionwireless.net/files/cck/planning/Difficultes_inherentes_aux_reseaux_sans_fil.pdf b/commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/Difficultes_inherentes_aux_reseaux_sans_fil.pdf
rename to commotionwireless.net/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf
diff --git a/commotionwireless.net/files/cck/planning/Problemes_et_solutions.pdf b/commotionwireless.net/files/cck/networking/Problemes_et_solutions.pdf
similarity index 100%
rename from commotionwireless.net/files/cck/planning/Problemes_et_solutions.pdf
rename to commotionwireless.net/files/cck/networking/Problemes_et_solutions.pdf
diff --git a/commotionwireless.net/fr/docs/cck/planning/wireless-challenges/index.md b/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
similarity index 88%
rename from commotionwireless.net/fr/docs/cck/planning/wireless-challenges/index.md
rename to commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
index af29c109..c9863201 100644
--- a/commotionwireless.net/fr/docs/cck/planning/wireless-challenges/index.md
+++ b/commotionwireless.net/fr/docs/cck/networking/wireless-challenges/index.md
@@ -2,8 +2,8 @@
 layout: cck
 title: Conception de réseaux - les défis inhérents aux réseaux sans fil
 site_section: help
-sub_section: [cck,cck-planning]
-pdf: cck/planning/CCK-Defis_sans_fil.pdf
+sub_section: [cck,cck-networking]
+pdf: cck/networking/CCK-Defis_sans_fil.pdf
 pdf-all: true
 categories: fr
 created: 2013-11-04
@@ -25,9 +25,9 @@ lang: fr
 <section id="materials-and-supplies-needed">
 <h4>MATERIEL + FOURNITURE REQUISE</h4>
 
-<p><a href="/files/cck/planning/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">Présentation des défis inhérents aux réseaux sans fil</a> - En version polycopiée, ou en introduction à l'activité en groupe. <br><a href="/files/cck/planning/Difficultes_inherentes_aux_reseaux_sans_fil.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_presentation_download_FR.png"></a></p>
+<p><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">Présentation des défis inhérents aux réseaux sans fil</a> - En version polycopiée, ou en introduction à l'activité en groupe. <br><a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_presentation_download_FR.png"></a></p>
 
-<p><a href="/files/cck/planning/Problemes_et_solutions.pdf">Supports visuels : problèmes et solutions</a> -Imprimés sur du papier A4.<br><a href="/files/cck/planning/Problemes_et_solutions.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_flashcard_download_FR.png"></a></p>
+<p><a href="/files/cck/networking/Problemes_et_solutions.pdf">Supports visuels : problèmes et solutions</a> -Imprimés sur du papier A4.<br><a href="/files/cck/networking/Problemes_et_solutions.pdf"><img alt="" src="/files/CCK_Wireless_Challenges_flashcard_download_FR.png"></a></p>
 
 <p>(Facultatif) Les schémas de routage contenus dans le module <a href="/fr/docs/cck/planning/design-your-network-every-network-tells-story">Concevoir votre réseau : chaque réseau raconte une histoire</a>.</p>
 
@@ -48,7 +48,7 @@ lang: fr
 <p><strong>2. Comme polycopes auxquels vous vous référerez pendant votre travail.</strong> Dans ce cas, vous aurez à imprimer plusieurs exemplaires de la liste des problèmes  (en laissant, momentanément, les solutions de côté). Distribuez les supports visuels contenant la liste des problèmes et penchez-vous sur chaque problème, individuellement, en groupe, en plusieurs petits groupes ou par paires. Comparez les solutions proposées, d'abord, les unes avec les autres, puis à celles proposées dans l'exemple.  </p>
 </div>
 
-<p>Si vous traitez les difficultés inhérentes aux réseaux sans fil en groupe, vous pouvez vous servir de la <a href="/files/cck/planning/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">présentation</a> afin d'introduire le concept et enchaîner avec les règles, explicitées plus bas. </p>
+<p>Si vous traitez les difficultés inhérentes aux réseaux sans fil en groupe, vous pouvez vous servir de la <a href="/files/cck/networking/Difficultes_inherentes_aux_reseaux_sans_fil.pdf">présentation</a> afin d'introduire le concept et enchaîner avec les règles, explicitées plus bas. </p>
 </section>
 <section id="what-are-the-wireless-challenges">
 <h3>Quels sont les défis auxquels sont confrontés les réseaux sans fil ?</h3>
@@ -70,7 +70,7 @@ lang: fr
 <section id="going-through-the-wireless-challenges">
 <h3>Les défis auxquels sont confrontés les réseaux sans fil</h3>
 
-<p>Si vous vous y prenez seul pour traiter les problèmes inhérents aux réseaux sans fil, vous pouvez procéder à votre propre rythme. Téléchargez la version PDF de : <a href="/files/cck/planning/Problemes_et_solutions.pdf">Problèmes et Solutions</a> et parcourez les scénarios, un à un. Rédigez les solutions aux problèmes soulevés par les scénarios et comparez-les aux exemples proposés dans les pages suivantes. Surtout pas de tricherie ! </p>
+<p>Si vous vous y prenez seul pour traiter les problèmes inhérents aux réseaux sans fil, vous pouvez procéder à votre propre rythme. Téléchargez la version PDF de : <a href="/files/cck/networking/Problemes_et_solutions.pdf">Problèmes et Solutions</a> et parcourez les scénarios, un à un. Rédigez les solutions aux problèmes soulevés par les scénarios et comparez-les aux exemples proposés dans les pages suivantes. Surtout pas de tricherie ! </p>
 
 <p>Si vous travaillez en groupe, nous vous suggérons de suivre les tâches suivantes :  </p>