Regroup elements. Improve documentation, examples, etc.