refactor model files structure