briefcase client refactoring
Merge pull request #434 from onaio/briefcase-fixes

minimal briefcase client code refactor