New project structure for better assembly: Fixes.
Merge remote-tracking branch 'origin/master'