Adjustments to directory structure to move forward with archetype

No match.