Move around cmake stuff to remove useless dir