YH-221: Moved organization logic to groups