Pull in those restructures we did.

We want to dev on this and we're not allowed to push to cwruacm, so.