Clean up JSON files and add gold file reader