refactoring module imports to be more uniform