Reorganized output logic. Removed output files from version control.