Moved Server code into separate package