Refactoring services to include mock and non-mock client and dataservice
clients
Added data mocking