upgrading layouts to awestruct