Organized, and added object calls

Organized json data