Cleaned up models and fixed imports
Fix circular import issues and model stuff