+Cleanup & added Json.java