clean up locations
better names. don't maintain our own .ini; script-generate it