SONAR-4357 Move some classes to Sonar core