Split i686 and x86_64 packages