refactor uw shib stuff into separate module, cleanup