Revert "pre engine split"

This reverts commit dd6ea45ce5fc230838f105dbab3fc6f33767f309.
Revert "Revert "pre engine split""

This reverts commit b50eed6adaf2e936c35e7095c0e27d998ec60d8d.