Refactor WebApi routes