Refactored the models to go in a separate folder