Add an umbrella header, rename current header.

There's no ideal solution to this, and I think this is probably the best one.

// @joshaber