Refactor Server + improve docs