Move some container related methods and structs to smaller files Upstream-commit: d9db8960fda02769264ce0b553adf2b427c1c48a Component: engine