Clean up CMake files after the folder restructuring.
Tidy up the CMake run output a bit.
Merge remote-tracking branch 'origin/master' into linux

Conflicts:
	CMakeLists.txt