Big refactoring using new terminology

See https://github.com/Geogi/criojomin/wiki/Specification-(fr) (fr)