Big refactoring server
Semi refactoring client