correction sonar
correction sonar
refactoring packages + unit tests