Modified cmake to use subfolders