Changed perimeter
Merged and moved server requests to separate class