Standardise/simplify imports for consistency.

For the sake of consistency and simplicity shorten imports to use .* if
using more than one class from the package.