fixing broken imports since refactoring into models module