minor structural changes to AWSHelpser and Credential Managment.