Finished adding all the API queries and also placed classes into appropriate packages for ease of grouping