b4 tdi into my b3 estate

[golfmad]

hi guys ive got a b4 saloon p reg tdi at the momment as my daily i brought a b3 estate last yr with a vr6 in it auto box but oil pump packed up as its knocking bad .so over next month im taking vr6 out the b3 and putting my tdi in it out the b4 i no the engine and box will drop in and i gather its just the loom swop fuse box back to the engine .my question is will i need to swop the tanks and lines over as well .i know my b4 is fly by wire so im gonna use the pedal box as im gonna need it .ive done mk3 vr6 to my mk 2 golf last yr and that was just plug and play more or less .so any help will be greatfull thanks guys