Start some reorg based on JEG + Ryan Davis.