Pull reorg and extra layers from jrconways3

Makes more sense, some added content, some fixed content.