Refactoring model packages
Package refactoring