Refactor packages to sr