fixed structures section, separated out semantic notions

also macro'd the sections; still missing a few details