Continuing with the restructuring.

_includes/popular-frameworks.md → _includes/libraries-and-frameworks.md

@@ -1,10 +1,12 @@
-# Popular Frameworks
+# Libraries and Frameworks
+
+## Web Frameworks
 
 Rather than re-invent the wheel, many PHP developers use _frameworks_ to build out web applications. Frameworks abstract away many of the low-level concerns and provide helpful, easy-to-use interfaces to complete common tasks.
 
 _You do not need to use a framework for every project_. Sometimes, plain PHP is the right way to go. But if you do need a framework, here are a few of the most popular ones (in alphabetical order):
 
-## Full-Stack Frameworks
+### Full-Stack Frameworks
 
 * [CakePHP](http://cakephp.org/)
 * [CodeIgniter](http://codeigniter.com/)
@@ -16,11 +18,10 @@ _You do not need to use a framework for every project_. Sometimes, plain PHP is
 * [Yii](http://www.yiiframework.com/)
 * [Zend](http://framework.zend.com/)
 
-## Micro Frameworks
+### Micro Frameworks
 
 * [Fat-Free](http://bcosca.github.com/fatfree/)
 * [Limonade](http://limonade-php.github.com/)
 * [Silex](http://silex.sensiolabs.org/)
 * [Slim](http://www.slimframework.com/)
 
-[Back to Top](#top){.top}

_includes/links-and-resources.md → _includes/resources.md

@@ -1,6 +1,4 @@
-# Links and Resources
-
-Here are some miscellaneous resources that are worth a read.
+# Resources
 
 ## From the Source
 

_layouts/default.html

@@ -41,8 +41,8 @@
                     <li><a href="#web_application_security">Web Application Security</a></li>
                     <li><a href="#testing">Testing</a></li>
                     <li><a href="#command_line_interface">Command Line Interface</a></li>
-                    <li><a href="#popular_frameworks">Popular Frameworks</a></li>
-                    <li><a href="#links_and_resources">Links &amp; Resources</a></li>
+                    <li><a href="#libraries_and_frameworks">Libraries and Frameworks</a></li>
+                    <li><a href="#resources">Resources</a></li>
                 </ul>
             </nav>
             <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.phptherightway.com/" data-size="large" data-hashtags="php">Tweet</a>

index.html

@@ -32,8 +32,8 @@
 {% capture cli_content %}{% include command-line-interface.md %}{% endcapture %}
 {{ cli_content|markdownify }}
 
-{% capture frameworks_content %}{% include popular-frameworks.md %}{% endcapture %}
+{% capture frameworks_content %}{% include libraries-and-frameworks.md %}{% endcapture %}
 {{ frameworks_content|markdownify }}
 
-{% capture links_content %}{% include links-and-resources.md %}{% endcapture %}
-{{ links_content|markdownify }}
+{% capture resources_content %}{% include resources.md %}{% endcapture %}
+{{ resources_content|markdownify }}