Rename models -> entities
Fix coverage
Reactor clients a bit to support token expiration