Move the modules out from underneath Client