Merging reorganised branch to master

Merged Alok Bharadwaj requested to merge reorganised into master

Emmer functions are reorganised

Merge request reports