rhbz1124630 - move client interface to server to avoid massive change in testing