Improving separation of concerns, and fixing project .gh.json.