Started effort to make the code independent from the organisation using it