reorg of directory
File clean up