Updated output
Updated JSON format
Updated Makefile to reflect new dependencies
Changed file names for helpers
Added a line ending for Thomas