model refactoring, hierarchy modifyers, sorters
Merge remote-tracking branch 'origin/master'