structure reworkings of the directory