refactoring: proper split Client/Server Interfaces