A little bit of gardening: splitting a module growing a little bit too bushy, regrouping some conceptually linked operations

Generalize Annotations to accomodate arbitrary tags (and not only <s/>, <w/> and <pc/>) on arbitrarily nested structure