Renamed files, fixed JSON-java repo.