Refactoring - added Module Manager class