yep its a straight drop in. I am planning on doing the same exact thing from the same place, actually

You just gotta swap out all the parts for the b16 ones. iRACEmyCTR did a b16b swap for a DX. I sent em an email asking for some help so a better answer should be here soon.
