layer reorg and typo fixing