relocate the layout.xml file in archetype and tutorial) to be conform to more recent samples (part of the work in #3)