Further separated Membership and default auth
Reformatted code
More splitting out of Membership functionality