Improving module container design,
Autocommit Tue Dec 16 17:48:32 EST 2014