layed out new routes and changed directives to them
merge