Issue #209: Went ahead and re-wrote most of the enumerate_modules method. This should cover all cases and import correctly.