rework of module init stuff