Use recomended project structure
Remove extra whitespace
Merge pull request #5 from cmr/master

Some changes