Refactoring packages into logical pieces. Using wildcard imports.