Added models and renamed routes