The crates in our repo were rearranged to better reflect the structure described in #2269. Original commit: d81614d96f
d81614d96f