Eliminate package circularity in Java imports.
Eliminate some Sonar violations.