Simplify and streamline the client namespace
Further simplications of the client namespace