Moved Server class to correct location