Refactor model structure