What are the latest on the R-Classes?

Was Renault to make both R1 and R2 Twingos in addition to the Clio R3 ?
Just missing a Renault S2000 or 1,6WRC and then they have a complete line up, and will that be a Gordini?

What else is happening in the R classes, will FIA kill off all the other classes in international rallies, to simplify the lineup?