~Refactor client core
~Big service refactoring