Both software.cfg and software-ors.cfg became trivial wrappers over their bases
- so move bases to be directly software.