Reorganize some client files
Change file size calculation to 3 significant digits