Fixes / comments after review.
Move swagger client to api module.