Move client locations into module