Refine package structure - Part three - EE and Containers