Merged in default (pull request #53)

Start of adding some organization to the building pages.

Approved-by: Elliott Sales de Andrade