Move bnf file into proper package