Starting to restructure generator into modules, new logic for VCCP/non-VCCP client assets