grammar is now more flexible, also allow bonaparte packages in bddl and aes files