Lemma 2.4 - Fix the breakages due to change in axiom A2
Misc : + commutativity
Major rewrite

Essentially rewrite the e2 classes code in a more flexible way