master: move git to software, update names, getting ready for scripts