reorganized client files