Updated the package strcuture of the generated clients