- refactoring into a second package