Revised project structure and build includes.
Merge pull request #2 from satyagraha/master

Revised project structure and build includes.