Refactored package modules