Package refactor

Just some re-organisation as first step for moving login to using matching service