More fabric.Group refactoring