se-edu · jamessspanggg · Apr 5, 2020 · Apr 5, 2020 · Apr 5, 2020 · Apr 14, 2020
diff --git a/...cuts/basic/avoidEmptyCatchBlocks/index.md → ...dShortcuts/avoidEmptyCatchBlocks/index.md b/...cuts/basic/avoidEmptyCatchBlocks/index.md → ...dShortcuts/avoidEmptyCatchBlocks/index.md
diff --git a/...tcuts/basic/avoidEmptyCatchBlocks/text.md → ...idShortcuts/avoidEmptyCatchBlocks/text.md b/...tcuts/basic/avoidEmptyCatchBlocks/text.md → ...idShortcuts/avoidEmptyCatchBlocks/text.md
diff --git a/codeQuality/avoidShortcuts/basic/index.md b/codeQuality/avoidShortcuts/basic/index.md
diff --git a/codeQuality/avoidShortcuts/basic/path.md b/codeQuality/avoidShortcuts/basic/path.md
diff --git a/codeQuality/avoidShortcuts/basic/text.md b/codeQuality/avoidShortcuts/basic/text.md
diff --git a/...idShortcuts/basic/deleteDeadCode/index.md → ...ty/avoidShortcuts/deleteDeadCode/index.md b/...idShortcuts/basic/deleteDeadCode/index.md → ...ty/avoidShortcuts/deleteDeadCode/index.md
diff --git a/...oidShortcuts/basic/deleteDeadCode/text.md → ...ity/avoidShortcuts/deleteDeadCode/text.md b/...oidShortcuts/basic/deleteDeadCode/text.md → ...ity/avoidShortcuts/deleteDeadCode/text.md
diff --git a/...ts/basic/dontRecycleVarsOrParams/index.md → ...hortcuts/dontRecycleVarsOrParams/index.md b/...ts/basic/dontRecycleVarsOrParams/index.md → ...hortcuts/dontRecycleVarsOrParams/index.md
diff --git a/...uts/basic/dontRecycleVarsOrParams/text.md → ...Shortcuts/dontRecycleVarsOrParams/text.md b/...uts/basic/dontRecycleVarsOrParams/text.md → ...Shortcuts/dontRecycleVarsOrParams/text.md
diff --git a/...Quality/avoidShortcuts/basic/exercises.md → codeQuality/avoidShortcuts/exercises.md b/...Quality/avoidShortcuts/basic/exercises.md → codeQuality/avoidShortcuts/exercises.md
diff --git a/codeQuality/avoidShortcuts/intermediate/index.md b/codeQuality/avoidShortcuts/intermediate/index.md
diff --git a/codeQuality/avoidShortcuts/intermediate/path.md b/codeQuality/avoidShortcuts/intermediate/path.md
diff --git a/codeQuality/avoidShortcuts/intermediate/text.md b/codeQuality/avoidShortcuts/intermediate/text.md
diff --git a/...rmediate/minimiseCodeDuplication/index.md → ...hortcuts/minimiseCodeDuplication/index.md b/...rmediate/minimiseCodeDuplication/index.md → ...hortcuts/minimiseCodeDuplication/index.md
diff --git a/...ermediate/minimiseCodeDuplication/text.md → ...Shortcuts/minimiseCodeDuplication/text.md b/...ermediate/minimiseCodeDuplication/text.md → ...Shortcuts/minimiseCodeDuplication/text.md
@@ -11,7 +11,7 @@
 This guideline is closely related to the <trigger for="modal:duplication-dry" trigger="click">DRY Principle<trigger>. 
 
 <modal title="**{{icon_preview}} DRY Principle**" id="modal:duplication-dry">
-  <include src="../../../../principles/dryPrinciple/unit-inElsewhere-asFlat.md" boilerplate />
+  <include src="../../../principles/dryPrinciple/unit-inElsewhere-asFlat.md" boilerplate />
 </modal>
 
 </div>

diff --git a/...termediate/minimiseVariableScope/index.md → ...dShortcuts/minimiseVariableScope/index.md b/...termediate/minimiseVariableScope/index.md → ...dShortcuts/minimiseVariableScope/index.md
diff --git a/...ntermediate/minimiseVariableScope/text.md → ...idShortcuts/minimiseVariableScope/text.md b/...ntermediate/minimiseVariableScope/text.md → ...idShortcuts/minimiseVariableScope/text.md
diff --git a/...oidShortcuts/basic/q-essay-badPractice.md → ...ity/avoidShortcuts/q-essay-badPractice.md b/...oidShortcuts/basic/q-essay-badPractice.md → ...ity/avoidShortcuts/q-essay-badPractice.md
@@ -1,4 +1,4 @@
-<panel header="{{ icon_Q_A }} Which oare unsafe practices?">
+<panel header="{{ icon_Q_A }} Which are unsafe practices?">
 <question>
 
 Which of these are unsafe coding practices?

diff --git a/codeQuality/avoidShortcuts/text.md b/codeQuality/avoidShortcuts/text.md
@@ -3,7 +3,17 @@
 <div id="body">
 
 <include src="introduction/unit-inParent-asPanel.md" boilerplate />
-<include src="basic/container-inParent-asPanel.md" boilerplate />
-<include src="intermediate/container-inParent-asPanel.md" boilerplate />
+<include src="useDefaultBranch/unit-inParent-asPanel.md" boilerplate />
+<include src="dontRecycleVarsOrParams/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidEmptyCatchBlocks/unit-inParent-asPanel.md" boilerplate />
+<include src="deleteDeadCode/unit-inParent-asPanel.md" boilerplate />
+<include src="minimiseVariableScope/unit-inParent-asPanel.md" boilerplate />
+<include src="minimiseCodeDuplication/unit-inParent-asPanel.md" boilerplate />
+
+</div>
+
+<div id="extras">
+
+<include src="exercises.md" />
 
 </div>
diff --git a/...Shortcuts/basic/useDefaultBranch/index.md → .../avoidShortcuts/useDefaultBranch/index.md b/...Shortcuts/basic/useDefaultBranch/index.md → .../avoidShortcuts/useDefaultBranch/index.md
diff --git a/...dShortcuts/basic/useDefaultBranch/text.md → ...y/avoidShortcuts/useDefaultBranch/text.md b/...dShortcuts/basic/useDefaultBranch/text.md → ...y/avoidShortcuts/useDefaultBranch/text.md
diff --git a/codeQuality/commentMinimally/basic/index.md b/codeQuality/commentMinimally/basic/index.md
diff --git a/codeQuality/commentMinimally/basic/path.md b/codeQuality/commentMinimally/basic/path.md
diff --git a/codeQuality/commentMinimally/basic/text.md b/codeQuality/commentMinimally/basic/text.md
diff --git a/...inimally/basic/dontRepeatObvious/index.md → ...mmentMinimally/dontRepeatObvious/index.md b/...inimally/basic/dontRepeatObvious/index.md → ...mmentMinimally/dontRepeatObvious/index.md
diff --git a/...Minimally/basic/dontRepeatObvious/text.md → ...ommentMinimally/dontRepeatObvious/text.md b/...Minimally/basic/dontRepeatObvious/text.md → ...ommentMinimally/dontRepeatObvious/text.md
diff --git a/...ommentMinimally/intermediate/exercises.md → ...nimally/explainWhatWhyNotHow/exercises.md b/...ommentMinimally/intermediate/exercises.md → ...nimally/explainWhatWhyNotHow/exercises.md
diff --git a/...ntermediate/explainWhatWhyNotHow/index.md → ...ntMinimally/explainWhatWhyNotHow/index.md b/...ntermediate/explainWhatWhyNotHow/index.md → ...ntMinimally/explainWhatWhyNotHow/index.md
diff --git a/...Minimally/intermediate/q-tick-comments.md → ...y/explainWhatWhyNotHow/q-tick-comments.md b/...Minimally/intermediate/q-tick-comments.md → ...y/explainWhatWhyNotHow/q-tick-comments.md
diff --git a/...intermediate/explainWhatWhyNotHow/text.md → ...entMinimally/explainWhatWhyNotHow/text.md b/...intermediate/explainWhatWhyNotHow/text.md → ...entMinimally/explainWhatWhyNotHow/text.md
@@ -61,4 +61,7 @@ return (isLeftEndCorrect && isRightEndCorrect) || isSameSize;
 </div>
 
 <div id="extras">
+
+<include src="exercises.md" />
+
 </div>
diff --git a/codeQuality/commentMinimally/intermediate/index.md b/codeQuality/commentMinimally/intermediate/index.md
diff --git a/codeQuality/commentMinimally/intermediate/path.md b/codeQuality/commentMinimally/intermediate/path.md
diff --git a/codeQuality/commentMinimally/intermediate/text.md b/codeQuality/commentMinimally/intermediate/text.md
diff --git a/codeQuality/commentMinimally/text.md b/codeQuality/commentMinimally/text.md
@@ -3,7 +3,8 @@
 <div id="body">
 
 <include src="introduction/unit-inParent-asPanel.md" boilerplate />
-<include src="basic/container-inParent-asPanel.md" boilerplate />
-<include src="intermediate/container-inParent-asPanel.md" boilerplate />
+<include src="dontRepeatObvious/unit-inParent-asPanel.md" boilerplate />
+<include src="writeToReader/unit-inParent-asPanel.md" boilerplate />
+<include src="explainWhatWhyNotHow/unit-inParent-asPanel.md" boilerplate />
 
 </div>
diff --git a/...mally/basic/writeToReader/example-java.md → ...ntMinimally/writeToReader/example-java.md b/...mally/basic/writeToReader/example-java.md → ...ntMinimally/writeToReader/example-java.md
diff --git a/...lly/basic/writeToReader/example-python.md → ...Minimally/writeToReader/example-python.md b/...lly/basic/writeToReader/example-python.md → ...Minimally/writeToReader/example-python.md
diff --git a/...entMinimally/basic/writeToReader/index.md → ...y/commentMinimally/writeToReader/index.md b/...entMinimally/basic/writeToReader/index.md → ...y/commentMinimally/writeToReader/index.md
diff --git a/...mentMinimally/basic/writeToReader/text.md → ...ty/commentMinimally/writeToReader/text.md b/...mentMinimally/basic/writeToReader/text.md → ...ty/commentMinimally/writeToReader/text.md
diff --git a/codeQuality/index.md b/codeQuality/index.md
@@ -1,7 +1,7 @@
 <frontmatter>
 title: "Code Quality"
 siteNav: mainNav.md
-pageNav: 3
+pageNav: 4
 </frontmatter>
 
 <include src="container-inPage-asFlat.md" boilerplate />
diff --git a/codeQuality/maximiseReadability/advanced/index.md b/codeQuality/maximiseReadability/advanced/index.md
diff --git a/codeQuality/maximiseReadability/advanced/path.md b/codeQuality/maximiseReadability/advanced/path.md
diff --git a/codeQuality/maximiseReadability/advanced/text.md b/codeQuality/maximiseReadability/advanced/text.md
diff --git a/...oidComplicatedExpressions/example-java.md → ...oidComplicatedExpressions/example-java.md b/...oidComplicatedExpressions/example-java.md → ...oidComplicatedExpressions/example-java.md
diff --git a/...dComplicatedExpressions/example-python.md → ...dComplicatedExpressions/example-python.md b/...dComplicatedExpressions/example-python.md → ...dComplicatedExpressions/example-python.md
diff --git a/...asic/avoidComplicatedExpressions/index.md → ...lity/avoidComplicatedExpressions/index.md b/...asic/avoidComplicatedExpressions/index.md → ...lity/avoidComplicatedExpressions/index.md
diff --git a/...basic/avoidComplicatedExpressions/text.md → ...ility/avoidComplicatedExpressions/text.md b/...basic/avoidComplicatedExpressions/text.md → ...ility/avoidComplicatedExpressions/text.md
diff --git a/...voidDeepNesting/images/arrowheadStyle.png → ...voidDeepNesting/images/arrowheadStyle.png b/...voidDeepNesting/images/arrowheadStyle.png → ...voidDeepNesting/images/arrowheadStyle.png
diff --git a/...adability/basic/avoidDeepNesting/index.md → ...miseReadability/avoidDeepNesting/index.md b/...adability/basic/avoidDeepNesting/index.md → ...miseReadability/avoidDeepNesting/index.md
diff --git a/...eadability/basic/avoidDeepNesting/text.md → ...imiseReadability/avoidDeepNesting/text.md b/...eadability/basic/avoidDeepNesting/text.md → ...imiseReadability/avoidDeepNesting/text.md
@@ -10,18 +10,18 @@
 
 In particular, avoid [_arrowhead_ style code](https://blog.codinghorror.com/flattening-arrow-code/).
 
-<img src="{{baseUrl}}/codeQuality/maximiseReadability/basic/avoidDeepNesting/images/arrowheadStyle.png" width="500" />
+<img src="{{baseUrl}}/codeQuality/maximiseReadability/avoidDeepNesting/images/arrowheadStyle.png" width="500" />
 <p/>
 
 <box>
 
 {{ icon_example }} A real code example:
 
 <div class="alt-java">
-  <include src="../../introduction/example-java.md" />
+  <include src="../introduction/example-java.md" />
 </div>
 <div class="alt-python">
-  <include src="../../introduction/example-python.md" />
+  <include src="../introduction/example-python.md" />
 </div>
 
 </box>

diff --git a/...adability/basic/avoidLongMethods/index.md → ...miseReadability/avoidLongMethods/index.md b/...adability/basic/avoidLongMethods/index.md → ...miseReadability/avoidLongMethods/index.md
diff --git a/...eadability/basic/avoidLongMethods/text.md → ...imiseReadability/avoidLongMethods/text.md b/...eadability/basic/avoidLongMethods/text.md → ...imiseReadability/avoidLongMethods/text.md
diff --git a/...y/basic/avoidMagicNumbers/example-java.md → ...ability/avoidMagicNumbers/example-java.md b/...y/basic/avoidMagicNumbers/example-java.md → ...ability/avoidMagicNumbers/example-java.md
diff --git a/...basic/avoidMagicNumbers/example-python.md → ...ility/avoidMagicNumbers/example-python.md b/...basic/avoidMagicNumbers/example-python.md → ...ility/avoidMagicNumbers/example-python.md
diff --git a/...dability/basic/avoidMagicNumbers/index.md → ...iseReadability/avoidMagicNumbers/index.md b/...dability/basic/avoidMagicNumbers/index.md → ...iseReadability/avoidMagicNumbers/index.md
diff --git a/...adability/basic/avoidMagicNumbers/text.md → ...miseReadability/avoidMagicNumbers/text.md b/...adability/basic/avoidMagicNumbers/text.md → ...miseReadability/avoidMagicNumbers/text.md
diff --git a/...miseReadability/intermediate/exercises.md → .../avoidPrematureOptimizations/exercises.md b/...miseReadability/intermediate/exercises.md → .../avoidPrematureOptimizations/exercises.md
@@ -1,5 +1,4 @@
 <panel header="{{ icon_exercise }} Exercises" expandable>
-  <include src="q-tick-trueFalse.md" />
   <include src="q-tick-drawback.md" />
   <include src="q-tick-saying.md" />
 </panel>
diff --git a/...iate/avoidPrematureOptimizations/index.md → ...lity/avoidPrematureOptimizations/index.md b/...iate/avoidPrematureOptimizations/index.md → ...lity/avoidPrematureOptimizations/index.md
diff --git a/...adability/intermediate/q-tick-drawback.md → ...PrematureOptimizations/q-tick-drawback.md b/...adability/intermediate/q-tick-drawback.md → ...PrematureOptimizations/q-tick-drawback.md
@@ -1,4 +1,4 @@
-<panel header="{{ icon_Q_A }} Drawbacks of prepature optimizations">
+<panel header="{{ icon_Q_A }} Drawbacks of premature optimizations">
 <question>
 
 What are the drawbacks of trying to optimize code too soon?

diff --git a/...Readability/intermediate/q-tick-saying.md → ...idPrematureOptimizations/q-tick-saying.md b/...Readability/intermediate/q-tick-saying.md → ...idPrematureOptimizations/q-tick-saying.md
diff --git a/...diate/avoidPrematureOptimizations/text.md → ...ility/avoidPrematureOptimizations/text.md b/...diate/avoidPrematureOptimizations/text.md → ...ility/avoidPrematureOptimizations/text.md
@@ -20,4 +20,7 @@ Note that **there are cases where optimizing takes priority over other things**
 </div>
 
 <div id="extras">
+
+<include src="exercises.md" />
+
 </div>
diff --git a/codeQuality/maximiseReadability/basic/index.md b/codeQuality/maximiseReadability/basic/index.md
diff --git a/codeQuality/maximiseReadability/basic/path.md b/codeQuality/maximiseReadability/basic/path.md
diff --git a/codeQuality/maximiseReadability/basic/text.md b/codeQuality/maximiseReadability/basic/text.md
diff --git a/...lity/intermediate/dontTripReader/index.md → ...ximiseReadability/dontTripReader/index.md b/...lity/intermediate/dontTripReader/index.md → ...ximiseReadability/dontTripReader/index.md
diff --git a/...ility/intermediate/dontTripReader/text.md → ...aximiseReadability/dontTripReader/text.md b/...ility/intermediate/dontTripReader/text.md → ...aximiseReadability/dontTripReader/text.md
diff --git a/codeQuality/maximiseReadability/intermediate/index.md b/codeQuality/maximiseReadability/intermediate/index.md
diff --git a/codeQuality/maximiseReadability/intermediate/path.md b/codeQuality/maximiseReadability/intermediate/path.md
diff --git a/codeQuality/maximiseReadability/intermediate/text.md b/codeQuality/maximiseReadability/intermediate/text.md
diff --git a/...eadability/basic/makeCodeObvious/index.md → ...imiseReadability/makeCodeObvious/index.md b/...eadability/basic/makeCodeObvious/index.md → ...imiseReadability/makeCodeObvious/index.md
diff --git a/...Readability/basic/makeCodeObvious/text.md → ...ximiseReadability/makeCodeObvious/text.md b/...Readability/basic/makeCodeObvious/text.md → ...ximiseReadability/makeCodeObvious/text.md
diff --git a/.../advanced/makeHappyPathProminent/index.md → ...adability/makeHappyPathProminent/index.md b/.../advanced/makeHappyPathProminent/index.md → ...adability/makeHappyPathProminent/index.md
diff --git a/...y/advanced/makeHappyPathProminent/text.md → ...eadability/makeHappyPathProminent/text.md b/...y/advanced/makeHappyPathProminent/text.md → ...eadability/makeHappyPathProminent/text.md
diff --git a/...ity/intermediate/practiceKISSing/index.md → ...imiseReadability/practiceKISSing/index.md b/...ity/intermediate/practiceKISSing/index.md → ...imiseReadability/practiceKISSing/index.md
diff --git a/...lity/intermediate/practiceKISSing/text.md → ...ximiseReadability/practiceKISSing/text.md b/...lity/intermediate/practiceKISSing/text.md → ...ximiseReadability/practiceKISSing/text.md
diff --git a/codeQuality/maximiseReadability/slapHard/exercises.md b/codeQuality/maximiseReadability/slapHard/exercises.md
@@ -0,0 +1,3 @@
+<panel header="{{ icon_exercise }} Exercises" expandable>
+  <include src="q-tick-trueFalse.md" />
+</panel>
diff --git a/...eadability/intermediate/slapHard/index.md → ...ity/maximiseReadability/slapHard/index.md b/...eadability/intermediate/slapHard/index.md → ...ity/maximiseReadability/slapHard/index.md
diff --git a/...dability/intermediate/q-tick-trueFalse.md → ...eReadability/slapHard/q-tick-trueFalse.md b/...dability/intermediate/q-tick-trueFalse.md → ...eReadability/slapHard/q-tick-trueFalse.md
diff --git a/...Readability/intermediate/slapHard/text.md → ...lity/maximiseReadability/slapHard/text.md b/...Readability/intermediate/slapHard/text.md → ...lity/maximiseReadability/slapHard/text.md
@@ -31,11 +31,14 @@ displayResult();
 </box>
 
 <modal title="" id="modal:slap-abstraction">
-  <include src="../../../../designFundamentals/abstraction/what/unit-inElsewhere-asFlat.md" boilerplate/>
+  <include src="../../../designFundamentals/abstraction/what/unit-inElsewhere-asFlat.md" boilerplate/>
 </modal>
 
 
 </div>
 
 <div id="extras">
+
+<include src="exercises.md" />
+
 </div>
diff --git a/...ermediate/structureCodeLogically/index.md → ...adability/structureCodeLogically/index.md b/...ermediate/structureCodeLogically/index.md → ...adability/structureCodeLogically/index.md
diff --git a/...termediate/structureCodeLogically/text.md → ...eadability/structureCodeLogically/text.md b/...termediate/structureCodeLogically/text.md → ...eadability/structureCodeLogically/text.md
diff --git a/codeQuality/maximiseReadability/text.md b/codeQuality/maximiseReadability/text.md
@@ -3,8 +3,16 @@
 <div id="body">
 
 <include src="introduction/unit-inParent-asPanel.md" boilerplate />
-<include src="basic/container-inParent-asPanel.md" boilerplate />
-<include src="intermediate/container-inParent-asPanel.md" boilerplate />
-<include src="advanced/container-inParent-asPanel.md" boilerplate />
+<include src="avoidLongMethods/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidDeepNesting/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidComplicatedExpressions/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidMagicNumbers/unit-inParent-asPanel.md" boilerplate />
+<include src="makeCodeObvious/unit-inParent-asPanel.md" boilerplate />
+<include src="structureCodeLogically/unit-inParent-asPanel.md" boilerplate />
+<include src="dontTripReader/unit-inParent-asPanel.md" boilerplate />
+<include src="practiceKISSing/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidPrematureOptimizations/unit-inParent-asPanel.md" boilerplate />
+<include src="slapHard/unit-inParent-asPanel.md" boilerplate />
+<include src="makeHappyPathProminent/unit-inParent-asPanel.md" boilerplate />
 
 </div>
diff --git a/...ntermediate/avoidMisleadingNames/index.md → ...ty/nameWell/avoidMisleadingNames/index.md b/...ntermediate/avoidMisleadingNames/index.md → ...ty/nameWell/avoidMisleadingNames/index.md
diff --git a/...intermediate/avoidMisleadingNames/text.md → ...ity/nameWell/avoidMisleadingNames/text.md b/...intermediate/avoidMisleadingNames/text.md → ...ity/nameWell/avoidMisleadingNames/text.md
diff --git a/codeQuality/nameWell/basic/index.md b/codeQuality/nameWell/basic/index.md
diff --git a/codeQuality/nameWell/basic/path.md b/codeQuality/nameWell/basic/path.md
diff --git a/codeQuality/nameWell/basic/text.md b/codeQuality/nameWell/basic/text.md
diff --git a/codeQuality/nameWell/intermediate/index.md b/codeQuality/nameWell/intermediate/index.md
diff --git a/codeQuality/nameWell/intermediate/path.md b/codeQuality/nameWell/intermediate/path.md
diff --git a/codeQuality/nameWell/intermediate/text.md b/codeQuality/nameWell/intermediate/text.md
diff --git a/.../intermediate/notTooLongNorShort/index.md → ...lity/nameWell/notTooLongNorShort/index.md b/.../intermediate/notTooLongNorShort/index.md → ...lity/nameWell/notTooLongNorShort/index.md
diff --git a/...l/intermediate/notTooLongNorShort/text.md → ...ality/nameWell/notTooLongNorShort/text.md b/...l/intermediate/notTooLongNorShort/text.md → ...ality/nameWell/notTooLongNorShort/text.md
diff --git a/...eWell/basic/nounsAndVerbsAsNames/index.md → ...ty/nameWell/nounsAndVerbsAsNames/index.md b/...eWell/basic/nounsAndVerbsAsNames/index.md → ...ty/nameWell/nounsAndVerbsAsNames/index.md
diff --git a/...meWell/basic/nounsAndVerbsAsNames/text.md → ...ity/nameWell/nounsAndVerbsAsNames/text.md b/...meWell/basic/nounsAndVerbsAsNames/text.md → ...ity/nameWell/nounsAndVerbsAsNames/text.md
diff --git a/codeQuality/nameWell/text.md b/codeQuality/nameWell/text.md
@@ -3,7 +3,10 @@
 <div id="body">
 
 <include src="introduction/unit-inParent-asPanel.md" boilerplate />
-<include src="basic/container-inParent-asPanel.md" boilerplate />
-<include src="intermediate/container-inParent-asPanel.md" boilerplate />
+<include src="nounsAndVerbsAsNames/unit-inParent-asPanel.md" boilerplate />
+<include src="useStandardWords/unit-inParent-asPanel.md" boilerplate />
+<include src="useNameExplain/unit-inParent-asPanel.md" boilerplate />
+<include src="notTooLongNorShort/unit-inParent-asPanel.md" boilerplate />
+<include src="avoidMisleadingNames/unit-inParent-asPanel.md" boilerplate />
 
 </div>
diff --git a/...Well/intermediate/useNameExplain/index.md → codeQuality/nameWell/useNameExplain/index.md b/...Well/intermediate/useNameExplain/index.md → codeQuality/nameWell/useNameExplain/index.md
diff --git a/...eWell/intermediate/useNameExplain/text.md → codeQuality/nameWell/useNameExplain/text.md b/...eWell/intermediate/useNameExplain/text.md → codeQuality/nameWell/useNameExplain/text.md
diff --git a/.../nameWell/basic/useStandardWords/index.md → ...uality/nameWell/useStandardWords/index.md b/.../nameWell/basic/useStandardWords/index.md → ...uality/nameWell/useStandardWords/index.md
diff --git a/...y/nameWell/basic/useStandardWords/text.md → ...Quality/nameWell/useStandardWords/text.md b/...y/nameWell/basic/useStandardWords/text.md → ...Quality/nameWell/useStandardWords/text.md
diff --git a/codeQuality/print.md b/codeQuality/print.md
@@ -17,9 +17,17 @@ title: "Code Quality [Printable]"
 ## Guideline: Maximise Readability
 
 <include src="maximiseReadability/introduction/unit-inParent-asFlat-print.md" boilerplate />
-<include src="maximiseReadability/basic/unit-inParent-asFlat-print.md" boilerplate />
-<include src="maximiseReadability/intermediate/unit-inParent-asFlat-print.md" boilerplate />
-<include src="maximiseReadability/advanced/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/avoidComplicatedExpressions/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/avoidDeepNesting/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/avoidLongMethods/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/avoidMagicNumbers/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/avoidPrematureOptimizations/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/dontTripReader/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/makeCodeObvious/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/makeHappyPathProminent/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/practiceKISSing/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/slapHard/unit-inParent-asFlat-print.md" boilerplate />
+<include src="maximiseReadability/structureCodeLogically/unit-inParent-asFlat-print.md" boilerplate />
 
 ## Guideline: Follow a Standard
 
@@ -30,21 +38,28 @@ title: "Code Quality [Printable]"
 ## Guideline: Name Well
 
 <include src="nameWell/introduction/unit-inParent-asFlat-print.md" boilerplate />
-<include src="nameWell/basic/unit-inParent-asFlat-print.md" boilerplate />
-<include src="nameWell/intermediate/unit-inParent-asFlat-print.md" boilerplate />
+<include src="nameWell/avoidMisleadingNames/unit-inParent-asFlat-print.md" boilerplate />
+<include src="nameWell/notTooLongNorShort/unit-inParent-asFlat-print.md" boilerplate />
+<include src="nameWell/nounsAndVerbsAsNames/unit-inParent-asFlat-print.md" boilerplate />
+<include src="nameWell/useNameExplain/unit-inParent-asFlat-print.md" boilerplate />
+<include src="nameWell/useStandardWords/unit-inParent-asFlat-print.md" boilerplate />
 
 ## Guideline: Avoid Unsafe Shortcuts
 
 <include src="avoidShortcuts/introduction/unit-inParent-asFlat-print.md" boilerplate />
-<include src="avoidShortcuts/basic/unit-inParent-asFlat-print.md" boilerplate />
-<include src="avoidShortcuts/intermediate/unit-inParent-asFlat-print.md" boilerplate />
-
+<include src="avoidShortcuts/avoidEmptyCatchBlocks/unit-inParent-asFlat-print.md" boilerplate />
+<include src="avoidShortcuts/deleteDeadCode/unit-inParent-asFlat-print.md" boilerplate />
+<include src="avoidShortcuts/dontRecycleVarsOrParams/unit-inParent-asFlat-print.md" boilerplate />
+<include src="avoidShortcuts/minimiseCodeDuplication/unit-inParent-asFlat-print.md" boilerplate />
+<include src="avoidShortcuts/minimiseVariableScope/unit-inParent-asFlat-print.md" boilerplate />
+<include src="avoidShortcuts/useDefaultBranch/unit-inParent-asFlat-print.md" boilerplate />
 
 ## Guideline: Comment Minimally, But Sufficiently
 
 <include src="commentMinimally/introduction/unit-inParent-asFlat-print.md" boilerplate />
-<include src="commentMinimally/basic/unit-inParent-asFlat-print.md" boilerplate />
-<include src="commentMinimally/intermediate/unit-inParent-asFlat-print.md" boilerplate />
+<include src="commentMinimally/dontRepeatObvious/unit-inParent-asFlat-print.md" boilerplate />
+<include src="commentMinimally/explainWhatWhyNotHow/unit-inParent-asFlat-print.md" boilerplate />
+<include src="commentMinimally/writeToReader/unit-inParent-asFlat-print.md" boilerplate />
 
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -61,4 +61,7 @@ return (isLeftEndCorrect && isRightEndCorrect) || isSameSize; @@
     </div>
     <div id="extras">
+    <include src="exercises.md" />
     </div>