Tidy up CMakeFiles usage; use the main CMakeFiles for most subprojects.