Renamed client and server files