Change the project structure.
Merge branch 'master' into issue-#7