Added logging, split Server and ServerApp