Refactoring to an package-by-feature design