JSON updates

Copied/renamed files to be updated with JSON, to avoid code and testing
conflicts.