Reorganized cmake project