Tidy imports

[mmiller-max]

The using statements and imports are spread between top level module file and others, and also use import when using would suffice.

Let's try and follow Blue Style more closely and tidy this up.