well, for the front: just add the g&p kit, its that simple

So just remove the stockflashhider, screw on the g&p barrel extention to the stock barrel and put on the g&p flashider than you can put on the g&p handguard

So you dont have to swap anything.
Still got to order the g&p stock, on the picture its still the g36c stock.....
but that is gonna be hard I think, since the pin that holds the stock is really really tight....
Later on I might get a inner barrel if I know wich one I can use + how to dissamble the inner barrel assembly