more massive reorg and content update