Refactoring module related functionality
Support for module level import