Slight main-package refactor. We're running with the pattern of 'a tiny main that calls things'. Meaning there's little need for a multi-file main package (if you need it, maybe a refactor is in order), and we can ditch the 'but my executable was called main' problem.
Move modified goad into templates