Made output folder organization more clear.