Fixed symlinking for new directory structure