#25 refactored independents cmakes