Switch AWS S3 module, better folder support