Refactored package design.