Refactored containers package.