Refactors models to avoid circular imports