Shuffle PCI and some more PC related devices around (nw)
cirrus is not moved since it's not made as proper pci device