Move containers into own package instead of types package.