Modified directory structure of uploaded files to Amazon S3