Refactored package structure