Moved routes. Still a lot of refactorings to do