Updating: renaming files; adding contrib/json-c