Reworked the directory