Reorganized CMakeLists a bit