Moved some stuff around in the CMake file