Refactor while migrating to real project