moving to more github-friendly model