Rework ALL directories