Fix path resolution for new directory structure