Global client files refactoring