Restructuring s3sync