model refactory
Revert "model refactory"

This reverts commit e26a43c2b2997242eaa0e20e659f112588ac5b8e.
model refactory