Change project structure
Merge pull request from int-index/master