Removed 'import foo.*' and replaced with 'import foo.bar' where sensible.