Reference folder-structure branch on WPCS prior to merge