ni: group properties by classes instead of modules