updated the project structure. Fixes #7