Clean up directories and includes
Merge pull request #1 from harlow/master

Clean up directories and includes