After this has been brought up many times before, rename src/arch/i386 to