reorg and added new content