Reorganize client files