Reorganized some stuff in CMakeLists.txt