Simplify further, extracting aws creds stuff into separate package