Correct the directory structure