Rearranged HW10 files to match new layout
Fixed 11.3.2b on HW10