moved extension into substructure