Refractering project to have shared model