cleaning directory and reorg