ASHW-8 reformat and rearrange
ASHW-9 update bower