Tweaked project structure again
Merge remote-tracking branch 'origin/master'