Renamed server classes/files so that client classes/files can be added