New structured completed. Next step is to merge overriding/configure templates