move all S3 handling to separate clas