Reorganized output directory again to have json and html subdirectories. Keep things cleaner.