Revert "removed client and service from this branch"

This reverts commit 00ac3bc1f11716b59e51ad4d75b5d25a6321c54e.
untracked client and service