reorg and add new files