Fix inconsistencies from flat-file to flexible directory structure migration#3

Copilot wants to merge 3 commits intomasteralexanderholman/template:masterfrom

copilot/sub-pr-2alexanderholman/template:copilot/sub-pr-2Copy head branch name to clipboard