Swap around

All of the quail are out of the house, and in the side passage now, and the guinea pig is in the side passage too for the winter.
The 2 adults are in a hutch on their own, the guinea pig is in a hutch on top of theirs, the chicks (3 hens and 1 cockerel) are in their own hutch, and the remaining 3 chick cockerels are on their own in the brooder in the garage so that they can't see/hear the girls and fight.

Adult hen

Chick Hen

Chicks' House

Guinea Pig