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