refactor client folder names