Added Clients API Controller and minor refactoring