rename files to camelcase and fix '?' stripping
fix typo on first rule
cleanup printing to JSON
simplify objects and JSON processing