Add support for WPCS folder re-structure