cleaning up reorg of folders