Cleaning up project file layout
Merge pull request #2 from damiancarrillo/master

Cleaning up project file layout