Refactor classes, add Server2