[Sonar]
Part of #107 : moving to a separate package & renaming