restructure Bucket, add delete operation