Reorganize code
Add support to re-use content of a container when it's previously defined.
Merge pull request #1 from llinares/master

Reorganize code + Add support to pre-defined contents