Auth module update 1

Separated Auth Types from Auth Modules; now supports any
combination of Auth Modules.

Change-Id: I97b5700fab61db17762c694ba367b687a814e3dd