Move server startup to Main.class

and some cleanup in Server.class