Make SecureNet consistent with the other gateways

This tears up SecureNet and puts it back together.

It's broken up into a few commits of digestible chunks to help explain the intent of the changes.  I'm thinking it's too much to squash into one commit.