More files transitioned to dual build.