Modified class Container and related to simplify.

Separated class Container into ContainerMap and ContainerLift. (close #12)