Merged client & vendor section processing + fixed recursive requires for vendors.