Add Service module + refactored clients store service