Remove NativeBinaries in favour of x64 and x86

This matches more closely what we already do