Feature/refactor routes and controllers