Modularized the content into separate files for easier editing.
Merged changes.