remove unused import
add ModuleContainer to allow combining of several modules into single one #3