Finished directory rework