Refactored package structures.