Move Client and ServiceWorkerClients into the right location in the hierarchy.