refactoring with correct package