webapi refactoring continues