Added Server and main class