revised structure + directory referencing