Directory rework no comments yet