Modified project structure, fixes #2.