Moving to S3 file system