Breaking out the project into more granular pieces Upstream-commit: e79c91447f623da6ac9bd5f8097a4e54421b50ab Component: engine