Merging reorganised branch to master

Alok Bharadwajrequested to merge
reorganised into master

Emmer functions are reorganised

Merge request reports