Refactoring due to sonar warnings
Some more cleaning and refactoring
Some more cleaning and refactoring (yes, again)
Refactored modules
Updated Gradle wrapper version