[Refactoring] refactor package Model

remove unused h files