Should have moved cmake files earlier