Update client internal API as prep for refactor.
Start adding country support
Remove distinction between category and sub-categrories
Finish off basic country support