diff --git a/partials/html/sections/education.html b/partials/html/section/education.html
similarity index 100%
rename from partials/html/sections/education.html
rename to partials/html/section/education.html
diff --git a/partials/html/sections/employment.html b/partials/html/section/employment.html
similarity index 100%
rename from partials/html/sections/employment.html
rename to partials/html/section/employment.html
diff --git a/partials/html/sections/projects.html b/partials/html/section/projects.html
similarity index 100%
rename from partials/html/sections/projects.html
rename to partials/html/section/projects.html
diff --git a/partials/html/sections/recognition.html b/partials/html/section/recognition.html
similarity index 100%
rename from partials/html/sections/recognition.html
rename to partials/html/section/recognition.html
diff --git a/partials/html/sections/samples.html b/partials/html/section/samples.html
similarity index 100%
rename from partials/html/sections/samples.html
rename to partials/html/section/samples.html
diff --git a/partials/html/sections/service.html b/partials/html/section/service.html
similarity index 100%
rename from partials/html/sections/service.html
rename to partials/html/section/service.html
diff --git a/partials/html/sections/skills.html b/partials/html/section/skills.html
similarity index 100%
rename from partials/html/sections/skills.html
rename to partials/html/section/skills.html
diff --git a/partials/html/sections/speaking.html b/partials/html/section/speaking.html
similarity index 100%
rename from partials/html/sections/speaking.html
rename to partials/html/section/speaking.html
diff --git a/partials/html/sections/writing.html b/partials/html/section/writing.html
similarity index 100%
rename from partials/html/sections/writing.html
rename to partials/html/section/writing.html
diff --git a/themes/modern/src/modern-html.html b/themes/modern/src/modern-html.html
index 23cadd4..53d14fe 100644
--- a/themes/modern/src/modern-html.html
+++ b/themes/modern/src/modern-html.html
@@ -29,7 +29,8 @@
 </section>
 {{/if}}
 
-{{! A custom skills section }}
+{{!<!-- A custom skills section with colored skill bars. -->}}
+
 {{#section 'skills' }}
       <hr>
       <section id="skills">
@@ -37,7 +38,6 @@
         <h2>{{{sectionTitle "Skills"}}}</h2>
         </header>
         <span class="fa fa-lg fa-code"></span>
-
         <ul class="list-unstyled">
           {{#each r.skills.sets}}
             <li class="card card-nested card-skills">
@@ -57,37 +57,39 @@
             </li>
           {{/each}}
         </ul>
-
-
       </section>
 {{/section}}
 
-{{! Use predefined partials for the other sections, and the inline partial
-icon-[section] to pass in a heading icon. }}
+{{!<!--
+  Use predefined global partials for the other sections.
+
+  The "inline" bit before each section allows us to pass a custom heading
+  icon into the global partial. For this theme, we're using Font Awesome.
+-->}}
 
 {{#*inline "icon-employment"}}<span class="fa fa-lg fa-building"></span>{{/inline}}
-{{> sections/employment }}
+{{> section/employment }}
 
 {{#*inline "icon-projects"}}<span class="fa fa-lg fa-star"></span>{{/inline}}
-{{> sections/projects }}
+{{> section/projects }}
 
 {{#*inline "icon-education"}}<span class="fa fa-lg fa-mortar-board"></span>{{/inline}}
-{{> sections/education }}
+{{> section/education }}
 
 {{#*inline "icon-service"}}<span class="fa fa-lg fa-child"></span>{{/inline}}
-{{> sections/service }}
+{{> section/service }}
 
 {{#*inline "icon-samples"}}<span class="fa fa-lg fa-share"></span>{{/inline}}
-{{> sections/samples }}
+{{> section/samples }}
 
 {{#*inline "icon-writing"}}<span class="fa fa-lg fa-pencil"></span>{{/inline}}
-{{> sections/writing }}
+{{> section/writing }}
 
 {{#*inline "icon-recognition"}}<span class="fa fa-lg fa-trophy"></span>{{/inline}}
-{{> sections/recognition }}
+{{> section/recognition }}
 
 {{#*inline "icon-speaking"}}<span class="fa fa-lg fa-users"></span>{{/inline}}
-{{> sections/speaking }}
+{{> section/speaking }}
 
 
       </div>