Set the dir structure right