salary: rework this module to standalone; redo calcualtion for salary data;