Start refactoring models module