Fixed project structure
Merge pull request #3 from p2004a/mr-project-structure

Fixed project structure