Fix the directory structure