Start in on some reorg
Moved things around for the CEE