Refactor SonarManager

Move them below header and processros