PACKAGE REFACTORING BIG