Move source for client to more obvious place.