Adding sonar plugin & removing package dependency cycle