Major cleanup to introduce cmake