Claned up the CMakeLists.txt files a bit.