updated cmake structure