Commting for merge
Separated routes and models