building out structure with more useful naming