refactoring models to two files