Package cycles removed, sonar-like minor refactorings