Refactor/rename for containers

Renamed container related classes and move to common location.
In-progress updating of CommonContainerInfo to allow declaration of
container implementations which may be appropriate.