Add Sonar specs.
Significant re-org