Leaving them as separate .h's for now -- as we discussed -- but hmm, maybe moving them all to inside the (main) header-file would make it easier to read them alongside the 'giant documentation header-comment' that I added recently? (i.e maybe now there's more reason to see them all together?) Or that might get unwieldy as we continue to add protocols -- like support for Google login. Hmm, I'm still undecided on this one.