Little reorg and doccos.