Added modularity to dossier_client to make testing the server less difficult