refactoring model class
refactoring dir name and etc...