Refactored package layout