Restrict package scope + refactoring.