refactor and create module.manager
#sf-91 fixed