Refactoring Model into right package
Refactoring Model into right package