Change on  structure

Models, and Routers