Refactor imports to use explicit submodule imports and organize class/function imports

Refactor imports to use explicit submodule imports and organize class/function imports #681