Fix package refactoring (internal package)