refactoring server/