Reorganize the way machine architectures are handled. Consolidate the