cleaned up and alphabetized cmake infrastructure and package description