Refactored package structure.