LAZY: reorg and rename files.