Created separate models, and updated controllers to use them