letting SS do package refractoring