Pull to Bring Area Branch Up-To-Date

Lots of restructuring has happened in the master branch. This pull request will bring all of those changes to the area branch.