Refactor to add the Containers package

Files out