Big import tidyup using eclipse "Organise Imports" - avoid wildcard imports, and get the ordering of imports to be consistent