Cleanup project structure
Merge pull request #1 from gaye/cleanup

Cleanup project structure r=ahal