Move back to awestruct/aweplug