Removed client class (now usiing agent class)
Moved server test to folder with the same name