server refactoring (naming of all intefaces and classes)