reworked directories again