Separating out into builder and responder namespaces for next step