Refactoring common model to seperate package