Move back to awestruct/aweplug
Merge pull request #498 from pmuir/back_to_awestruct_aweplug

Move back to awestruct/aweplug