changed folder names and removed audience references