Changed project layout.
Merge branch 'origin/master'