added orgstruct regexp