Move to a single, unified package for all architectures