Reworked directories