Removed wildcard import and a bit of other moving of things.