Refactoring + [Server+Client] started in POC