Migrate from 2.4 code repo