Move more api types to api/types package Upstream-commit: 75d69ce0da2e360773736502acd92d4a9cf7faa5 Component: engine