create client specific mocking mechanism
browsing specific mocker
xml mapper for organization completed
refactor ResourceLocator dependencies, ResourceLocator factory method, and implement getOrg with optional id