Started move to cmake