Move client code into the correct package.