Added client install support for multiple modules.
Code cleanup