container restructure