cmake reorganized