client split in several files
minor