added conditionals folders and files