test from intelliji
Reorganisation of code and cleaning
Merge remote-tracking branch 'origin/master'