moved adapters to the model package and updated the jsonparser