2.0 Reorg

Here are the initial commits for the 2.0 reorg we've been discussing.