reorganized package dir for hummingbird