Shifted our connections / clients into a hierarchy format

Franchesco, this may be too complicated long-term, but it's
what immediately occurs to me when I see what we're starting to
need to do.