Refactored WebApi stuff into separate assembly