Moved some things around

Made common.Bidder more general so it's able handle both RA as CA