CMake reorganization.