Moving Bird, Chicken and Duck to org.birds package.