Consolidated User and User Admin modules.  Document code.