Refactoring in more meaningful packages