making import of modules cleaner

Cleanup for the importing of modules.  I will just merge this in real quick just so we can get a stable baseline for testing.