I'm finishing mine off at the moment (see link in my siggy

) its all pretty much a straightforward swap, you need the majority of whats under the bonnet on the 16v, complete engine with ancillaries, all engine electrics (ECU etc..) master cylinder & servo (mk1 has clearance issues+ 16v is better

) the gearbox is worth using too as its better geared to the engine.
You need to do a few more posts on this site, then I can pm you a really useful PDF file

(unless you want to leave me your email on here

)