Updating cmake to new code structure