Add sample grouping. Refactoring.
Add sample grouping. Refactoring.

agapow/smartr,thehyve/heim-SmartR,agapow/smartr,agapow/smartr,agapow/smartr,thehyve/heim-SmartR,thehyve/heim-SmartR,thehyve/naa-SmartR,thehyve/naa-SmartR,thehyve/naa-SmartR,thehyve/heim-SmartR