Improved structure in the Client module