[WIP] Move ServerHandler to server module