Rearrange things
Update CMakeLists