making import of modules cleaner
Merge pull request #5 from wil-langford/import_modules_cleanup

making import of modules cleaner