Refactor: Push down serving logic into packages.