make container a module
Merge pull request #1707 from tchak/container-as-module

make container a module