Cleanup: move container's functions to its own file Upstream-commit: 4f5272320cef76dd33a3895f228e2080d9d3a13b Component: engine