Moved S3 stuff into S3 module
bundle update