17279.misc

Re-organize Pydantic models and types used in handlers.