Refactor directory for new archetype