Refactored models to their own folder