Improving module container design,
Autocommit Tue Dec 16 15:46:32 EST 2014