Put output data into folders. Other minor changes for consistency.