Moved routes to separate folder.
Fixed merge.