minor refactoring + start amazon s3 bundle