Moved Server class to server package