Update, restructure and cleaning of heterogeneity package
Authored by: artemc 2015-04-27
Parent: [r32829]
Child: [r32831]