Refactor7 - Module loading

fixes #239