Reorganized client directories