authentication/authorization framework restructured