Changed output to folders