Refactoring to package