Made structural changes to the api according to standards