CMakeLists.txt's: updated to reflect directory layout