Cleanup for WebAPI
Major cleanup for WebAPI
Major refactoring of WebApi