changed class structure of Server Class