preparing client modules to be more modular

and changing some module names