started with refactoring of server activity