Improved design of basic module container
Autocommit Wed Dec 17 09:24:37 EST 2014