Refactoring client side
Refactoring protocol, configuration, connector