refactoring of eclasses
upstream layman supports g-sorcery now