Adjust the directory structure again