Refactoring package fix