> [+1 ] flatten the structure and pave the way for a 2.2 release 
> [ ] no because ....
> 

Go for it.

Matthew