Added rest of hummingbird-core structure to get it out of the way