cleanup and move stuff where needed Upstream-commit: d695cf8de710ca50f5c2b39727f00bfd4be8e07f Component: engine