Convert to new install-standard stuff