- Changed according to default folder layout.
- Cleaned up warnings from build.
- Added MASSEMBLY-683