Updated project structure
Merge pull request #8 from dfoelber/updatestructure

Updated project structure