Fixed JSON Object

Changed to the java-like class structure