Reorganized client/ and test/client/.