auth restructure
auth restructure