Split out Bird class