Refactoring package dependencies
Change model relation class path