Renamed server and client folders