Moving more of the projects logic into projects file