URLFactory could be reduced into Client

[mrylmz]

The URLFactory is a class overhead because it does only provide a single make method. Instead of defining that class it would make more sense to add a private extension to the Client.

[JensK611]

To separate the functionalities and to reduce the complexity of the client it is extracted into a factory.