storage package refractoring