Added Logger, refactored Server