version 2.1
Merge branch 'release-2.1'
Reorganisation of code and renaming of modules