Refactored section packages