further reorg of files