Routes refactoring
Routes completed, some fixes