Improved design of basic module container
Autocommit Wed Dec 17 09:25:36 EST 2014